fix: allow client scopes when no scope restriction is set#2220
Closed
lavish0000 wants to merge 2 commits intomodelcontextprotocol:mainfrom
Closed
fix: allow client scopes when no scope restriction is set#2220lavish0000 wants to merge 2 commits intomodelcontextprotocol:mainfrom
lavish0000 wants to merge 2 commits intomodelcontextprotocol:mainfrom
Conversation
Author
|
Quick status note: the remaining red lane is |
8 tasks
Contributor
|
Thanks for the PR! Per our CONTRIBUTING.md, PRs require a corresponding issue with the |
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
2 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.
Summary
OAuthClientMetadata.scope=Noneas unrestricted instead of an empty allowlistProblem
OAuthClientMetadata.validate_scope()currently turnsscope=Noneinto[]. That makes any requested scope look invalid, even though an unset client scope should mean the client was not registered with a scope restriction.As a result, authorization requests can be rejected with
invalid_scopewhen the client metadata omitsscopeentirely.Fix
If the client metadata does not declare a scope restriction, return the requested scopes as-is. Keep the existing validation path when the client was registered with explicit scopes.
Validation
uv run pytest tests/shared/test_auth.py tests/server/mcpserver/auth/test_auth_integration.py -k "validate_scope or authorize_invalid_scope"uv run ruff check src/mcp/shared/auth.py tests/shared/test_auth.pyuv run ruff format --check src/mcp/shared/auth.py tests/shared/test_auth.pyuv run pyright src/mcp/shared/auth.py tests/shared/test_auth.py