mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ssh/tailssh: fix non-interactive commands as non-root user 

Updates #3802

Change-Id: I89a3f14420b8782bc407b1939dce54a1d24636da
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-02-24 11:08:06 -08:00 committed by Brad Fitzpatrick
parent e2ed06c53c
commit cce6aad6c0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssh/tailssh/tailssh.go
View File

@ -203,16 +203,19 @@ func (srv *server) handleAcceptedSSH(ctx context.Context, s ssh.Session, ci *ssh
return return
} }
cmd = exec.Command(loginShell(lu.Uid)) cmd = exec.Command(loginShell(lu.Uid))
if rawCmd := s.RawCommand(); rawCmd != "" {
cmd.Args = append(cmd.Args, "-c", rawCmd)
}
} else { } else {
if rawCmd := s.RawCommand(); rawCmd != "" { if rawCmd := s.RawCommand(); rawCmd != "" {
cmd = exec.Command("/usr/bin/env", "su", "-c", rawCmd, localUser) cmd = exec.Command("/usr/bin/env", "su", "-c", rawCmd, localUser)
cmd.Dir = lu.HomeDir
cmd.Env = append(cmd.Env, envForUser(lu)...)
// TODO: and Env for PATH, SSH_CONNECTION, SSH_CLIENT, XDG_SESSION_TYPE, XDG_*, etc // TODO: and Env for PATH, SSH_CONNECTION, SSH_CLIENT, XDG_SESSION_TYPE, XDG_*, etc
} else { } else {
cmd = exec.Command("/usr/bin/env", "su", "-", localUser) cmd = exec.Command("/usr/bin/env", "su", "-", localUser)
} }
} }
cmd.Dir = lu.HomeDir
cmd.Env = append(cmd.Env, envForUser(lu)...)
if ptyReq.Term != "" { if ptyReq.Term != "" {
cmd.Env = append(cmd.Env, fmt.Sprintf("TERM=%s", ptyReq.Term)) cmd.Env = append(cmd.Env, fmt.Sprintf("TERM=%s", ptyReq.Term))
} }
@ -397,7 +400,7 @@ func loginShell(uid string) string {
// out is "root:x:0:0:root:/root:/bin/bash" // out is "root:x:0:0:root:/root:/bin/bash"
f := strings.SplitN(string(out), ":", 10) f := strings.SplitN(string(out), ":", 10)
if len(f) > 6 { if len(f) > 6 {
return f[6] // shell return strings.TrimSpace(f[6]) // shell
} }
} }
if e := os.Getenv("SHELL"); e != "" { if e := os.Getenv("SHELL"); e != "" {