Dec 5, 2024 · Dec 5, 2024
diff --git a/agent/agentexec/cli_linux.go b/agent/agentexec/cli_linux.go
 "os"
 "os/exec"
 "runtime"
 "slices"
 "strconv"
 "strings"
 "syscall"
 return xerrors.Errorf("look path: %w", err)
 }

 return syscall.Exec(path, args, os.Environ())
 // Remove environment variables specific to the agentexec command. This is
 // especially important for environments that are attempting to develop Coder in Coder.
 env := os.Environ()
 env = slices.DeleteFunc(env, func(e string) bool {
 return strings.HasPrefix(e, EnvProcPrioMgmt) ||
 strings.HasPrefix(e, EnvProcOOMScore) ||
 strings.HasPrefix(e, EnvProcNiceScore)
 })

 return syscall.Exec(path, args, env)
 }

 func defaultNiceScore() (int, error) {
diff --git a/agent/agentexec/cli_linux_test.go b/agent/agentexec/cli_linux_test.go
 "os"
 "os/exec"
 "path/filepath"
 "slices"
 "strconv"
 "strings"
 "syscall"
 "golang.org/x/sys/unix"
 "golang.org/x/xerrors"

 "github.com/coder/coder/v2/agent/agentexec"
 "github.com/coder/coder/v2/testutil"
 )

 requireNiceScore(t, cmd.Process.Pid, 12)
 })

 t.Run("FiltersEnv", func(t *testing.T) {
 ctx := testutil.Context(t, testutil.WaitMedium)
 cmd, path := cmd(ctx, t, 123, 12)
 cmd.Env = append(cmd.Env, fmt.Sprintf("%s=true", agentexec.EnvProcPrioMgmt))
 cmd.Env = append(cmd.Env, fmt.Sprintf("%s=123", agentexec.EnvProcOOMScore))
 cmd.Env = append(cmd.Env, fmt.Sprintf("%s=12", agentexec.EnvProcNiceScore))
 // Ensure unrelated environment variables are preserved.
 cmd.Env = append(cmd.Env, "CODER_TEST_ME_AGENTEXEC=true")
 err := cmd.Start()
 require.NoError(t, err)
 go cmd.Wait()
 waitForSentinel(ctx, t, cmd, path)

 env := procEnv(t, cmd.Process.Pid)
 hasExecEnvs := slices.ContainsFunc(
 env,
 func(e string) bool {
 return strings.HasPrefix(e, agentexec.EnvProcPrioMgmt) ||
 strings.HasPrefix(e, agentexec.EnvProcOOMScore) ||
 strings.HasPrefix(e, agentexec.EnvProcNiceScore)
 })
 require.False(t, hasExecEnvs, "expected environment variables to be filtered")
 userEnv := slices.Contains(env, "CODER_TEST_ME_AGENTEXEC=true")
 require.True(t, userEnv, "expected user environment variables to be preserved")
 })

 t.Run("Defaults", func(t *testing.T) {
 ctx := testutil.Context(t, testutil.WaitMedium)
 cmd, path := cmd(ctx, t, 0, 0)
 return 998
 }

 // procEnv returns the environment variables for a given process.
 func procEnv(t *testing.T, pid int) []string {
 t.Helper()

 env, err := os.ReadFile(fmt.Sprintf("/proc/%d/environ", pid))
 require.NoError(t, err)
 return strings.Split(string(env), "\x00")
 }

 func expectedNiceScore(t *testing.T) int {
 t.Helper()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@ import (
		"os"
		"os/exec"
		"runtime"
		"slices"
		"strconv"
		"strings"
		"syscall"
Expand DownExpand Up		@@ -111,7 +112,16 @@ func CLI() error {
		return xerrors.Errorf("look path: %w", err)
		}

		return syscall.Exec(path, args, os.Environ())
		// Remove environment variables specific to the agentexec command. This is
		// especially important for environments that are attempting to develop Coder in Coder.
		env := os.Environ()
		env = slices.DeleteFunc(env, func(e string) bool {
		return strings.HasPrefix(e, EnvProcPrioMgmt) \|\|
		strings.HasPrefix(e, EnvProcOOMScore) \|\|
		strings.HasPrefix(e, EnvProcNiceScore)
		})

		return syscall.Exec(path, args, env)
		}

		func defaultNiceScore() (int, error) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,7 @@ import (
		"os"
		"os/exec"
		"path/filepath"
		"slices"
		"strconv"
		"strings"
		"syscall"
Expand All		@@ -20,6 +21,7 @@ import (
		"golang.org/x/sys/unix"
		"golang.org/x/xerrors"

		"github.com/coder/coder/v2/agent/agentexec"
		"github.com/coder/coder/v2/testutil"
		)

Expand All		@@ -37,6 +39,32 @@ func TestCLI(t *testing.T) {
		requireNiceScore(t, cmd.Process.Pid, 12)
		})

		t.Run("FiltersEnv", func(t *testing.T) {
		ctx := testutil.Context(t, testutil.WaitMedium)
		cmd, path := cmd(ctx, t, 123, 12)
		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=true", agentexec.EnvProcPrioMgmt))
		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=123", agentexec.EnvProcOOMScore))
		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=12", agentexec.EnvProcNiceScore))
		// Ensure unrelated environment variables are preserved.
		cmd.Env = append(cmd.Env, "CODER_TEST_ME_AGENTEXEC=true")
		err := cmd.Start()
		require.NoError(t, err)
		go cmd.Wait()
		waitForSentinel(ctx, t, cmd, path)

		env := procEnv(t, cmd.Process.Pid)
		hasExecEnvs := slices.ContainsFunc(
		env,
		func(e string) bool {
		return strings.HasPrefix(e, agentexec.EnvProcPrioMgmt) \|\|
		strings.HasPrefix(e, agentexec.EnvProcOOMScore) \|\|
		strings.HasPrefix(e, agentexec.EnvProcNiceScore)
		})
		require.False(t, hasExecEnvs, "expected environment variables to be filtered")
		userEnv := slices.Contains(env, "CODER_TEST_ME_AGENTEXEC=true")
		require.True(t, userEnv, "expected user environment variables to be preserved")
		})

		t.Run("Defaults", func(t *testing.T) {
		ctx := testutil.Context(t, testutil.WaitMedium)
		cmd, path := cmd(ctx, t, 0, 0)
Expand DownExpand Up		@@ -176,6 +204,15 @@ func expectedOOMScore(t *testing.T) int {
		return 998
		}

		// procEnv returns the environment variables for a given process.
		func procEnv(t *testing.T, pid int) []string {
		t.Helper()

		env, err := os.ReadFile(fmt.Sprintf("/proc/%d/environ", pid))
		require.NoError(t, err)
		return strings.Split(string(env), "\x00")
		}

		func expectedNiceScore(t *testing.T) int {
		t.Helper()

Expand Down