fix: validate_scope treats None registered scopes as no restrictions#2224
Open
shivama205 wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
fix: validate_scope treats None registered scopes as no restrictions#2224shivama205 wants to merge 1 commit intomodelcontextprotocol:mainfrom
shivama205 wants to merge 1 commit intomodelcontextprotocol:mainfrom
Conversation
When a client was registered without specific scopes (scope=None), validate_scope() converted None to an empty list, causing all requested scopes to be rejected with InvalidScopeError. Now None is correctly treated as "no restrictions", allowing any scope. Closes modelcontextprotocol#2216
shivama205
force-pushed
the
fix/validate-scope-none-scopes
branch
from
49f7dec to
d6bd5eb
Compare
Author
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
1 participant
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
OAuthClientMetadata.validate_scope()incorrectly treatedself.scope = None(no scopes registered) as an empty allowed list, rejecting all requested scopes withInvalidScopeErrorNoneis correctly treated as "no restrictions", allowing any requested scope throughCloses #2216
Changes
src/mcp/shared/auth.py— early return whenself.scope is Noneinstead of converting to empty listtests/shared/test_auth.py— added 6 unit tests forvalidate_scopecovering None/matching/rejection/empty casesTest plan
test_authorize_invalid_scope)ruff checkpassesruff formatpassespyrightpasses with 0 errors