diff options
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8c45e61e81..59cc755d03 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -121,12 +121,6 @@ var ( MinPasswordLength int ImportLocalPaths bool - // OpenID settings - EnableOpenIDSignIn bool - EnableOpenIDSignUp bool - OpenIDWhitelist []*regexp.Regexp - OpenIDBlacklist []*regexp.Regexp - // Database settings UseSQLite3 bool UseMySQL bool @@ -758,24 +752,6 @@ please consider changing to GITEA_CUSTOM`) MinPasswordLength = sec.Key("MIN_PASSWORD_LENGTH").MustInt(6) ImportLocalPaths = sec.Key("IMPORT_LOCAL_PATHS").MustBool(false) - sec = Cfg.Section("openid") - EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(true) - EnableOpenIDSignUp = sec.Key("ENABLE_OPENID_SIGNUP").MustBool(true) - pats := sec.Key("WHITELISTED_URIS").Strings(" ") - if len(pats) != 0 { - OpenIDWhitelist = make([]*regexp.Regexp, len(pats)) - for i, p := range pats { - OpenIDWhitelist[i] = regexp.MustCompilePOSIX(p) - } - } - pats = sec.Key("BLACKLISTED_URIS").Strings(" ") - if len(pats) != 0 { - OpenIDBlacklist = make([]*regexp.Regexp, len(pats)) - for i, p := range pats { - OpenIDBlacklist[i] = regexp.MustCompilePOSIX(p) - } - } - sec = Cfg.Section("attachment") AttachmentPath = sec.Key("PATH").MustString(path.Join(AppDataPath, "attachments")) if !filepath.IsAbs(AttachmentPath) { @@ -939,6 +915,13 @@ var Service struct { EnableCaptcha bool DefaultKeepEmailPrivate bool NoReplyAddress string + + // OpenID settings + EnableOpenIDSignIn bool + EnableOpenIDSignUp bool + OpenIDWhitelist []*regexp.Regexp + OpenIDBlacklist []*regexp.Regexp + } func newService() { @@ -953,6 +936,25 @@ func newService() { Service.EnableCaptcha = sec.Key("ENABLE_CAPTCHA").MustBool() Service.DefaultKeepEmailPrivate = sec.Key("DEFAULT_KEEP_EMAIL_PRIVATE").MustBool() Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply.example.org") + + sec = Cfg.Section("openid") + Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(true) + Service.EnableOpenIDSignUp = sec.Key("ENABLE_OPENID_SIGNUP").MustBool(!Service.DisableRegistration) + pats := sec.Key("WHITELISTED_URIS").Strings(" ") + if len(pats) != 0 { + Service.OpenIDWhitelist = make([]*regexp.Regexp, len(pats)) + for i, p := range pats { + Service.OpenIDWhitelist[i] = regexp.MustCompilePOSIX(p) + } + } + pats = sec.Key("BLACKLISTED_URIS").Strings(" ") + if len(pats) != 0 { + Service.OpenIDBlacklist = make([]*regexp.Regexp, len(pats)) + for i, p := range pats { + Service.OpenIDBlacklist[i] = regexp.MustCompilePOSIX(p) + } + } + } var logLevels = map[string]string{ |