fix: use CSRFExpire instead of Expire for CSRF cookie validation

This commit is contained in:
Br1an67 2026-03-06 18:55:10 +00:00
parent 88075737a6
commit 60ca7b93fc
2 changed files with 26 additions and 2 deletions

View File

@ -234,7 +234,7 @@ func decodeCSRFCookie(cookie *http.Cookie, opts *options.Cookie) (*csrf, error)
return nil, fmt.Errorf("error getting cookie secret: %v", err)
}
val, t, ok := encryption.Validate(cookie, secret, opts.Expire)
val, t, ok := encryption.Validate(cookie, secret, opts.CSRFExpire)
if !ok {
return nil, errors.New("CSRF cookie failed validation")
}

View File

@ -119,9 +119,33 @@ var _ = Describe("CSRF Cookie Tests", func() {
Value: encoded,
}
_, _, valid := encryption.Validate(cookie, cookieOpts.Secret, cookieOpts.Expire)
_, _, valid := encryption.Validate(cookie, cookieOpts.Secret, cookieOpts.CSRFExpire)
Expect(valid).To(BeTrue())
})
It("validates CSRF token using CSRFExpire when Expire is lower", func() {
// Set Expire to be much lower than CSRFExpire
cookieOpts.Expire = time.Second
cookieOpts.CSRFExpire = time.Hour
privateCSRF.OAuthState = []byte(csrfState)
privateCSRF.OIDCNonce = []byte(csrfNonce)
encoded, err := privateCSRF.encodeCookie()
Expect(err).ToNot(HaveOccurred())
cookie := &http.Cookie{
Name: privateCSRF.cookieName(),
Value: encoded,
}
// The cookie should still be valid even though Expire is only 1 second
decoded, err := decodeCSRFCookie(cookie, cookieOpts)
Expect(err).ToNot(HaveOccurred())
Expect(decoded).ToNot(BeNil())
Expect(decoded.OAuthState).To(Equal([]byte(csrfState)))
Expect(decoded.OIDCNonce).To(Equal([]byte(csrfNonce)))
})
})
Context("Cookie Management", func() {