Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -144,6 +145,7 @@ func isMachineConsumer(logOutput string, isInternal bool) bool {
}

func Execute() {
command.MarkInheritedFDsCloseOnExec()
os.Exit(run())
}

Expand Down
34 changes: 34 additions & 0 deletions pkg/command/inherited_fds_linux.go
Original file line number Diff line number Diff line change
@@ -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)
}
}
61 changes: 61 additions & 0 deletions pkg/command/inherited_fds_linux_test.go
Original file line number Diff line number Diff line change
@@ -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())
}
5 changes: 5 additions & 0 deletions pkg/command/inherited_fds_other.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//go:build !linux

package command

func MarkInheritedFDsCloseOnExec() {}
Loading