TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: make 'tailscale debug ts2021' try twice

Browse Source 
In prep for a future port 80 MITM fix, make the 'debug ts2021' command
retry once after a failure to give it a chance to pick a new strategy.

Updates #13597

Change-Id: Icb7bad60cbf0dbec78097df4a00e9795757bc8e4
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2024-10-01 09:12:39 -07:00 committed by Brad Fitzpatrick
parent 8f44ba1cd6
commit d3f302d8e2
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/tailscale/cli/debug.go
View File

@ -844,7 +844,8 @@ func runTS2021(ctx context.Context, args []string) error {
if ts2021Args.verbose { if ts2021Args.verbose {
logf = log.Printf logf = log.Printf
} }
conn, err := (&controlhttp.Dialer{
noiseDialer := &controlhttp.Dialer{
Hostname: ts2021Args.host, Hostname: ts2021Args.host,
HTTPPort: "80", HTTPPort: "80",
HTTPSPort: "443", HTTPSPort: "443",
@ -853,7 +854,21 @@ func runTS2021(ctx context.Context, args []string) error {
ProtocolVersion: uint16(ts2021Args.version), ProtocolVersion: uint16(ts2021Args.version),
Dialer: dialFunc, Dialer: dialFunc,
Logf: logf, Logf: logf,
}).Dial(ctx) }
const tries = 2
for i := range tries {
err := tryConnect(ctx, keys.PublicKey, noiseDialer)
if err != nil {
log.Printf("error on attempt %d/%d: %v", i+1, tries, err)
continue
}
break
}
return nil
}
func tryConnect(ctx context.Context, controlPublic key.MachinePublic, noiseDialer *controlhttp.Dialer) error {
conn, err := noiseDialer.Dial(ctx)
log.Printf("controlhttp.Dial = %p, %v", conn, err) log.Printf("controlhttp.Dial = %p, %v", conn, err)
if err != nil { if err != nil {
return err return err
@ -861,8 +876,8 @@ func runTS2021(ctx context.Context, args []string) error {
log.Printf("did noise handshake") log.Printf("did noise handshake")
gotPeer := conn.Peer() gotPeer := conn.Peer()
if gotPeer != keys.PublicKey { if gotPeer != controlPublic {
log.Printf("peer = %v, want %v", gotPeer, keys.PublicKey) log.Printf("peer = %v, want %v", gotPeer, controlPublic)
return errors.New("key mismatch") return errors.New("key mismatch")
} }
@ -894,7 +909,7 @@ func runTS2021(ctx context.Context, args []string) error {
// Make a /whoami request to the server to verify that we can actually // Make a /whoami request to the server to verify that we can actually
// communicate over the newly-established connection. // communicate over the newly-established connection.
whoamiURL := "http://" + ts2021Args.host + "/machine/whoami" whoamiURL := "http://" + ts2021Args.host + "/machine/whoami"
req, err = http.NewRequestWithContext(ctx, "GET", whoamiURL, nil) req, err := http.NewRequestWithContext(ctx, "GET", whoamiURL, nil)
if err != nil { if err != nil {
return err return err
} }