Repository navigation
Conversation
julien-nc
added
3. to review
julien-nc
requested review from
Altahrim,
come-nc,
salmart-dev and
sorbaugh
and removed request for
a team
October 29, 2026 14:39
julien-nc
force-pushed
the
fix/oauth2-refresh-grant-unused-code
branch
from
October 29, 2026 14:49
ecb18a4 to
33b1386
Compare
kesselb
approved these changes
Oct 30, 2026
Contributor
|
/backport to stable35 please |
Contributor
|
/backport to stable34 please |
Contributor
|
/backport to stable33 please |
…efresh token grant The authorization code expiration and redemption state checks only applied to the authorization_code grant, so an expired but still unredeemed authorization code could be exchanged for an access token through the refresh token grant, bypassing the intended 10-minute expiration until the expired code record was cleaned up. Require a row to have already delivered a token (token_count > 0) when rotating through the refresh token grant, enforced atomically in rotateToken() which already serializes concurrent redemptions through the hashed_code check. Assisted-by: OpenCode:GLM-5.3-Flash Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
julien-nc
force-pushed
the
fix/oauth2-refresh-grant-unused-code
branch
from
November 2, 2026 10:29
33b1386 to
8b26402
Compare
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
The security-sensitive OAuth redemption changes require independent human verification of grant-state transitions and database-backed regression tests, since this review was static only.
No open issues 🎉
What changed in this PR
This PR strengthens OAuth2 token redemption by preventing unused authorization codes, including expired ones, from being exchanged through the refresh token grant.
Changes:
- Enforces grant-specific token state atomically during token rotation.
- Passes the grant type directly from the controller to the mapper.
- Adds mapper tests for allowed and rejected grant/state combinations and updates controller mock expectations.
| File | Description |
|---|---|
apps/oauth2/tests/Db/AccessTokenMapperTest.php |
Tests rotation acceptance and rejection for both grant types. |
apps/oauth2/tests/Controller/OauthApiControllerTest.php |
Updates rotation expectations to use the refresh grant string. |
apps/oauth2/lib/Db/AccessTokenMapper.php |
Requires refresh token rows to have previously delivered a token. |
apps/oauth2/lib/Controller/OauthApiController.php |
Passes the requested grant type to token rotation. |
Review effort: Balanced
This branch has not been deployed
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.
Summary
The authorization code expiration and redemption state checks only applied to the authorization_code grant, so an expired but still unredeemed authorization code could be exchanged for an access token through the refresh token grant, bypassing the intended 10-minute expiration until the expired code record was cleaned up.
Require a row to have already delivered a token (token_count > 0) when rotating through the refresh token grant, enforced atomically in rotateToken() which already serializes concurrent redemptions through the hashed_code check.
Checklist
3. to review, feature component)stable32)AI (if applicable)