diff --git a/cmd/root.go b/cmd/root.go index dab59e846..47ef5805b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -31,6 +31,7 @@ import ( wsCmdPkg "github.com/devsy-org/devsy/cmd/workspace" "github.com/devsy-org/devsy/pkg/clierr" "github.com/devsy-org/devsy/pkg/clihelp" + "github.com/devsy-org/devsy/pkg/command" "github.com/devsy-org/devsy/pkg/config" devcconfig "github.com/devsy-org/devsy/pkg/devcontainer/config" "github.com/devsy-org/devsy/pkg/exitcode" @@ -144,6 +145,7 @@ func isMachineConsumer(logOutput string, isInternal bool) bool { } func Execute() { + command.MarkInheritedFDsCloseOnExec() os.Exit(run()) } diff --git a/pkg/command/inherited_fds_linux.go b/pkg/command/inherited_fds_linux.go new file mode 100644 index 000000000..f56813296 --- /dev/null +++ b/pkg/command/inherited_fds_linux.go @@ -0,0 +1,34 @@ +package command + +import ( + "math" + "os" + "strconv" + + "golang.org/x/sys/unix" +) + +const firstInheritedFD = 3 + +var closeRange = unix.CloseRange + +func MarkInheritedFDsCloseOnExec() { + err := closeRange(firstInheritedFD, math.MaxUint32, unix.CLOSE_RANGE_CLOEXEC) + if err != nil { + markProcFDsCloseOnExec() + } +} + +func markProcFDsCloseOnExec() { + entries, err := os.ReadDir("/proc/self/fd") + if err != nil { + return + } + for _, entry := range entries { + fd, err := strconv.Atoi(entry.Name()) + if err != nil || fd < firstInheritedFD { + continue + } + unix.CloseOnExec(fd) + } +} diff --git a/pkg/command/inherited_fds_linux_test.go b/pkg/command/inherited_fds_linux_test.go new file mode 100644 index 000000000..b8e075ca6 --- /dev/null +++ b/pkg/command/inherited_fds_linux_test.go @@ -0,0 +1,61 @@ +package command + +import ( + "os" + "os/exec" + "testing" + + "github.com/stretchr/testify/require" + "golang.org/x/sys/unix" +) + +const inheritedFDsHelperEnv = "DEVSY_TEST_INHERITED_FDS_MODE" + +func TestMarkInheritedFDsCloseOnExec(t *testing.T) { + for _, mode := range []string{"close_range", "proc_fallback", "close_range_fails"} { + t.Run(mode, func(t *testing.T) { + leaked, err := os.Open(os.DevNull) + require.NoError(t, err) + t.Cleanup(func() { _ = leaked.Close() }) + + child := exec.Command( + os.Args[0], + "-test.run=^TestInheritedFDsHelper$", + ) // #nosec G204 G702 -- re-exec this test binary + child.Env = append(os.Environ(), inheritedFDsHelperEnv+"="+mode) + child.ExtraFiles = []*os.File{leaked} + child.Stderr = os.Stderr + output, err := child.Output() + require.NoError(t, err, string(output)) + }) + } +} + +func TestInheritedFDsHelper(t *testing.T) { + mode := os.Getenv(inheritedFDsHelperEnv) + if mode == "" { + return + } + const leakedFD = 3 + + flags, err := unix.FcntlInt(leakedFD, unix.F_GETFD, 0) + require.NoError(t, err) + require.Zero(t, flags&unix.FD_CLOEXEC) + + switch mode { + case "proc_fallback": + markProcFDsCloseOnExec() + case "close_range_fails": + closeRange = func(uint, uint, uint) error { return unix.EPERM } + MarkInheritedFDsCloseOnExec() + default: + MarkInheritedFDsCloseOnExec() + } + + flags, err = unix.FcntlInt(leakedFD, unix.F_GETFD, 0) + require.NoError(t, err) + require.NotZero(t, flags&unix.FD_CLOEXEC) + + grandchild := exec.Command("sh", "-c", "test ! -e /proc/$$/fd/3") + require.NoError(t, grandchild.Run()) +} diff --git a/pkg/command/inherited_fds_other.go b/pkg/command/inherited_fds_other.go new file mode 100644 index 000000000..b92f58682 --- /dev/null +++ b/pkg/command/inherited_fds_other.go @@ -0,0 +1,5 @@ +//go:build !linux + +package command + +func MarkInheritedFDsCloseOnExec() {}