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

Revert "ipn/ipnlocal: add new DNS and subnet router policies" (#9962)

Browse Source 
This reverts commit 32194cdc70.

Signed-off-by: Nick O'Neill <nick@tailscale.com>
This commit is contained in:
Andrea Gottardo 2023-10-24 17:07:25 -07:00 committed by GitHub
parent a7e4cebb90
commit 741d7bcefe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipn/ipnlocal/profiles.go
View File

@ -19,7 +19,6 @@
"tailscale.com/types/logger" "tailscale.com/types/logger"
"tailscale.com/util/clientmetric" "tailscale.com/util/clientmetric"
"tailscale.com/util/cmpx" "tailscale.com/util/cmpx"
"tailscale.com/util/syspolicy"
"tailscale.com/util/winutil" "tailscale.com/util/winutil"
) )
@ -464,10 +463,6 @@ func (pm *profileManager) NewProfile() {
prefs.ShieldsUp = shieldsUp == "never" prefs.ShieldsUp = shieldsUp == "never"
forceDaemon, _ := winutil.GetPolicyString("UnattendedMode") forceDaemon, _ := winutil.GetPolicyString("UnattendedMode")
prefs.ForceDaemon = forceDaemon == "always" 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() return prefs.View()
}() }()

11
ipn/ipnlocal/profiles_windows.go
View File

@ -13,7 +13,6 @@
"tailscale.com/atomicfile" "tailscale.com/atomicfile"
"tailscale.com/ipn" "tailscale.com/ipn"
"tailscale.com/util/syspolicy"
"tailscale.com/util/winutil/policy" "tailscale.com/util/winutil/policy"
) )
@ -71,8 +70,6 @@ func (pm *profileManager) loadLegacyPrefs() (string, ipn.PrefsView, error) {
prefs.ExitNodeIP = resolveExitNodeIP(prefs.ExitNodeIP) prefs.ExitNodeIP = resolveExitNodeIP(prefs.ExitNodeIP)
prefs.ShieldsUp = resolveShieldsUp(prefs.ShieldsUp) prefs.ShieldsUp = resolveShieldsUp(prefs.ShieldsUp)
prefs.ForceDaemon = resolveForceDaemon(prefs.ForceDaemon) 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") pm.logf("migrating Windows profile to new format")
return migrationSentinel, prefs.View(), nil return migrationSentinel, prefs.View(), nil
@ -91,11 +88,3 @@ func resolveForceDaemon(defval bool) bool {
pol := policy.GetPreferenceOptionPolicy("UnattendedMode") pol := policy.GetPreferenceOptionPolicy("UnattendedMode")
return pol.ShouldEnable(defval) 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
}

11
util/syspolicy/policy_keys.go
View File

@ -7,17 +7,14 @@
const ( const (
// Keys with a string value // Keys with a string value
ControlURL Key = "LoginURL" // default ""; if blank, ipn uses ipn.DefaultControlURL. ControlURL Key = "LoginURL" // default ""; if blank, ipn uses ipn.DefaultControlURL.
LogTarget Key = "LogTarget" // default ""; if blank logging uses logtail.DefaultHost. 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.
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". // Keys with a string value that specifies an option: "always", "never", "user-decides".
// The default is "user-decides" unless otherwise stated. // The default is "user-decides" unless otherwise stated.
EnableIncomingConnections Key = "AllowIncomingConnections" EnableIncomingConnections Key = "AllowIncomingConnections"
EnableServerMode Key = "UnattendedMode" EnableServerMode Key = "UnattendedMode"
EnableTailscaleDNS Key = "UseTailscaleDNSSettings"
EnableTailscaleSubnets Key = "UseTailscaleSubnets"
// Keys with a string value that controls visibility: "show", "hide". // Keys with a string value that controls visibility: "show", "hide".
// The default is "show" unless otherwise stated. // The default is "show" unless otherwise stated.
@ -27,8 +24,6 @@
UpdateMenuVisibility Key = "UpdateMenu" UpdateMenuVisibility Key = "UpdateMenu"
RunExitNodeVisibility Key = "RunExitNode" RunExitNodeVisibility Key = "RunExitNode"
PreferencesMenuVisibility Key = "PreferencesMenu" PreferencesMenuVisibility Key = "PreferencesMenu"
ExitNodeMenuVisibility Key = "ExitNodesPicker"
AutoUpdateVisibility Key = "AutoUpdate"
// Keys with a string value formatted for use with time.ParseDuration(). // Keys with a string value formatted for use with time.ParseDuration().
KeyExpirationNoticeTime Key = "KeyExpirationNotice" // default 24 hours KeyExpirationNoticeTime Key = "KeyExpirationNotice" // default 24 hours