Skip to content

Set MaxAge in web cookie if time until expiry is > 0 #58293

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.

Sign up for GitHub

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

Merged
avatus merged 1 commit into from
Aug 24, 2025
Merged

Set MaxAge in web cookie if time until expiry is > 0 #58293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/web/session/cookie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ func SetCookie(w http.ResponseWriter, user, sid string, expiry time.Time) error
Secure: true,
SameSite: http.SameSiteLaxMode,
}
// if expiry is zero, we can skip MaxAge and treat as a session cookie.
// if expiry is zero or in the past, we can skip MaxAge and treat as a session cookie.
// Otherwise, set maxage
if !expiry.IsZero() {
c.MaxAge = int(time.Until(expiry).Seconds())
if maxAge := int(time.Until(expiry).Seconds()); maxAge > 0 {
c.MaxAge = maxAge
}
http.SetCookie(w, c)
return nil
Expand Down
6 changes: 3 additions & 3 deletions lib/web/session/cookie_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ func TestCookies(t *testing.T) {
expectedCookie: "__Host-session=7b2275736572223a226c6c616d61222c22736964223a223938373635227d; Path=/; Max-Age=9; HttpOnly; Secure; SameSite=Lax",
},
{
name: "expired cert",
name: "expired cert (returns session cookie)",
expiry: time.Now().Add(-10 * time.Second),
expectClear: false,
expectedCookie: "__Host-session=7b2275736572223a226c6c616d61222c22736964223a223938373635227d; Path=/; Max-Age=0; HttpOnly; Secure; SameSite=Lax",
expectedCookie: "__Host-session=7b2275736572223a226c6c616d61222c22736964223a223938373635227d; Path=/; HttpOnly; Secure; SameSite=Lax",
},
{
name: "zero time",
name: "zero time (returns session cookie)",
expiry: time.Time{},
expectClear: false,
expectedCookie: "__Host-session=7b2275736572223a226c6c616d61222c22736964223a223938373635227d; Path=/; HttpOnly; Secure; SameSite=Lax",
Expand Down
Loading