Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhanced auth token / remember me #27606

Merged
merged 12 commits into from
Oct 14, 2023
Prev Previous commit
Next Next commit
Use constant.
  • Loading branch information
KN4CK3R committed Oct 11, 2023
commit 2204c021353374fe05cd9ce14ffe80be91e56616
3 changes: 2 additions & 1 deletion routers/install/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/translation"
"code.gitea.io/gitea/modules/user"
"code.gitea.io/gitea/modules/util"
Expand Down Expand Up @@ -559,7 +560,7 @@ func SubmitInstall(ctx *context.Context) {
return
}

ctx.SetSiteCookie(setting.CookieRememberName, nt.ID+":"+token, 86400*setting.LogInRememberDays)
ctx.SetSiteCookie(setting.CookieRememberName, nt.ID+":"+token, setting.LogInRememberDays*timeutil.Day)

// Auto-login for admin
if err = ctx.Session.Set("uid", u.ID); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions routers/web/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func autoSignIn(ctx *context.Context) (bool, error) {
return false, err
}

ctx.SetSiteCookie(setting.CookieRememberName, nt.ID+":"+token, 86400*setting.LogInRememberDays)
ctx.SetSiteCookie(setting.CookieRememberName, nt.ID+":"+token, setting.LogInRememberDays*timeutil.Day)

if err := updateSession(ctx, nil, map[string]any{
// Set session IDs
Expand Down Expand Up @@ -306,7 +306,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember, obeyRe
return setting.AppSubURL + "/"
}

ctx.SetSiteCookie(setting.CookieRememberName, nt.ID+":"+token, 86400*setting.LogInRememberDays)
ctx.SetSiteCookie(setting.CookieRememberName, nt.ID+":"+token, setting.LogInRememberDays*timeutil.Day)
}

if err := updateSession(ctx, []string{
Expand Down