honor task user when execing into raw_exec task

drivers/rawexec/driver_unix_test.go

@@ -339,6 +339,45 @@ func TestRawExec_ExecTaskStreaming(t *testing.T) {
 
 }
 
+func TestRawExec_ExecTaskStreaming_User(t *testing.T) {
+	t.Parallel()
+	if runtime.GOOS != "linux" {
+		t.Skip("skip, requires running on Linux for testing custom user setting")
+	}
+
+	d := newEnabledRawExecDriver(t)
+	harness := dtestutil.NewDriverHarness(t, d)
+	defer harness.Kill()
+
+	task := &drivers.TaskConfig{
+		ID:   uuid.Generate(),
+		Name: "sleep",
+		User: "nobody",
+	}
+
+	cleanup := harness.MkAllocDir(task, false)
+	defer cleanup()
+
+	err := os.Chmod(task.AllocDir, 0777)
+	require.NoError(t, err)
+
+	tc := &TaskConfig{
+		Command: "/bin/sleep",
+		Args:    []string{"9000"},
+	}
+	require.NoError(t, task.EncodeConcreteDriverConfig(&tc))
+	testtask.SetTaskConfigEnv(task)
+
+	_, _, err = harness.StartTask(task)
+	require.NoError(t, err)
+	defer d.DestroyTask(task.ID, true)
+
+	code, stdout, stderr := dtestutil.ExecTask(t, harness, task.ID, "whoami", false, "")
+	require.Zero(t, code)
+	require.Empty(t, stderr)
+	require.Contains(t, stdout, "nobody")
+}
+
 func TestRawExecDriver_NoCgroup(t *testing.T) {
 	t.Parallel()
 	if runtime.GOOS != "linux" {

drivers/shared/executor/executor.go

@@ -266,7 +266,7 @@ func (e *UniversalExecutor) Launch(command *ExecCommand) (*ProcessState, error)
 	// setting the user of the process
 	if command.User != "" {
 		e.logger.Debug("running command as user", "user", command.User)
-		if err := e.runAs(command.User); err != nil {
+		if err := setCmdUser(&e.childCmd, command.User); err != nil {
 			return nil, err
 		}
 	}
@@ -408,6 +408,12 @@ func (e *UniversalExecutor) ExecStreaming(ctx context.Context, command []string,
 			return nil
 		},
 		processStart: func() error {
+			if u := e.commandCfg.User; u != "" {
+				if err := setCmdUser(cmd, u); err != nil {
+					return err
+				}
+			}
+
 			return withNetworkIsolation(cmd.Start, e.commandCfg.NetworkIsolation)
 		},
 		processWait: func() (*os.ProcessState, error) {

drivers/shared/executor/executor_basic.go

@@ -3,6 +3,8 @@
 package executor
 
 import (
+	"os/exec"
+
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/nomad/plugins/drivers"
 )
@@ -15,8 +17,6 @@ func NewExecutorWithIsolation(logger hclog.Logger) Executor {
 
 func (e *UniversalExecutor) configureResourceContainer(_ int) error { return nil }
 
-func (e *UniversalExecutor) runAs(_ string) error { return nil }
-
 func (e *UniversalExecutor) getAllPids() (map[int]*nomadPid, error) {
 	return getAllPidsByScanning()
 }
@@ -28,3 +28,5 @@ func (e *UniversalExecutor) start(command *ExecCommand) error {
 func withNetworkIsolation(f func() error, _ *drivers.NetworkIsolationSpec) error {
 	return f()
 }
+
+func setCmdUser(*exec.Cmd, string) error { return nil }

drivers/shared/executor/executor_universal_linux.go

@@ -3,6 +3,7 @@ package executor
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"os/user"
 	"strconv"
 	"syscall"
@@ -16,9 +17,9 @@ import (
 	"github.com/opencontainers/runc/libcontainer/specconv"
 )
 
-// runAs takes a user id as a string and looks up the user, and sets the command
+// setCmdUser takes a user id as a string and looks up the user, and sets the command
 // to execute as that user.
-func (e *UniversalExecutor) runAs(userid string) error {
+func setCmdUser(cmd *exec.Cmd, userid string) error {
 	u, err := user.Lookup(userid)
 	if err != nil {
 		return fmt.Errorf("Failed to identify user %v: %v", userid, err)
@@ -51,17 +52,15 @@ func (e *UniversalExecutor) runAs(userid string) error {
 	}
 
 	// Set the command to run as that user and group.
-	if e.childCmd.SysProcAttr == nil {
-		e.childCmd.SysProcAttr = &syscall.SysProcAttr{}
+	if cmd.SysProcAttr == nil {
+		cmd.SysProcAttr = &syscall.SysProcAttr{}
 	}
-	if e.childCmd.SysProcAttr.Credential == nil {
-		e.childCmd.SysProcAttr.Credential = &syscall.Credential{}
+	if cmd.SysProcAttr.Credential == nil {
+		cmd.SysProcAttr.Credential = &syscall.Credential{}
 	}
-	e.childCmd.SysProcAttr.Credential.Uid = uint32(uid)
-	e.childCmd.SysProcAttr.Credential.Gid = uint32(gid)
-	e.childCmd.SysProcAttr.Credential.Groups = gids
-
-	e.logger.Debug("setting process user", "user", uid, "group", gid, "additional_groups", gids)
+	cmd.SysProcAttr.Credential.Uid = uint32(uid)
+	cmd.SysProcAttr.Credential.Gid = uint32(gid)
+	cmd.SysProcAttr.Credential.Groups = gids
 
 	return nil
 }

plugins/drivers/testutils/exec_testing.go

@@ -208,6 +208,11 @@ func TestExecFSIsolation(t *testing.T, driver *DriverHarness, taskID string) {
 	})
 }
 
+func ExecTask(t *testing.T, driver *DriverHarness, taskID string, cmd string, tty bool, stdin string) (exitCode int, stdout, stderr string) {
+	r := execTask(t, driver, taskID, cmd, tty, stdin)
+	return r.exitCode, r.stdout, r.stderr
+}
+
 func execTask(t *testing.T, driver *DriverHarness, taskID string, cmd string, tty bool, stdin string) execResult {
 	stream := newTestExecStream(t, tty, stdin)