diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/tailscale/tailscale.go | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/client/tailscale/tailscale.go b/client/tailscale/tailscale.go index 3947f4ff5..62e0e69fc 100644 --- a/client/tailscale/tailscale.go +++ b/client/tailscale/tailscale.go @@ -16,10 +16,14 @@ import ( "strconv" "tailscale.com/ipn/ipnstate" + "tailscale.com/paths" "tailscale.com/safesocket" "tailscale.com/tailcfg" ) +// TailscaledSocket is the tailscaled Unix socket. +var TailscaledSocket = paths.DefaultTailscaledSocket() + // tsClient does HTTP requests to the local Tailscale daemon. var tsClient = &http.Client{ Transport: &http.Transport{ @@ -27,14 +31,16 @@ var tsClient = &http.Client{ if addr != "local-tailscaled.sock:80" { return nil, fmt.Errorf("unexpected URL address %q", addr) } - // On macOS, when dialing from non-sandboxed program to sandboxed GUI running - // a TCP server on a random port, find the random port. For HTTP connections, - // we don't send the token. It gets added in an HTTP Basic-Auth header. - if port, _, err := safesocket.LocalTCPPortAndToken(); err == nil { - var d net.Dialer - return d.DialContext(ctx, "tcp", "localhost:"+strconv.Itoa(port)) + if TailscaledSocket == paths.DefaultTailscaledSocket() { + // On macOS, when dialing from non-sandboxed program to sandboxed GUI running + // a TCP server on a random port, find the random port. For HTTP connections, + // we don't send the token. It gets added in an HTTP Basic-Auth header. + if port, _, err := safesocket.LocalTCPPortAndToken(); err == nil { + var d net.Dialer + return d.DialContext(ctx, "tcp", "localhost:"+strconv.Itoa(port)) + } } - return safesocket.ConnectDefault() + return safesocket.Connect(TailscaledSocket, 41112) }, }, } |