Skip to content

fix(auth): accept empty optional OAuth client metadata URLs #2076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mrutunjay-kinagi wants to merge 3 commits into from
+26 −0
Closed

fix(auth): accept empty optional OAuth client metadata URLs #2076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b41567
fix(auth): normalize empty optional client metadata URIs
Feb 17, 2026
e9a78ec
test(auth): avoid pyright arg-type errors in empty-uri regression
Feb 17, 2026
3af50b7
Merge branch 'main' into fix-1665-empty-uri-metadata
mrutunjay-kinagi Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/mcp/shared/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ class OAuthClientMetadata(BaseModel):
software_id: str | None = None
software_version: str | None = None

@field_validator("client_uri", "logo_uri", "tos_uri", "policy_uri", "jwks_uri", mode="before")
@classmethod
def normalize_empty_optional_uris(cls, v: Any) -> Any:
if v == "":
return None
return v

def validate_scope(self, requested_scope: str | None) -> list[str] | None:
if requested_scope is None:
return None
Expand Down
19 changes: 19 additions & 0 deletions tests/client/test_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,25 @@ def valid_tokens():
)


def test_oauth_client_metadata_treats_empty_optional_uris_as_none():
metadata = OAuthClientMetadata.model_validate(
{
"redirect_uris": ["http://localhost:3030/callback"],
"client_uri": "",
"logo_uri": "",
"tos_uri": "",
"policy_uri": "",
"jwks_uri": "",
}
)

assert metadata.client_uri is None
assert metadata.logo_uri is None
assert metadata.tos_uri is None
assert metadata.policy_uri is None
assert metadata.jwks_uri is None


@pytest.fixture
def oauth_provider(client_metadata: OAuthClientMetadata, mock_storage: MockTokenStorage):
async def redirect_handler(url: str) -> None:
Expand Down