Skip to content

Commit 284daba

Browse files
committed
Revert "[PLT-1263] Add creationTime parameter"
This reverts commit 6354e18.
1 parent 6354e18 commit 284daba

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

pkg/cookies/csrf.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ type csrf struct {
4848

4949
cookieOpts *options.Cookie
5050
time clock.Clock
51-
creationTime time.Time
5251
}
5352

5453
// csrtStateTrim will indicate the length of the state trimmed for the name of the csrf cookie
@@ -71,7 +70,6 @@ func NewCSRF(opts *options.Cookie, codeVerifier string) (CSRF, error) {
7170
CodeVerifier: codeVerifier,
7271

7372
cookieOpts: opts,
74-
creationTime: time.Now(),
7573
}, nil
7674
}
7775

@@ -178,7 +176,7 @@ func ClearExtraCsrfCookies(opts *options.Cookie, rw http.ResponseWriter, req *ht
178176
}
179177

180178
sort.Slice(decodedCookies, func(i, j int) bool {
181-
return decodedCookies[i].creationTime.Before(decodedCookies[j].creationTime)
179+
return decodedCookies[i].time.Now().Before(decodedCookies[j].time.Now())
182180
})
183181

184182
numberToDelete := len(decodedCookies) - opts.CSRFPerRequestLimit

pkg/cookies/csrf_per_request_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -200,17 +200,17 @@ var _ = Describe("CSRF Cookie with non-fixed name Tests", func() {
200200
publicCSRF1, err := NewCSRF(cookieOpts, "verifier")
201201
Expect(err).ToNot(HaveOccurred())
202202
privateCSRF1 := publicCSRF1.(*csrf)
203-
privateCSRF1.creationTime.Set(testNow)
203+
privateCSRF1.time.Set(testNow)
204204

205205
publicCSRF2, err := NewCSRF(cookieOpts, "verifier")
206206
Expect(err).ToNot(HaveOccurred())
207207
privateCSRF2 := publicCSRF2.(*csrf)
208-
privateCSRF2.creationTime.Set(testNow.Add(time.Minute))
208+
privateCSRF2.time.Set(testNow.Add(time.Minute))
209209

210210
publicCSRF3, err := NewCSRF(cookieOpts, "verifier")
211211
Expect(err).ToNot(HaveOccurred())
212212
privateCSRF3 := publicCSRF3.(*csrf)
213-
privateCSRF3.creationTime.Set(testNow.Add(time.Minute * 2))
213+
privateCSRF3.time.Set(testNow.Add(time.Minute * 2))
214214

215215
//for the test we set all the cookies on a single request, but in reality this will be multiple requests after another
216216
cookies := []string{}

0 commit comments

Comments
 (0)