From 741d7bcefe029f95042b16912a0f784e13a21874 Mon Sep 17 00:00:00 2001 From: Andrea Gottardo Date: Tue, 24 Oct 2023 17:07:25 -0700 Subject: [PATCH] Revert "ipn/ipnlocal: add new DNS and subnet router policies" (#9962) This reverts commit 32194cdc701c183282f1dc926fcf99a57ccaa3ea. Signed-off-by: Nick O'Neill --- ipn/ipnlocal/profiles.go | 5 ----- ipn/ipnlocal/profiles_windows.go | 11 ----------- util/syspolicy/policy_keys.go | 11 +++-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/ipn/ipnlocal/profiles.go b/ipn/ipnlocal/profiles.go index c4b2b4232..74e5c52bd 100644 --- a/ipn/ipnlocal/profiles.go +++ b/ipn/ipnlocal/profiles.go @@ -19,7 +19,6 @@ import ( "tailscale.com/types/logger" "tailscale.com/util/clientmetric" "tailscale.com/util/cmpx" - "tailscale.com/util/syspolicy" "tailscale.com/util/winutil" ) @@ -464,10 +463,6 @@ var defaultPrefs = func() ipn.PrefsView { prefs.ShieldsUp = shieldsUp == "never" forceDaemon, _ := winutil.GetPolicyString("UnattendedMode") prefs.ForceDaemon = forceDaemon == "always" - corpDNS, _ := syspolicy.GetPreferenceOption(syspolicy.EnableTailscaleDNS) - prefs.CorpDNS = corpDNS.ShouldEnable(false) - routeAll, _ := syspolicy.GetPreferenceOption(syspolicy.EnableTailscaleSubnets) - prefs.RouteAll = routeAll.ShouldEnable(false) return prefs.View() }() diff --git a/ipn/ipnlocal/profiles_windows.go b/ipn/ipnlocal/profiles_windows.go index 6feee2606..22da3ff69 100644 --- a/ipn/ipnlocal/profiles_windows.go +++ b/ipn/ipnlocal/profiles_windows.go @@ -13,7 +13,6 @@ import ( "tailscale.com/atomicfile" "tailscale.com/ipn" - "tailscale.com/util/syspolicy" "tailscale.com/util/winutil/policy" ) @@ -71,8 +70,6 @@ func (pm *profileManager) loadLegacyPrefs() (string, ipn.PrefsView, error) { prefs.ExitNodeIP = resolveExitNodeIP(prefs.ExitNodeIP) prefs.ShieldsUp = resolveShieldsUp(prefs.ShieldsUp) prefs.ForceDaemon = resolveForceDaemon(prefs.ForceDaemon) - prefs.CorpDNS, _ = resolveOptionPolicy(syspolicy.EnableTailscaleDNS, prefs.CorpDNS) - prefs.RouteAll, _ = resolveOptionPolicy(syspolicy.EnableTailscaleSubnets, prefs.RouteAll) pm.logf("migrating Windows profile to new format") return migrationSentinel, prefs.View(), nil @@ -91,11 +88,3 @@ func resolveForceDaemon(defval bool) bool { pol := policy.GetPreferenceOptionPolicy("UnattendedMode") return pol.ShouldEnable(defval) } - -func resolveOptionPolicy(key syspolicy.Key, defval bool) (bool, error) { - pol, err := syspolicy.GetPreferenceOption(key) - if err != nil { - return defval, err - } - return pol.ShouldEnable(defval), nil -} diff --git a/util/syspolicy/policy_keys.go b/util/syspolicy/policy_keys.go index 58e52b9e7..73900aeeb 100644 --- a/util/syspolicy/policy_keys.go +++ b/util/syspolicy/policy_keys.go @@ -7,17 +7,14 @@ type Key string const ( // Keys with a string value - ControlURL Key = "LoginURL" // default ""; if blank, ipn uses ipn.DefaultControlURL. - LogTarget Key = "LogTarget" // default ""; if blank logging uses logtail.DefaultHost. - ExitNodeIP Key = "ExitNodeIP" // default ""; set to the IP address of the desired exit node; still under development - Tailnet Key = "Tailnet" // default ""; if blank, no tailnet name is sent to the server. + ControlURL Key = "LoginURL" // default ""; if blank, ipn uses ipn.DefaultControlURL. + LogTarget Key = "LogTarget" // default ""; if blank logging uses logtail.DefaultHost. + Tailnet Key = "Tailnet" // default ""; if blank, no tailnet name is sent to the server. // Keys with a string value that specifies an option: "always", "never", "user-decides". // The default is "user-decides" unless otherwise stated. EnableIncomingConnections Key = "AllowIncomingConnections" EnableServerMode Key = "UnattendedMode" - EnableTailscaleDNS Key = "UseTailscaleDNSSettings" - EnableTailscaleSubnets Key = "UseTailscaleSubnets" // Keys with a string value that controls visibility: "show", "hide". // The default is "show" unless otherwise stated. @@ -27,8 +24,6 @@ const ( UpdateMenuVisibility Key = "UpdateMenu" RunExitNodeVisibility Key = "RunExitNode" PreferencesMenuVisibility Key = "PreferencesMenu" - ExitNodeMenuVisibility Key = "ExitNodesPicker" - AutoUpdateVisibility Key = "AutoUpdate" // Keys with a string value formatted for use with time.ParseDuration(). KeyExpirationNoticeTime Key = "KeyExpirationNotice" // default 24 hours