mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

[v10.0/forgejo] fix: disable forgotten password for external signin only (#6930) 

**Backport:** https://codeberg.org/forgejo/forgejo/pulls/6680

- Make it such that `[service].ENABLE_INTERNAL_SIGNIN = false` disables the forgotten password prompt on the login page.

Co-authored-by: davrot <davrot@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6930
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
This commit is contained in:
forgejo-backport-action 2025-02-14 13:37:46 +00:00 committed by Gusted
parent 4802c33acb
commit 0fe56e6059
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
routers/web/auth/auth.go
View File

@ -170,6 +170,8 @@ func SignIn(ctx *context.Context) {
context.SetCaptchaData(ctx)
}
ctx.Data["DisablePassword"] = !setting.Service.EnableInternalSignIn
ctx.HTML(http.StatusOK, tplSignIn)
}
@ -189,6 +191,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 {

3
templates/user/auth/signin_inner.tmpl
View File

@ -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
View 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)
}