ipn/ipnlocal: fix cert fetching on macOS GUI platforms

bradfitz · bradfitz · commit 3690bfecb09d · 2022-01-06T07:59:20.000-08:00
And clarify the directory they get written to when under the sandbox. Fixes tailscale#3667 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
diff --git a/cmd/tailscale/cli/cert.go b/cmd/tailscale/cli/cert.go
@@ -108,7 +108,7 @@ func runCert(ctx context.Context, args []string) error {
 		if version.IsMacSysExt() {
 			dir = "io.tailscale.ipn.macsys"
 		}
-		printf("Warning: the macOS CLI runs in a sandbox; this binary's filesystem writes go to $HOME/Library/Containers/%s\n", dir)
+		printf("Warning: the macOS CLI runs in a sandbox; this binary's filesystem writes go to $HOME/Library/Containers/%s/Data\n", dir)
 	}
 	if certArgs.certFile != "" {
 		certChanged, err := writeIfChanged(certArgs.certFile, certPEM, 0644)
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go
@@ -2121,7 +2121,7 @@ func (b *LocalBackend) TailscaleVarRoot() string {
 		return b.varRoot
 	}
 	switch runtime.GOOS {
-	case "ios", "android":
+	case "ios", "android", "darwin":
 		dir, _ := paths.AppSharedDir.Load().(string)
 		return dir
 	}

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func runCert(ctx context.Context, args []string) error {`
`108`	`108`	`if version.IsMacSysExt() {`
`109`	`109`	`dir = "io.tailscale.ipn.macsys"`
`110`	`110`	`}`
`111`		`- printf("Warning: the macOS CLI runs in a sandbox; this binary's filesystem writes go to $HOME/Library/Containers/%s\n", dir)`
	`111`	`+ printf("Warning: the macOS CLI runs in a sandbox; this binary's filesystem writes go to $HOME/Library/Containers/%s/Data\n", dir)`
`112`	`112`	`}`
`113`	`113`	`if certArgs.certFile != "" {`
`114`	`114`	`certChanged, err := writeIfChanged(certArgs.certFile, certPEM, 0644)`
Original file line number	Diff line number	Diff line change
`@@ -2121,7 +2121,7 @@ func (b *LocalBackend) TailscaleVarRoot() string {`
`2121`	`2121`	`return b.varRoot`
`2122`	`2122`	`}`
`2123`	`2123`	`switch runtime.GOOS {`
`2124`		`- case "ios", "android":`
	`2124`	`+ case "ios", "android", "darwin":`
`2125`	`2125`	`dir, _ := paths.AppSharedDir.Load().(string)`
`2126`	`2126`	`return dir`
`2127`	`2127`	`}`