wip

pkg/build/safe.go

@@ -18,10 +18,12 @@ package build
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
 	"net/rpc"
 	"os"
 	"os/exec"
+	"sync"
 	"syscall"
 
 	"github.com/hashicorp/go-plugin"
@@ -217,10 +219,12 @@ var pluginMap = map[string]plugin.Plugin{
 	"installer":       &InstallerPlugin{},
 }
 
-func GetSafeScriptExecutor() (ScriptExecutor, error) {
+func GetSafeScriptExecutor() (ScriptExecutor, func(), error) {
+	var err error
+
 	executable, err := os.Executable()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	cmd := exec.Command(executable, "_internal-safe-script-executor")
@@ -233,7 +237,7 @@ func GetSafeScriptExecutor() (ScriptExecutor, error) {
 	}
 	uid, gid, err := utils.GetUidGidAlrUser()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Credential: &syscall.Credential{
@@ -254,14 +258,33 @@ func GetSafeScriptExecutor() (ScriptExecutor, error) {
 	})
 	rpcClient, err := client.Client()
 	if err != nil {
-		slog.Info("1")
-		return nil, err
+		return nil, nil, err
 	}
 
-	raw1, err := rpcClient.Dispense("script-executor")
+	var cleanupOnce sync.Once
+	cleanup := func() {
+		cleanupOnce.Do(func() {
+			client.Kill()
+		})
+	}
+
+	defer func() {
+		if err != nil {
+			slog.Debug("close script-executor")
+			cleanup()
+		}
+	}()
+
+	raw, err := rpcClient.Dispense("script-executor")
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	return raw1.(ScriptExecutor), nil
+	executor, ok := raw.(ScriptExecutor)
+	if !ok {
+		err = fmt.Errorf("dispensed object is not a ScriptExecutor (got %T)", raw)
+		return nil, nil, err
+	}
+
+	return executor, cleanup, nil
 }