fix(oauth2): use UTC timestamp and FOR UPDATE SKIP LOCKED in JTI blacklist cleanup (#4113) - #4120
Open
waterWang wants to merge 1 commit into
Open
fix(oauth2): use UTC timestamp and FOR UPDATE SKIP LOCKED in JTI blacklist cleanup (#4113)#4120waterWang wants to merge 1 commit into
waterWang wants to merge 1 commit into
Conversation
|
|
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
📝 WalkthroughWalkthroughChangesOAuth2 JTI blacklist cleanup
Estimated code review effort: 2 (Simple) | ~10 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
5hy7xz92nd-oss
approved these changes
Aug 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Fixes lock contention and a clock-skew bug in the JTI blacklist cleanup path.
Why
SetClientAssertionJWTruns an unbounded inlineDELETE WHERE expires_at < CURRENT_TIMESTAMPon everyjwt-bearertoken request. Under concurrent load, many goroutines contend for row locks on the same expired rows, causing 100-400ms latency spikes on/oauth2/token(#4113). The same statement also causes InnoDB deadlocks on MySQL (#3740).Two defects in the single statement:
CURRENT_TIMESTAMPis the database server's local time, whileexpires_atis written in UTC. On any non-UTC database the replay blacklist is pruned against the wrong clock, so JTIs can be deleted before they actually expire, widening the assertion-replay window.How
time.Now().UTC()) instead ofCURRENT_TIMESTAMP.LIMIT 100 ... FOR UPDATE SKIP LOCKEDso concurrent requests skip rows already locked by another transaction instead of blocking.Notes
The derived-table subquery follows the existing batch-delete pattern in this file for MySQL compatibility.
Closes #4113
Summary by CodeRabbit