TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-20 11:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn: remove enforceDefaults option from PrefsFromBytes

Browse Source 
The Mac client was using it, but it had the effect of the `RouteAll`
("Use Tailscale subnets") pref always being enabled at startup,
regardless of the persisted value.

enforceDefaults was added to handle cases from ~2 years ago where
we ended up with persisted `"RouteAll": false` values in the keychain,
but that should no longer be a concern. New users will get the default
of it being enabled via `NewPrefs`.

There will be a corresponding Mac client change to stop passing in
enforceDefaults.

For #3962

Signed-off-by: Mihai Parparita <mihai@tailscale.com>
This commit is contained in:
Mihai Parparita 2022-04-29 14:08:26 -07:00 committed by GitHub
parent 87ba528ae0
commit 316523cc1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@ -1617,7 +1617,7 @@ func (b *LocalBackend) loadStateLocked(key ipn.StateKey, prefs *ipn.Prefs) (err
case err != nil: case err != nil:
return fmt.Errorf("backend prefs: store.ReadState(%q): %v", key, err) return fmt.Errorf("backend prefs: store.ReadState(%q): %v", key, err)
} }
b.prefs, err = ipn.PrefsFromBytes(bs, false) b.prefs, err = ipn.PrefsFromBytes(bs)
if err != nil { if err != nil {
b.logf("using backend prefs for %q", key) b.logf("using backend prefs for %q", key)
return fmt.Errorf("PrefsFromBytes: %v", err) return fmt.Errorf("PrefsFromBytes: %v", err)

12
ipn/prefs.go
View File

@ -584,10 +584,8 @@ func (p *Prefs) SetExitNodeIP(s string, st *ipnstate.Status) error {
return err return err
} }
// PrefsFromBytes deserializes Prefs from a JSON blob. If // PrefsFromBytes deserializes Prefs from a JSON blob.
// enforceDefaults is true, Prefs.RouteAll and Prefs.AllowSingleHosts func PrefsFromBytes(b []byte) (*Prefs, error) {
// are forced on.
func PrefsFromBytes(b []byte, enforceDefaults bool) (*Prefs, error) {
p := NewPrefs() p := NewPrefs()
if len(b) == 0 { if len(b) == 0 {
return p, nil return p, nil
@ -603,10 +601,6 @@ func PrefsFromBytes(b []byte, enforceDefaults bool) (*Prefs, error) {
log.Printf("Prefs parse: %v: %v\n", err, b) log.Printf("Prefs parse: %v: %v\n", err, b)
} }
} }
if enforceDefaults {
p.RouteAll = true
p.AllowSingleHosts = true
}
return p, err return p, err
} }
@ -625,7 +619,7 @@ func LoadPrefs(filename string) (*Prefs, error) {
// to log in again. (better than crashing) // to log in again. (better than crashing)
return nil, os.ErrNotExist return nil, os.ErrNotExist
} }
p, err := PrefsFromBytes(data, false) p, err := PrefsFromBytes(data)
if err != nil { if err != nil {
return nil, fmt.Errorf("LoadPrefs(%q) decode: %w", filename, err) return nil, fmt.Errorf("LoadPrefs(%q) decode: %w", filename, err)
} }

2
ipn/prefs_test.go
View File

@ -302,7 +302,7 @@ func checkPrefs(t *testing.T, p Prefs) {
if p.Equals(p2) { if p.Equals(p2) {
t.Fatalf("p == p2\n") t.Fatalf("p == p2\n")
} }
p2b, err = PrefsFromBytes(p2.ToBytes(), false) p2b, err = PrefsFromBytes(p2.ToBytes())
if err != nil { if err != nil {
t.Fatalf("PrefsFromBytes(p2) failed\n") t.Fatalf("PrefsFromBytes(p2) failed\n")
} }