domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Avoid cycle-redirecting user/login page (#28636) (#28658)

Browse source 
Backport #28636

Fix #28231, and remove some unused code.

(cherry picked from commit 2165729d16)
This commit is contained in:
wxiaoguang 2023-12-30 20:50:08 +08:00 • committed by Earl Warren
parent d694579bdf
commit ea8ca5b509
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
5 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
routers/web/auth/auth.go
View file

@ -46,10 +46,6 @@ const (
// AutoSignIn reads cookie and try to auto-login.
func AutoSignIn(ctx *context.Context) (bool, error) {
if !db.HasEngine {
return false, nil
}
uname := ctx.GetSiteCookie(setting.CookieUserName)
if len(uname) == 0 {
return false, nil
@ -131,7 +127,11 @@ func checkAutoLogin(ctx *context.Context) bool {
if isSucceed {
middleware.DeleteRedirectToCookie(ctx.Resp)
ctx.RedirectToFirst(redirectTo, setting.AppSubURL+string(setting.LandingPageURL))
nextRedirectTo := setting.AppSubURL + string(setting.LandingPageURL)
if setting.LandingPageURL == setting.LandingPageLogin {
nextRedirectTo = setting.AppSubURL + "/" // do not cycle-redirect to the login page
}
ctx.RedirectToFirst(redirectTo, nextRedirectTo)
return true
}