MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-09-26 16:26:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
wxiaoguang 2024-05-21 00:31:21 +08:00
parent fb1ad920b7
commit 5b4393809e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/base/tool_test.go
View File

@ -46,8 +46,9 @@ func TestBasicAuthDecode(t *testing.T) {
func TestVerifyTimeLimitCode(t *testing.T) {
defer test.MockVariableValue(&setting.InstallLock, true)()
initGeneralSecret := func(secret string) {
setting.InstallLock = true
setting.CfgProvider, _ = setting.NewConfigProviderFromData(fmt.Sprintf(`
[security]
INSTALL_LOCK=true
[oauth2]
JWT_SECRET = %s
`, secret))

2
modules/setting/setting.go
View File

@ -121,8 +121,8 @@ func loadCommonSettingsFrom(cfg ConfigProvider) error {
mustCurrentRunUserMatch(cfg) // it depends on the SSH config, only non-builtin SSH server requires this check
loadOAuth2From(cfg)
loadSecurityFrom(cfg)
loadOAuth2From(cfg)
if err := loadAttachmentFrom(cfg); err != nil {
return err
}