[auth] Validate nonce claim in id_token after PKCE token exchange#278
Merged
Conversation
4 tasks
lalwani
approved these changes
Jun 26, 2026
858db71 to
7fbb230
Compare
a616fa6 to
2953c44
Compare
…s set) Auto-nonce (#279) guarantees effectiveNonce is never null, so the 'if (sentNonce != null)' guard is no longer needed. Validation is now unconditional — any PKCE response without an id_token nonce claim that matches effectiveNonce is rejected. Update existing PKCE tests to provide a matching id_token and add two new tests covering the always-validated path. Co-Authored-By: Claude <noreply@anthropic.com>
2953c44 to
1aecbd3
Compare
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
id_tokenafter PKCE token exchangeNonceUtil.extractNonceFromIdToken(PR [auth] Add NonceUtil for JWT nonce extraction and id_token field to UberToken #277) to decode the JWT payloadINVALID_NONCEerror when the claim is absent or mismatchedStacked on #277.
Note: Once PR #279 (auto-nonce) merges, the
if (sentNonce != null)guard here should be removed — nonce will always be present so validation should always run.🤖 Generated with Claude Code
Co-Authored-By: Claude noreply@anthropic.com
Test Plan
./gradlew :authentication:testpassesRevert Plan
Revert this commit. Nonce claim in id_token will no longer be validated.