TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn: always treat login.tailscale.com as controlplane.tailscale.com

Browse Source 
Like 888e50e1, but more aggressive.

Updates #4538 (likely fixes)
Updates #3488

Change-Id: I3924eee9110e47bdba926ce12954253bf2413040
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-04-26 14:57:55 -07:00 committed by Brad Fitzpatrick
parent c6c752cf64
commit 3f7cc3563f
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipn/prefs.go
View File

@ -428,9 +428,14 @@ func NewPrefs() *Prefs {
} }
// ControlURLOrDefault returns the coordination server's URL base. // ControlURLOrDefault returns the coordination server's URL base.
// If not configured, DefaultControlURL is returned instead. //
// If not configured, or if the configured value is a legacy name equivalent to
// the default, then DefaultControlURL is returned instead.
func (p *Prefs) ControlURLOrDefault() string { func (p *Prefs) ControlURLOrDefault() string {
if p.ControlURL != "" { if p.ControlURL != "" {
if p.ControlURL != DefaultControlURL && IsLoginServerSynonym(p.ControlURL) {
return DefaultControlURL
}
return p.ControlURL return p.ControlURL
} }
return DefaultControlURL return DefaultControlURL

15
ipn/prefs_test.go
View File

@ -810,3 +810,18 @@ func TestExitNodeIPOfArg(t *testing.T) {
}) })
} }
} }
func TestControlURLOrDefault(t *testing.T) {
var p Prefs
if got, want := p.ControlURLOrDefault(), DefaultControlURL; got != want {
t.Errorf("got %q; want %q", got, want)
}
p.ControlURL = "http://foo.bar"
if got, want := p.ControlURLOrDefault(), "http://foo.bar"; got != want {
t.Errorf("got %q; want %q", got, want)
}
p.ControlURL = "https://login.tailscale.com"
if got, want := p.ControlURLOrDefault(), DefaultControlURL; got != want {
t.Errorf("got %q; want %q", got, want)
}
}