ssh/tailssh: fix /usr/bin/login args on macOS

aeijdenberg · bradfitz · commit 7f807fef6cfd · 2022-06-25T22:17:53.000-07:00
Fixes tailscale#4931 Signed-off-by: Adam Eijdenberg <adam@continusec.com>
diff --git a/ssh/tailssh/incubator.go b/ssh/tailssh/incubator.go
@@ -206,7 +206,7 @@ func beIncubator(args []string) error {
 		// If we are trying to launch a login shell, just exec into login
 		// instead. We can only do this if a TTY was requested, otherwise login
 		// exits immediately, which breaks things likes mosh and VSCode.
-		return unix.Exec(ia.loginCmdPath, []string{ia.loginCmdPath, "-f", ia.localUser, "-h", ia.remoteIP, "-p"}, os.Environ())
+		return unix.Exec(ia.loginCmdPath, ia.loginArgs(), os.Environ())
 	}
 
 	// Inform the system that we are about to log someone in.
diff --git a/ssh/tailssh/incubator_darwin.go b/ssh/tailssh/incubator_darwin.go
@@ -0,0 +1,9 @@
+// Copyright (c) 2022 Tailscale Inc & AUTHORS All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package tailssh
+
+func (ia *incubatorArgs) loginArgs() []string {
+	return []string{ia.loginCmdPath, "-fp", "-h", ia.remoteIP, ia.localUser}
+}
diff --git a/ssh/tailssh/incubator_linux.go b/ssh/tailssh/incubator_linux.go
@@ -173,3 +173,7 @@ func maybeStartLoginSessionLinux(logf logger.Logf, ia incubatorArgs) (func() err
 	}
 	return nil, nil
 }
+
+func (ia *incubatorArgs) loginArgs() []string {
+	return []string{ia.loginCmdPath, "-f", ia.localUser, "-h", ia.remoteIP, "-p"}
+}

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ func beIncubator(args []string) error {`
`206`	`206`	`// If we are trying to launch a login shell, just exec into login`
`207`	`207`	`// instead. We can only do this if a TTY was requested, otherwise login`
`208`	`208`	`// exits immediately, which breaks things likes mosh and VSCode.`
`209`		`- return unix.Exec(ia.loginCmdPath, []string{ia.loginCmdPath, "-f", ia.localUser, "-h", ia.remoteIP, "-p"}, os.Environ())`
	`209`	`+ return unix.Exec(ia.loginCmdPath, ia.loginArgs(), os.Environ())`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`// Inform the system that we are about to log someone in.`
Original file line number	Diff line number	Diff line change
`@@ -173,3 +173,7 @@ func maybeStartLoginSessionLinux(logf logger.Logf, ia incubatorArgs) (func() err`
`173`	`173`	`}`
`174`	`174`	`return nil, nil`
`175`	`175`	`}`
	`176`	`+`
	`177`	`+func (ia *incubatorArgs) loginArgs() []string {`
	`178`	`+ return []string{ia.loginCmdPath, "-f", ia.localUser, "-h", ia.remoteIP, "-p"}`
	`179`	`+}`