Secure socks proxy: allow for UI to be disabled (#69408)

conf/defaults.ini

@@ -1587,3 +1587,5 @@ client_cert =
 server_name =
 # The address of the socks5 proxy datasources should connect to
 proxy_address =
+# Determines if the secure socks proxy should be shown on the datasources page, defaults to true if the feature is enabled
+show_ui = false

conf/sample.ini

@@ -1491,3 +1491,4 @@
 ; server_name =
 # The address of the socks5 proxy datasources should connect to
 ; proxy_address =
+; show_ui = true

pkg/api/frontendsettings.go

@@ -149,7 +149,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
 		TrustedTypesDefaultPolicyEnabled:    trustedTypesDefaultPolicyEnabled,
 		CSPReportOnlyEnabled:                hs.Cfg.CSPReportOnlyEnabled,
 		DateFormats:                         hs.Cfg.DateFormats,
-		SecureSocksDSProxyEnabled:           hs.Cfg.SecureSocksDSProxy.Enabled,
+		SecureSocksDSProxyEnabled:           hs.Cfg.SecureSocksDSProxy.Enabled && hs.Cfg.SecureSocksDSProxy.ShowUI,
 
 		Auth: dtos.FrontendSettingsAuthDTO{
 			OAuthSkipOrgRoleUpdateSync:  hs.Cfg.OAuthSkipOrgRoleUpdateSync,

pkg/setting/setting_secure_socks_proxy.go

@@ -8,6 +8,7 @@ import (
 
 type SecureSocksDSProxySettings struct {
 	Enabled      bool
+	ShowUI       bool
 	ClientCert   string
 	ClientKey    string
 	RootCA       string
@@ -24,6 +25,7 @@ func readSecureSocksDSProxySettings(iniFile *ini.File) (SecureSocksDSProxySettin
 	s.RootCA = secureSocksProxySection.Key("root_ca_cert").MustString("")
 	s.ProxyAddress = secureSocksProxySection.Key("proxy_address").MustString("")
 	s.ServerName = secureSocksProxySection.Key("server_name").MustString("")
+	s.ShowUI = secureSocksProxySection.Key("show_ui").MustBool(true)
 
 	if !s.Enabled {
 		return s, nil