mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-02-23 03:45:47 -05:00
fix: disable forgotten password for external signin only (#6680)
- Make it such that `[service].ENABLE_INTERNAL_SIGNIN = false` disables the forgotten password prompt on the login page. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6680 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: davrot <davrot@noreply.codeberg.org> Co-committed-by: davrot <davrot@noreply.codeberg.org>
This commit is contained in:
parent
b1a7db7e28
commit
ef2fbc6093
3 changed files with 45 additions and 0 deletions
|
@ -171,6 +171,8 @@ func SignIn(ctx *context.Context) {
|
|||
context.SetCaptchaData(ctx)
|
||||
}
|
||||
|
||||
ctx.Data["DisablePassword"] = !setting.Service.EnableInternalSignIn
|
||||
|
||||
ctx.HTML(http.StatusOK, tplSignIn)
|
||||
}
|
||||
|
||||
|
@ -190,6 +192,7 @@ func SignInPost(ctx *context.Context) {
|
|||
ctx.Data["PageIsLogin"] = true
|
||||
ctx.Data["EnableSSPI"] = auth.IsSSPIEnabled(ctx)
|
||||
ctx.Data["EnableInternalSignIn"] = setting.Service.EnableInternalSignIn
|
||||
ctx.Data["DisablePassword"] = !setting.Service.EnableInternalSignIn
|
||||
|
||||
// Permission denied if EnableInternalSignIn is false
|
||||
if !setting.Service.EnableInternalSignIn {
|
||||
|
|
|
@ -50,6 +50,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{{if not .DisablePassword}}
|
||||
<div class="ui container fluid">
|
||||
{{template "user/auth/webauthn_error" .}}
|
||||
|
||||
|
@ -65,3 +66,5 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
|
|
39
tests/integration/disable_forgotten_password_test.go
Normal file
39
tests/integration/disable_forgotten_password_test.go
Normal file
|
@ -0,0 +1,39 @@
|
|||
package integration
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
"code.gitea.io/gitea/modules/test"
|
||||
"code.gitea.io/gitea/tests"
|
||||
)
|
||||
|
||||
func TestDisableForgottenPasswordFalse(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
defer test.MockVariableValue(&setting.Service.EnableInternalSignIn, true)()
|
||||
|
||||
req := NewRequest(t, "GET", "/user/login/")
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
htmlDoc.AssertElement(t, "a[href='/user/forgot_password']", true)
|
||||
}
|
||||
|
||||
func TestDisableForgottenPasswordTrue(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
defer test.MockVariableValue(&setting.Service.EnableInternalSignIn, false)()
|
||||
|
||||
req := NewRequest(t, "GET", "/user/login/")
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
htmlDoc.AssertElement(t, "a[href='/user/forgot_password']", false)
|
||||
}
|
||||
|
||||
func TestDisableForgottenPasswordDefault(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
|
||||
req := NewRequest(t, "GET", "/user/login/")
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
htmlDoc.AssertElement(t, "a[href='/user/forgot_password']", true)
|
||||
}
|
Loading…
Add table
Reference in a new issue