refactor

Author: evgeniy-scherbina

cli/cli.go

@@ -102,7 +102,7 @@ func Run(ctx context.Context, config Config, args []string) error {
 		//fmt.Printf("%v\n", os.Environ())
 		time.Sleep(time.Second * 3) // wait for parent to configure env
 
-		vethNetJail := os.Getenv("VETH_NET_JAIL")
+		vethNetJail := os.Getenv("VETH_JAIL_NAME")
 
 		err := jail.SetupChildNetworking(vethNetJail)
 		if err != nil {
@@ -224,7 +224,7 @@ func Run(ctx context.Context, config Config, args []string) error {
 		defer cancel()
 		cmd := boundaryInstance.Command(os.Args)
 		cmd.Env = append(cmd.Env, "CHILD=true")
-		cmd.Env = append(cmd.Env, fmt.Sprintf("VETH_NET_JAIL=%v", boundaryInstance.GetNetworkConfiguration().VethNetJail))
+		cmd.Env = append(cmd.Env, fmt.Sprintf("VETH_JAIL_NAME=%v", boundaryInstance.GetNetworkConfiguration().VethJailName))
 		cmd.Stderr = os.Stderr
 		cmd.Stdout = os.Stdout
 		cmd.Stdin = os.Stdin

jail/jail.go

@@ -10,13 +10,13 @@ import (
 type Jailer interface {
 	ConfigureBeforeCommandExecution() error
 	Command(command []string) *exec.Cmd
-	ConfigureAfterCommandExecution(processPID int)
+	ConfigureAfterCommandExecution(processPID int) error
 	Close() error
 	GetNetworkConfiguration() NetworkConfiguration
 }
 
 type NetworkConfiguration struct {
-	VethNetJail string
+	VethJailName string
 }
 
 type Config struct {

jail/linux.go

@@ -192,23 +192,23 @@ func (l *LinuxJail) Command(command []string) *exec.Cmd {
 	return cmd
 }
 
-func (l *LinuxJail) ConfigureAfterCommandExecution(pidInt int) {
+func (l *LinuxJail) ConfigureAfterCommandExecution(pidInt int) error {
 	err := l.configureParentNetworkingStep2(pidInt)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "failed setupParentNetworking: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("failed to configure parent networking: %v", err)
 	}
 
 	err = l.configureIptables()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "can't setup iptables: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("failed to configure iptables: %v", err)
 	}
+
+	return nil
 }
 
 func (l *LinuxJail) GetNetworkConfiguration() NetworkConfiguration {
 	return NetworkConfiguration{
-		VethNetJail: l.vethJailName,
+		VethJailName: l.vethJailName,
 	}
 }
 

jail/macos.go

@@ -341,7 +341,9 @@ func (n *MacOSJail) cleanupTempFiles() {
 	}
 }
 
-func (u *MacOSJail) ConfigureAfterCommandExecution(processPID int) {}
+func (u *MacOSJail) ConfigureAfterCommandExecution(processPID int) error {
+	return nil
+}
 
 func (l *MacOSJail) GetNetworkConfiguration() NetworkConfiguration {
 	return NetworkConfiguration{}

jail/unprivileged.go

@@ -61,7 +61,9 @@ func (u *Unprivileged) Close() error {
 	return nil
 }
 
-func (u *Unprivileged) ConfigureAfterCommandExecution(processPID int) {}
+func (u *Unprivileged) ConfigureAfterCommandExecution(processPID int) error {
+	return nil
+}
 
 func (l *Unprivileged) GetNetworkConfiguration() NetworkConfiguration {
 	return NetworkConfiguration{}