Merge pull request #18 from aau-network-security/hotfix/close-created…

…-resources-on-error Added functionality to close started resources on error in creating env
aau-network-security · Apr 20, 2024 · 4321038 · 4321038
2 parents 594b88f + 7ac5b1e
commit 4321038
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/internal/agent/environment.go b/internal/agent/environment.go
@@ -101,6 +101,7 @@ func (a *Agent) CreateEnvironment(ctx context.Context, req *proto.CreatEnvReques
 	env, err := envConf.NewEnv(ctx)
 	if err != nil {
 		log.Error().Err(err).Msg("error creating environment")
+		vpnIPPool.ReleaseIP(vpnIP)
 		return &proto.StatusResponse{Message: "Error creating environment"}, err
 	}
 
@@ -174,6 +175,10 @@ func (a *Agent) CreateEnvironment(ctx context.Context, req *proto.CreatEnvReques
 	// Start the environment
 	if err := env.Start(context.TODO()); err != nil {
 		log.Error().Err(err).Msg("error creating environment")
+		vpnIPPool.ReleaseIP(vpnIP)
+		if err := env.Close(); err != nil {
+			log.Error().Err(err).Msg("error closing environment after error creating it")
+		}
 		return &proto.StatusResponse{Message: "Error creating environment"}, err
 	}
 

diff --git a/internal/environment/environment.go b/internal/environment/environment.go
@@ -37,6 +37,7 @@ func (ec *EnvConfig) NewEnv(ctx context.Context) (*Environment, error) {
 	wgClient, err := wg.NewGRPCVPNClient(ec.VpnConfig)
 	if err != nil {
 		log.Error().Err(err).Msg("error connecting to wg server")
+		guac.Close()
 		return nil, err
 	}