From 1b56acf513454f14faaa7c05d54708adc6d2c13e Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 16 Nov 2022 09:19:59 -0800 Subject: [PATCH] ipn/ipnlocal: move LocalBackend.validPopBrowserURL empty check from caller I was too late with review feedback to 513780f4f8. Updates tailscale/corp#7948 Change-Id: I8fa3b4eba4efaff591a2d0bfe6ab4795638b7c3a Signed-off-by: Brad Fitzpatrick --- ipn/ipnlocal/local.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index c0d0c6d09..a3c632b9b 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -1728,11 +1728,11 @@ func (b *LocalBackend) popBrowserAuthNow() { // validPopBrowserURL reports whether urlStr is a valid value for a // control server to send in a *URL field. +// // b.mu must *not* be held. func (b *LocalBackend) validPopBrowserURL(urlStr string) bool { if urlStr == "" { - // Common case. - return true + return false } u, err := url.Parse(urlStr) if err != nil { @@ -1753,7 +1753,7 @@ func (b *LocalBackend) validPopBrowserURL(urlStr string) bool { } func (b *LocalBackend) tellClientToBrowseToURL(url string) { - if url != "" && b.validPopBrowserURL(url) { + if b.validPopBrowserURL(url) { b.send(ipn.Notify{BrowseToURL: &url}) } }