lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/tailscale: have web POST wait for authURL 

Fixes #1939

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
pull/1992/head^2
David Crawshaw 2021-05-27 10:18:42 -07:00 committed by David Crawshaw
parent 50c976d3f1
commit 82b217f82e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/tailscale/cli/web.go
View File

@ -321,6 +321,10 @@ func tailscaleUpForceReauth(ctx context.Context) (authURL string, retErr error)
}) })
bc.StartLoginInteractive() bc.StartLoginInteractive()
<-pumpCtx.Done() // wait for authURL or complete failure
if authURL == "" && retErr == nil {
retErr = pumpCtx.Err()
}
if authURL == "" && retErr == nil { if authURL == "" && retErr == nil {
return "", fmt.Errorf("login failed with no backend error message") return "", fmt.Errorf("login failed with no backend error message")
} }