Sfoglia il codice sorgente

util/syspolicy: add 'ResetToDefaults' (#11194)

Updates ENG-2133. Adds the ResetToDefaults visibility policy currently only available on macOS, so that the Windows client can read its value.

Signed-off-by: Andrea Gottardo <[email protected]>
Andrea Gottardo 2 anni fa
parent
commit
0359c2f94e
2 ha cambiato i file con 7 aggiunte e 5 eliminazioni
  1. 6 5
      util/syspolicy/policy_keys.go
  2. 1 0
      util/syspolicy/policy_keys_windows.go

+ 6 - 5
util/syspolicy/policy_keys.go

@@ -42,10 +42,11 @@ const (
 	// The default is "show" unless otherwise stated. Enforcement of these
 	// policies is typically performed by the UI code for the relevant operating
 	// system.
-	AdminConsoleVisibility   Key = "AdminConsole"
-	NetworkDevicesVisibility Key = "NetworkDevices"
-	TestMenuVisibility       Key = "TestMenu"
-	UpdateMenuVisibility     Key = "UpdateMenu"
+	AdminConsoleVisibility    Key = "AdminConsole"
+	NetworkDevicesVisibility  Key = "NetworkDevices"
+	TestMenuVisibility        Key = "TestMenu"
+	UpdateMenuVisibility      Key = "UpdateMenu"
+	ResetToDefaultsVisibility Key = "ResetToDefaults"
 	// 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.
@@ -80,7 +81,7 @@ const (
 	// ManagedByOrganizationName is set. It can be used to provide a pointer to support resources
 	// for Tailscale within the organization.
 	ManagedByCaption Key = "ManagedByCaption"
-	// ManagedByCaption is a valid URL pointing to a support help desk for Tailscale within the
+	// ManagedByURL is a valid URL pointing to a support help desk for Tailscale within the
 	// organization. A button in the client UI provides easy access to this URL.
 	ManagedByURL Key = "ManagedByURL"
 )

+ 1 - 0
util/syspolicy/policy_keys_windows.go

@@ -22,6 +22,7 @@ var stringKeys = []Key{
 	PreferencesMenuVisibility,
 	ExitNodeMenuVisibility,
 	AutoUpdateVisibility,
+	ResetToDefaultsVisibility,
 	KeyExpirationNoticeTime,
 	PostureChecking,
 	ManagedByOrganizationName,