Skip to content

Commit 6434eef

Browse files
committed
refactor: use set operations for scope validation per reviewer feedback
Replace the for-loop with set.issubset() for clarity and to report all invalid scopes at once rather than one per loop iteration. Github-Issue: #2216
1 parent 71d0f7f commit 6434eef

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/mcp/shared/auth.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,13 @@ def validate_scope(self, requested_scope: str | None) -> list[str] | None:
7474
if self.scope is None:
7575
# Client registered without scope restrictions — allow any requested scope
7676
return requested_scopes
77-
allowed_scopes = self.scope.split(" ")
78-
for scope in requested_scopes:
79-
if scope not in allowed_scopes:
80-
raise InvalidScopeError(f"Client was not registered with scope {scope}")
77+
requested = set(requested_scopes)
78+
allowed = set(self.scope.split())
79+
if not requested.issubset(allowed):
80+
invalid = requested - allowed
81+
raise InvalidScopeError(
82+
f"Client was not registered with scope(s): {' '.join(sorted(invalid))}"
83+
)
8184
return requested_scopes
8285

8386
def validate_redirect_uri(self, redirect_uri: AnyUrl | None) -> AnyUrl:

0 commit comments

Comments
 (0)