From eaa6507cc96c561686341fa31531ccecd55ee66f Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Thu, 20 May 2021 03:10:55 -0400 Subject: [PATCH] ipnlocal: in Start() fast path, don't forget to send Prefs. The resulting empty Prefs had AllowSingleHosts=false and Routeall=false, so that on iOS if you did these steps: - Login and leave running - Terminate the frontend - Restart the frontend (fast path restart, missing prefs) - Set WantRunning=false - Set WantRunning=true ...then you would have Tailscale running, but with no routes. You would also accidentally disable the ExitNodeID/IP prefs (symptom: the current exit node setting didn't appear in the UI), but since nothing else worked either, you probably didn't notice. The fix was easy enough. It turns out we already knew about the problem, so this also fixes one of the BUG entries in state_test. Fixes: #1918 (BUG-1) and some as-yet-unreported bugs with exit nodes. Signed-off-by: Avery Pennarun --- ipn/ipnlocal/local.go | 1 + ipn/ipnlocal/state_test.go | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 374ecce43..ba75a2fa7 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -716,6 +716,7 @@ func (b *LocalBackend) Start(opts ipn.Options) error { b.send(ipn.Notify{ State: &state, NetMap: nm, + Prefs: b.prefs, LoginFinished: new(empty.Message), }) return nil diff --git a/ipn/ipnlocal/state_test.go b/ipn/ipnlocal/state_test.go index 0630eb6e9..7fef0c166 100644 --- a/ipn/ipnlocal/state_test.go +++ b/ipn/ipnlocal/state_test.go @@ -550,10 +550,7 @@ func TestStateMachine(t *testing.T) { c.Assert(nn[0].State, qt.Not(qt.IsNil)) c.Assert(nn[0].LoginFinished, qt.Not(qt.IsNil)) c.Assert(nn[0].NetMap, qt.Not(qt.IsNil)) - // BUG: Prefs should be sent too, or the UI could end up in - // a bad state. (iOS, the only current user of this feature, - // probably wouldn't notice because it happens to not display - // any prefs. Maybe exit nodes will look weird?) + c.Assert(nn[0].Prefs, qt.Not(qt.IsNil)) } // undo the state hack above.