From af1f2b469a111ec51191ce9c878c260f12507985 Mon Sep 17 00:00:00 2001 From: chenwenhui Date: Thu, 21 May 2026 17:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0sandbox=E5=AF=B9windows?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=94=AF=E6=8C=81=EF=BC=8C=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=AFlinux=E7=9A=84=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=EF=BC=8Cwindows=E7=9B=B4=E6=8E=A5=E7=BC=96=E8=AF=91=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/sandbox/local.go | 7 ++----- internal/sandbox/local_unix.go | 20 ++++++++++++++++++++ internal/sandbox/local_windows.go | 17 +++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 internal/sandbox/local_unix.go create mode 100644 internal/sandbox/local_windows.go diff --git a/internal/sandbox/local.go b/internal/sandbox/local.go index 46d0e060..80a4591e 100644 --- a/internal/sandbox/local.go +++ b/internal/sandbox/local.go @@ -8,7 +8,6 @@ import ( "os/exec" "path/filepath" "strings" - "syscall" "time" ) @@ -89,9 +88,7 @@ func (s *LocalSandbox) Execute(ctx context.Context, config *ExecuteConfig) (*Exe cmd.Env = s.buildEnvironment(config.Env) // Setup process group for cleanup - cmd.SysProcAttr = &syscall.SysProcAttr{ - Setpgid: true, - } + setupProcessGroup(cmd) var stdout, stderr bytes.Buffer cmd.Stdout = &stdout @@ -115,7 +112,7 @@ func (s *LocalSandbox) Execute(ctx context.Context, config *ExecuteConfig) (*Exe if execCtx.Err() == context.DeadlineExceeded { // Kill the process group if cmd.Process != nil { - syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL) + killProcessGroup(cmd) } result.Killed = true result.Error = ErrTimeout.Error() diff --git a/internal/sandbox/local_unix.go b/internal/sandbox/local_unix.go new file mode 100644 index 00000000..ec03e6a3 --- /dev/null +++ b/internal/sandbox/local_unix.go @@ -0,0 +1,20 @@ +//go:build !windows + +package sandbox + +import ( + "os/exec" + "syscall" +) + +func setupProcessGroup(cmd *exec.Cmd) { + cmd.SysProcAttr = &syscall.SysProcAttr{ + Setpgid: true, + } +} + +func killProcessGroup(cmd *exec.Cmd) { + if cmd.Process != nil { + syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL) + } +} diff --git a/internal/sandbox/local_windows.go b/internal/sandbox/local_windows.go new file mode 100644 index 00000000..17141b0c --- /dev/null +++ b/internal/sandbox/local_windows.go @@ -0,0 +1,17 @@ +//go:build windows + +package sandbox + +import ( + "os/exec" +) + +func setupProcessGroup(cmd *exec.Cmd) { + // Windows does not support Setpgid; process groups are managed via Job Objects +} + +func killProcessGroup(cmd *exec.Cmd) { + if cmd.Process != nil { + cmd.Process.Kill() + } +}