Auth: Remove Email Lookup from oauth integrations 9.5 (#895)

backport https://github.com/grafana/grafana-private-mirror/pull/894 to 9.5.x
This commit is contained in:
Ieva
2023-06-23 08:59:35 +02:00
committed by Horst Gutmann
parent dd7d0e8883
commit bef41a5cc9
4 changed files with 51 additions and 15 deletions
+5 -2
View File
@@ -291,8 +291,9 @@ type Cfg struct {
AuthProxySyncTTL int
// OAuth
OAuthAutoLogin bool
OAuthCookieMaxAge int
OAuthAutoLogin bool
OAuthCookieMaxAge int
OAuthAllowInsecureEmailLookup bool
// JWT Auth
JWTAuthEnabled bool
@@ -1444,6 +1445,8 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
return err
}
cfg.OAuthAllowInsecureEmailLookup = auth.Key("oauth_allow_insecure_email_lookup").MustBool(false)
const defaultMaxLifetime = "30d"
maxLifetimeDurationVal := valueAsString(auth, "login_maximum_lifetime_duration", defaultMaxLifetime)
cfg.LoginMaxLifetime, err = gtime.ParseDuration(maxLifetimeDurationVal)