cmd/tailscale/cli: disable 'tailscale ssh' on sandboxed macOS

bradfitz · bradfitz · commit 0d972678e751 · 2022-06-06T08:54:38.000-07:00
Updates tailscale#3802 Updates tailscale#4518 Fixes tailscale#4628 Change-Id: I194d2cc30fc8e38b66d4910787efbce14317b0ff Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
diff --git a/cmd/tailscale/cli/ssh.go b/cmd/tailscale/cli/ssh.go
@@ -22,6 +22,7 @@ import (
 	"tailscale.com/envknob"
 	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/net/tsaddr"
+	"tailscale.com/version"
 )
 
 var sshCmd = &ffcli.Command{
@@ -32,6 +33,9 @@ var sshCmd = &ffcli.Command{
 }
 
 func runSSH(ctx context.Context, args []string) error {
+	if runtime.GOOS == "darwin" && version.IsSandboxedMacOS() && !envknob.UseWIPCode() {
+		return errors.New("The 'tailscale ssh' subcommand is not available on sandboxed macOS builds.\nUse the regular 'ssh' client instead.")
+	}
 	if len(args) == 0 {
 		return errors.New("usage: ssh [user@]<host>")
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import (`
`22`	`22`	`"tailscale.com/envknob"`
`23`	`23`	`"tailscale.com/ipn/ipnstate"`
`24`	`24`	`"tailscale.com/net/tsaddr"`
	`25`	`+ "tailscale.com/version"`
`25`	`26`	`)`
`26`	`27`
`27`	`28`	`var sshCmd = &ffcli.Command{`
`@@ -32,6 +33,9 @@ var sshCmd = &ffcli.Command{`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`func runSSH(ctx context.Context, args []string) error {`
	`36`	`+ if runtime.GOOS == "darwin" && version.IsSandboxedMacOS() && !envknob.UseWIPCode() {`
	`37`	`+ return errors.New("The 'tailscale ssh' subcommand is not available on sandboxed macOS builds.\nUse the regular 'ssh' client instead.")`
	`38`	`+ }`
`35`	`39`	`if len(args) == 0 {`
`36`	`40`	`return errors.New("usage: ssh [user@]<host>")`
`37`	`41`	`}`