TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal, util/syspolicy: make run exit node a preference option

Browse Source 
Previously, the "RunExitNode" policy merely controlled the visibility of
the "run as exit node" menu item, not the setting itself. This migrates
that setting to a preference option named "AdvertiseExitNode".

Updates ENG-2138

Change-Id: Ia6a125beb6b4563d380c6162637ce4088f1117a0
Signed-off-by: Adrian Dewhurst <adrian@tailscale.com>
This commit is contained in:
Adrian Dewhurst 2023-12-07 12:01:31 -05:00 committed by Adrian Dewhurst
parent 21958d2934
commit 86aa0485a6
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipn/ipnlocal/local.go
View File

@ -1274,6 +1274,11 @@ type preferencePolicyInfo struct {
get: func(p ipn.PrefsView) bool { return p.AutoUpdate().Apply }, get: func(p ipn.PrefsView) bool { return p.AutoUpdate().Apply },
set: func(p *ipn.Prefs, v bool) { p.AutoUpdate.Apply = v }, set: func(p *ipn.Prefs, v bool) { p.AutoUpdate.Apply = v },
}, },
{
key: syspolicy.EnableRunExitNode,
get: func(p ipn.PrefsView) bool { return p.AdvertisesExitNode() },
set: func(p *ipn.Prefs, v bool) { p.SetAdvertiseExitNode(v) },
},
} }
// applySysPolicy overwrites configured preferences with policies that may be // applySysPolicy overwrites configured preferences with policies that may be

19
util/syspolicy/policy_keys.go
View File

@ -18,7 +18,8 @@
// 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. Enforcement of // The default is "user-decides" unless otherwise stated. Enforcement of
// these policies is typically performed in ipnlocal.applySysPolicy(). // these policies is typically performed in ipnlocal.applySysPolicy(). GUIs
// typically hide menu items related to policies that are enforced.
EnableIncomingConnections Key = "AllowIncomingConnections" EnableIncomingConnections Key = "AllowIncomingConnections"
EnableServerMode Key = "UnattendedMode" EnableServerMode Key = "UnattendedMode"
ExitNodeAllowLANAccess Key = "ExitNodeAllowLANAccess" ExitNodeAllowLANAccess Key = "ExitNodeAllowLANAccess"
@ -31,15 +32,23 @@
// installed. Its value is "InstallUpdates" because of an awkwardly-named // installed. Its value is "InstallUpdates" because of an awkwardly-named
// visibility option "ApplyUpdates" on MacOS. // visibility option "ApplyUpdates" on MacOS.
ApplyUpdates Key = "InstallUpdates" ApplyUpdates Key = "InstallUpdates"
// EnableRunExitNode controls if the device acts as an exit node. Even when
// running as an exit node, the device must be approved by a tailnet
// administrator. Its name is slightly awkward because RunExitNodeVisibility
// predates this option but is preserved for backwards compatibility.
EnableRunExitNode Key = "AdvertiseExitNode"
// 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. Enforcement of these // The default is "show" unless otherwise stated. Enforcement of these
// policies is typically performed by the UI code for the relevant operating // policies is typically performed by the UI code for the relevant operating
// system. // system.
AdminConsoleVisibility Key = "AdminConsole" AdminConsoleVisibility Key = "AdminConsole"
NetworkDevicesVisibility Key = "NetworkDevices" NetworkDevicesVisibility Key = "NetworkDevices"
TestMenuVisibility Key = "TestMenu" TestMenuVisibility Key = "TestMenu"
UpdateMenuVisibility Key = "UpdateMenu" UpdateMenuVisibility Key = "UpdateMenu"
// RunExitNodeVisibility controls if the "run as exit node" menu item is
// visible, without controlling the setting itself. This is preserved for
// backwards compatibility but prefer EnableRunExitNode in new deployments.
RunExitNodeVisibility Key = "RunExitNode" RunExitNodeVisibility Key = "RunExitNode"
PreferencesMenuVisibility Key = "PreferencesMenu" PreferencesMenuVisibility Key = "PreferencesMenu"
ExitNodeMenuVisibility Key = "ExitNodesPicker" ExitNodeMenuVisibility Key = "ExitNodesPicker"