Fix expiring code redemption - #4011
Open
joemahady-comm wants to merge 1 commit into
Open
Conversation
…isted=yes Co-authored-by: Cursor <cursoragent@cursor.com>
cf-foundation-community-automation
Bot
moved this to Inbox
in Foundational Infrastructure Working Group
Contributor
There was a problem hiding this comment.
Pull request overview
This PR hardens expiring code redemption in JdbcExpiringCodeStore to reduce a TOCTOU window where concurrent requests could potentially consume the same code.
Changes:
- Update
retrieveCodeto check the row-count returned by theDELETEand returnnullwhen the code was not actually deleted (already consumed).
Comment on lines
+145
to
+148
| int deleted = jdbcTemplate.update(delete, code, zoneId); | ||
| if (deleted == 0) { | ||
| return null; | ||
| } |
Comment on lines
+145
to
+147
| int deleted = jdbcTemplate.update(delete, code, zoneId); | ||
| if (deleted == 0) { | ||
| return null; |
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.
Fix: Addressed a Time-of-Check to Time-of-Use (TOCTOU) race condition in JdbcExpiringCodeStore that could allow multiple concurrent requests to consume the same expiring code.
Details: Modified the retrieveCode method to verify the result of the DELETE SQL statement. It now ensures that exactly one row is deleted (jdbcTemplate.update(delete, ...) == 1). If the delete operation affects 0 rows, it safely returns null, preventing race conditions.