Auth: Add development manual override (#55496) (#55544)

* Auth: Add development manual override

* rename to disable_sync_lock

(cherry picked from commit 006944a360)
This commit is contained in:
Jo
2022-09-21 10:29:18 +02:00
committed by GitHub
parent 80784cbfab
commit 06b71c24c6
4 changed files with 10 additions and 3 deletions
+1
View File
@@ -138,6 +138,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *models.ReqContext) (map[string]i
"auth": map[string]interface{}{
"OAuthSkipOrgRoleUpdateSync": hs.Cfg.OAuthSkipOrgRoleUpdateSync,
"SAMLSkipOrgRoleSync": hs.Cfg.SectionWithEnvOverrides("auth.saml").Key("skip_org_role_sync").MustBool(false),
"DisableSyncLock": hs.Cfg.DisableSyncLock,
},
"buildInfo": map[string]interface{}{
"hideVersion": hideVersion,
+4
View File
@@ -293,6 +293,7 @@ type Cfg struct {
BasicAuthEnabled bool
AdminUser string
AdminPassword string
DisableSyncLock bool
// AWS Plugin Auth
AWSAllowedAuthProviders []string
@@ -1281,6 +1282,9 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
cfg.TokenRotationIntervalMinutes = 2
}
// Debug setting unlocking frontend auth sync lock. Users will still be reset on their next login.
cfg.DisableSyncLock = auth.Key("disable_sync_lock").MustBool(false)
DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
DisableSignoutMenu = auth.Key("disable_signout_menu").MustBool(false)
OAuthAutoLogin = auth.Key("oauth_auto_login").MustBool(false)