Fix validate_scope rejecting scopes when client scope is None#2426
Closed
Christian-Sidak wants to merge 1 commit intomodelcontextprotocol:mainfrom
Closed
Fix validate_scope rejecting scopes when client scope is None#2426Christian-Sidak wants to merge 1 commit intomodelcontextprotocol:mainfrom
Christian-Sidak wants to merge 1 commit intomodelcontextprotocol:mainfrom
Conversation
When a client is registered without specifying allowed scopes (scope=None), validate_scope was treating this as an empty allowlist, rejecting all requested scopes with InvalidScopeError. The correct behavior per OAuth 2.0 semantics is to treat None as unrestricted, allowing any requested scope. Fixes modelcontextprotocol#2216
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
Fixes #2216
OAuthClientMetadata.validate_scope()incorrectly treatsself.scope = Noneas an empty allowlist ([]), causing all requested scopes to be rejected withInvalidScopeError. Per OAuth 2.0 semantics,Nonemeans the client was registered without scope restrictions, so any requested scope should be permitted.Before:
allowed_scopes = [] if self.scope is None else self.scope.split(" ")-- any requested scope fails theincheck against[].After: Skip the allowlist check entirely when
self.scope is None, only validate against registered scopes when they are explicitly set.Test plan
Noneclient scope allows any requested scopeNonerequested scope returnsNoneregardless of client scope