FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: normalize OAuth redirect URI URL subtypes by fengjikui · Pull Request #2953 · modelcontextprotocol/python-sdk · GitHub

/ python-sdk Public

fix: normalize OAuth redirect URI URL subtypes #2953

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
fengjikui wants to merge 1 commit into from
+31 −3
Conversation 0 Commits 1 Checks 27 Files changed 2
Closed

fix: normalize OAuth redirect URI URL subtypes #2953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
10 changes: 9 additions & 1 deletion src/mcp/shared/auth.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Any, Literal
from typing import Any, Literal, cast

from pydantic import AnyHttpUrl, AnyUrl, BaseModel, ConfigDict, Field, field_validator

Expand Down Expand Up @@ -84,6 +84,14 @@ class OAuthClientMetadata(BaseModel):
software_id: str | None = None
software_version: str | None = None

@field_validator("redirect_uris", mode="before")
@classmethod
def _normalize_redirect_uri_subtypes(cls, v: object) -> object:
if isinstance(v, list):
# Pydantic URL equality is type-strict, so store redirect URIs as the declared AnyUrl type.
return [str(item) if isinstance(item, AnyUrl) else item for item in cast(list[object], v)]
return v

@field_validator(
"client_uri",
"logo_uri",
Expand Down
24 changes: 22 additions & 2 deletions tests/shared/test_auth.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
"""Tests for OAuth 2.0 shared code."""

import pytest
from pydantic import ValidationError
from pydantic import AnyHttpUrl, AnyUrl, ValidationError

from mcp.shared.auth import OAuthClientInformationFull, OAuthClientMetadata, OAuthMetadata
from mcp.shared.auth import (
InvalidRedirectUriError,
OAuthClientInformationFull,
OAuthClientMetadata,
OAuthMetadata,
)


def test_oauth():
Expand Down Expand Up @@ -138,3 +143,18 @@ def test_invalid_non_empty_url_still_rejected():
}
with pytest.raises(ValidationError):
OAuthClientMetadata.model_validate(data)


def test_redirect_uri_subtypes_normalized_for_validation():
client_info = OAuthClientInformationFull(
client_id="test-client",
redirect_uris=[AnyHttpUrl("https://example.com/callback")],
)

incoming = AnyUrl("https://example.com/callback")

assert client_info.validate_redirect_uri(incoming) == incoming
assert client_info.model_dump(mode="json")["redirect_uris"] == ["https://example.com/callback"]

with pytest.raises(InvalidRedirectUriError):
client_info.validate_redirect_uri(AnyUrl("https://example.com/other"))
Loading
Back | FazBrowse Home | New Git URL