Handle invalid OAUth state#833
Merged
threepointone merged 3 commits intocloudflare:mainfrom Feb 3, 2026
Merged
Conversation
🦋 Changeset detectedLatest commit: 1a21dce The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
mattzcarey
approved these changes
Feb 3, 2026
commit: |
…of exceptions Replace `.rejects.toThrow()` assertions with checks for `authSuccess: false` and `authError` fields in handleCallbackRequest results. Configure JSON error handlers in OAuth2 tests and verify error responses via `response.json()` instead of `response.text()` for state reuse, expiration, and serverId mismatch scenarios.
Merged
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
3 participants
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.
Issue
OAuth callbacks with expired or missing state were throwing an error but leaving the MCP connection stuck in
AUTHENTICATINGwithauth_urlstill set in storage. This prevented retries and caused the connection to remain in a broken state across restarts.Fix
On invalid OAuth state:
auth_urlin storageFAILEDA small edge case
If duplicate callbacks arrive for the same auth, one callback can consume the state and clear
auth_url. If the other callback does not reachcompleteAuthorizationin time, it will fail validation and now mark the connection asFAILED.