lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ssh/tailssh: detect user shell correctly on darwin 

Updates #6213

Signed-off-by: Maisem Ali <maisem@tailscale.com>
pull/7325/head
Maisem Ali 2023-02-18 14:53:19 -08:00
parent 6dabb34c7f
commit 5787989d74
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ssh/tailssh/incubator.go
View File

@ -83,7 +83,7 @@ func (ss *sshSession) newIncubatorCommand() (cmd *exec.Cmd) {
case "sftp": case "sftp":
isSFTP = true isSFTP = true
case "": case "":
name = loginShell(ss.conn.localUser.Uid) name = loginShell(ss.conn.localUser)
if rawCmd := ss.RawCommand(); rawCmd != "" { if rawCmd := ss.RawCommand(); rawCmd != "" {
args = append(args, "-c", rawCmd) args = append(args, "-c", rawCmd)
} else { } else {
@ -572,15 +572,23 @@ func (ss *sshSession) startWithStdPipes() (err error) {
return nil return nil
} }
func loginShell(uid string) string { func loginShell(u *user.User) string {
switch runtime.GOOS { switch runtime.GOOS {
case "linux": case "linux":
out, _ := exec.Command("getent", "passwd", uid).Output() out, _ := exec.Command("getent", "passwd", u.Uid).Output()
// 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 strings.TrimSpace(f[6]) // shell return strings.TrimSpace(f[6]) // shell
} }
case "darwin":
// Note: /Users/username is key, and not the same as u.HomeDir.
out, _ := exec.Command("dscl", ".", "-read", filepath.Join("/Users", u.Username), "UserShell").Output()
// out is "UserShell: /bin/bash"
s, ok := strings.CutPrefix(string(out), "UserShell: ")
if ok {
return strings.TrimSpace(s)
}
} }
if e := os.Getenv("SHELL"); e != "" { if e := os.Getenv("SHELL"); e != "" {
return e return e
@ -590,7 +598,7 @@ func loginShell(uid string) string {
func envForUser(u *user.User) []string { func envForUser(u *user.User) []string {
return []string{ return []string{
fmt.Sprintf("SHELL=" + loginShell(u.Uid)), fmt.Sprintf("SHELL=" + loginShell(u)),
fmt.Sprintf("USER=" + u.Username), fmt.Sprintf("USER=" + u.Username),
fmt.Sprintf("HOME=" + u.HomeDir), fmt.Sprintf("HOME=" + u.HomeDir),
fmt.Sprintf("PATH=" + defaultPathForUser(u)), fmt.Sprintf("PATH=" + defaultPathForUser(u)),