fix(auth): retain state until issuer validation - #1167
Merged
DaleSeo merged 1 commit intoAug 12, 2026
Merged
Conversation
stevenlee-oai
marked this pull request as ready for review
August 12, 2026 04:01
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
issWhy
The returned OAuth
stateis only the lookup key. An unknown state loads noStoredAuthorizationStateand deletes nothing. But an authorization server that received the authorization request can send a callback with the correct state and a forged or missing requirediss. Previously RMCP loaded and deleted the real stored state before issuer validation rejected that callback. That consumed the PKCE verifier, so the later legitimate callback could not complete.The new order is load state, validate
iss, delete state, then exchange the code. Invalid issuer callbacks do not reach the token endpoint or consume state; a valid callback still consumes the one-time state before token exchange.Tests
cargo fmt --checkcargo test -p rmcp --lib --features auth invalid_issuer_does_not_consume_authorization_statecargo test -p rmcp --lib --features auth