TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-05 15:55:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale: don't print out old authURL on up --force-reauth

Browse Source 
Fixes #1671

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-04-21 22:42:01 -07:00 committed by Brad Fitzpatrick
parent 12b4672add
commit 820952daba
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/tailscale/cli/up.go
View File

@ -245,6 +245,23 @@ func runUp(ctx context.Context, args []string) error {
if err != nil { if err != nil {
fatalf("can't fetch status from tailscaled: %v", err) fatalf("can't fetch status from tailscaled: %v", err)
} }
origAuthURL := st.AuthURL
// printAuthURL reports whether we should print out the
// provided auth URL from an IPN notify.
printAuthURL := func(url string) bool {
if upArgs.authKey != "" {
// Issue 1755: when using an authkey, don't
// show an authURL that might still be pending
// from a previous non-completed interactive
// login.
return false
}
if upArgs.forceReauth && url == origAuthURL {
return false
}
return true
}
if distro.Get() == distro.Synology { if distro.Get() == distro.Synology {
notSupported := "not yet supported on Synology; see https://github.com/tailscale/tailscale/issues/451" notSupported := "not yet supported on Synology; see https://github.com/tailscale/tailscale/issues/451"
@ -367,7 +384,7 @@ func runUp(ctx context.Context, args []string) error {
cancel() cancel()
} }
} }
if url := n.BrowseToURL; url != nil && upArgs.authKey == "" { if url := n.BrowseToURL; url != nil && printAuthURL(*url) {
printed = true printed = true
fmt.Fprintf(os.Stderr, "\nTo authenticate, visit:\n\n\t%s\n\n", *url) fmt.Fprintf(os.Stderr, "\nTo authenticate, visit:\n\n\t%s\n\n", *url)
} }