refac
This commit is contained in:
1 parent
3ccf263b10
commit
93931efaa7
1 file changed
+60
-19
@@ -1,4 +1,5 @@
|
|||||||
import base64
|
import base64
|
||||||
|
from dataclasses import dataclass, field
|
||||||
import copy
|
import copy
|
||||||
import hashlib
|
import hashlib
|
||||||
import logging
|
import logging
|
||||||
@@ -100,6 +101,7 @@ class OAuthClientMetadata(MCPOAuthClientMetadata):
|
|||||||
|
|
||||||
class OAuthClientInformationFull(OAuthClientMetadata):
|
class OAuthClientInformationFull(OAuthClientMetadata):
|
||||||
issuer: Optional[str] = None # URL of the OAuth server that issued this client
|
issuer: Optional[str] = None # URL of the OAuth server that issued this client
|
||||||
|
resource: Optional[str] = None # RFC 8707 resource indicator for JWT audience
|
||||||
|
|
||||||
client_id: str
|
client_id: str
|
||||||
client_secret: str | None = None
|
client_secret: str | None = None
|
||||||
@@ -290,12 +292,33 @@ def get_parsed_and_base_url(server_url) -> tuple[urllib.parse.ParseResult, str]:
|
|||||||
return parsed, base_url
|
return parsed, base_url
|
||||||
|
|
||||||
|
|
||||||
async def get_authorization_server_discovery_urls(server_url: str) -> list[str]:
|
@dataclass
|
||||||
"""
|
class ProtectedResourceMetadata:
|
||||||
https://modelcontextprotocol.io/specification/2025-03-26/basic/authorization
|
"""RFC 9728 Protected Resource Metadata fields relevant to OAuth flows."""
|
||||||
"""
|
resource: str | None = None
|
||||||
|
authorization_servers: list[str] = field(default_factory=list)
|
||||||
|
|
||||||
|
def get_discovery_urls(self, server_url: str) -> list[str]:
|
||||||
|
"""Build all candidate OAuth discovery URLs from this metadata and the server URL."""
|
||||||
|
urls = []
|
||||||
|
for auth_server in self.authorization_servers:
|
||||||
|
urls.extend(_build_well_known_urls(auth_server.rstrip('/')))
|
||||||
|
urls.extend(_build_well_known_urls(server_url))
|
||||||
|
return urls
|
||||||
|
|
||||||
|
|
||||||
|
async def get_protected_resource_metadata(server_url: str) -> ProtectedResourceMetadata:
|
||||||
|
"""
|
||||||
|
Fetch RFC 9728 Protected Resource Metadata from an MCP server.
|
||||||
|
|
||||||
|
https://modelcontextprotocol.io/specification/2025-03-26/basic/authorization
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ProtectedResourceMetadata with the resource indicator (RFC 8707)
|
||||||
|
and authorization server URLs discovered from the metadata document.
|
||||||
|
"""
|
||||||
authorization_servers = []
|
authorization_servers = []
|
||||||
|
resource = None
|
||||||
try:
|
try:
|
||||||
async with aiohttp.ClientSession(trust_env=True) as session:
|
async with aiohttp.ClientSession(trust_env=True) as session:
|
||||||
async with session.post(
|
async with session.post(
|
||||||
@@ -335,6 +358,10 @@ async def get_authorization_server_discovery_urls(server_url: str) -> list[str]:
|
|||||||
if resource_response.status == 200:
|
if resource_response.status == 200:
|
||||||
resource_metadata = await resource_response.json()
|
resource_metadata = await resource_response.json()
|
||||||
|
|
||||||
|
resource = resource_metadata.get('resource') or None
|
||||||
|
if resource:
|
||||||
|
log.debug(f'Discovered resource indicator: {resource}')
|
||||||
|
|
||||||
servers = resource_metadata.get('authorization_servers', [])
|
servers = resource_metadata.get('authorization_servers', [])
|
||||||
if servers:
|
if servers:
|
||||||
authorization_servers = servers
|
authorization_servers = servers
|
||||||
@@ -346,12 +373,7 @@ async def get_authorization_server_discovery_urls(server_url: str) -> list[str]:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.debug(f'MCP Protected Resource discovery failed: {e}')
|
log.debug(f'MCP Protected Resource discovery failed: {e}')
|
||||||
|
|
||||||
discovery_urls = []
|
return ProtectedResourceMetadata(resource=resource, authorization_servers=authorization_servers)
|
||||||
for auth_server in authorization_servers:
|
|
||||||
auth_server = auth_server.rstrip('/')
|
|
||||||
discovery_urls.extend(_build_well_known_urls(auth_server))
|
|
||||||
|
|
||||||
return discovery_urls
|
|
||||||
|
|
||||||
|
|
||||||
def _build_well_known_urls(server_url: str) -> list[str]:
|
def _build_well_known_urls(server_url: str) -> list[str]:
|
||||||
@@ -380,9 +402,9 @@ def _build_well_known_urls(server_url: str) -> list[str]:
|
|||||||
|
|
||||||
|
|
||||||
async def get_discovery_urls(server_url) -> list[str]:
|
async def get_discovery_urls(server_url) -> list[str]:
|
||||||
urls = await get_authorization_server_discovery_urls(server_url)
|
"""Convenience: get all OAuth discovery URLs for a server URL."""
|
||||||
urls.extend(_build_well_known_urls(server_url))
|
metadata = await get_protected_resource_metadata(server_url)
|
||||||
return urls
|
return metadata.get_discovery_urls(server_url)
|
||||||
|
|
||||||
|
|
||||||
# TODO: Some OAuth providers require Initial Access Tokens (IATs) for dynamic client registration.
|
# TODO: Some OAuth providers require Initial Access Tokens (IATs) for dynamic client registration.
|
||||||
@@ -407,7 +429,9 @@ async def get_oauth_client_info_with_dynamic_client_registration(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Attempt to fetch OAuth server metadata to get registration endpoint & scopes
|
# Attempt to fetch OAuth server metadata to get registration endpoint & scopes
|
||||||
discovery_urls = await get_discovery_urls(oauth_server_url)
|
resource_metadata = await get_protected_resource_metadata(oauth_server_url)
|
||||||
|
resource = resource_metadata.resource
|
||||||
|
discovery_urls = resource_metadata.get_discovery_urls(oauth_server_url)
|
||||||
for url in discovery_urls:
|
for url in discovery_urls:
|
||||||
async with aiohttp.ClientSession(trust_env=True) as session:
|
async with aiohttp.ClientSession(trust_env=True) as session:
|
||||||
async with session.get(url, ssl=AIOHTTP_CLIENT_SESSION_SSL) as oauth_server_metadata_response:
|
async with session.get(url, ssl=AIOHTTP_CLIENT_SESSION_SSL) as oauth_server_metadata_response:
|
||||||
@@ -467,8 +491,9 @@ async def get_oauth_client_info_with_dynamic_client_registration(
|
|||||||
oauth_client_info = OAuthClientInformationFull.model_validate(
|
oauth_client_info = OAuthClientInformationFull.model_validate(
|
||||||
{
|
{
|
||||||
**registration_response_json,
|
**registration_response_json,
|
||||||
**{'issuer': oauth_server_metadata_url},
|
'issuer': oauth_server_metadata_url,
|
||||||
**{'server_metadata': oauth_server_metadata},
|
'server_metadata': oauth_server_metadata,
|
||||||
|
'resource': resource,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
log.info(
|
log.info(
|
||||||
@@ -517,7 +542,9 @@ async def get_oauth_client_info_with_static_credentials(
|
|||||||
redirect_uri = f'{redirect_base_url}/oauth/clients/{client_id}/callback'
|
redirect_uri = f'{redirect_base_url}/oauth/clients/{client_id}/callback'
|
||||||
|
|
||||||
# Discover server metadata (authorization endpoint, token endpoint, scopes, etc.)
|
# Discover server metadata (authorization endpoint, token endpoint, scopes, etc.)
|
||||||
discovery_urls = await get_discovery_urls(oauth_server_url)
|
resource_metadata = await get_protected_resource_metadata(oauth_server_url)
|
||||||
|
resource = resource_metadata.resource
|
||||||
|
discovery_urls = resource_metadata.get_discovery_urls(oauth_server_url)
|
||||||
for url in discovery_urls:
|
for url in discovery_urls:
|
||||||
async with aiohttp.ClientSession(trust_env=True) as session:
|
async with aiohttp.ClientSession(trust_env=True) as session:
|
||||||
async with session.get(url, ssl=AIOHTTP_CLIENT_SESSION_SSL) as resp:
|
async with session.get(url, ssl=AIOHTTP_CLIENT_SESSION_SSL) as resp:
|
||||||
@@ -556,6 +583,7 @@ async def get_oauth_client_info_with_static_credentials(
|
|||||||
token_endpoint_auth_method=token_endpoint_auth_method,
|
token_endpoint_auth_method=token_endpoint_auth_method,
|
||||||
issuer=oauth_server_metadata_url,
|
issuer=oauth_server_metadata_url,
|
||||||
server_metadata=oauth_server_metadata,
|
server_metadata=oauth_server_metadata,
|
||||||
|
resource=resource,
|
||||||
)
|
)
|
||||||
|
|
||||||
log.info(
|
log.info(
|
||||||
@@ -874,6 +902,11 @@ class OAuthClientManager:
|
|||||||
'refresh_token': token_data['refresh_token'],
|
'refresh_token': token_data['refresh_token'],
|
||||||
'client_id': client.client_id,
|
'client_id': client.client_id,
|
||||||
}
|
}
|
||||||
|
# RFC 8707: include resource indicator so refreshed tokens retain correct audience
|
||||||
|
client_info = self.get_client_info(client_id)
|
||||||
|
if client_info and client_info.resource:
|
||||||
|
refresh_data['resource'] = client_info.resource
|
||||||
|
|
||||||
if hasattr(client, 'client_secret') and client.client_secret:
|
if hasattr(client, 'client_secret') and client.client_secret:
|
||||||
refresh_data['client_secret'] = client.client_secret
|
refresh_data['client_secret'] = client.client_secret
|
||||||
|
|
||||||
@@ -926,7 +959,11 @@ class OAuthClientManager:
|
|||||||
|
|
||||||
redirect_uri = client_info.redirect_uris[0] if client_info.redirect_uris else None
|
redirect_uri = client_info.redirect_uris[0] if client_info.redirect_uris else None
|
||||||
redirect_uri_str = str(redirect_uri) if redirect_uri else None
|
redirect_uri_str = str(redirect_uri) if redirect_uri else None
|
||||||
return await client.authorize_redirect(request, redirect_uri_str)
|
# RFC 8707: pass resource indicator so the IdP sets the correct JWT audience
|
||||||
|
kwargs = {}
|
||||||
|
if client_info.resource:
|
||||||
|
kwargs['resource'] = client_info.resource
|
||||||
|
return await client.authorize_redirect(request, redirect_uri_str, **kwargs)
|
||||||
|
|
||||||
async def handle_callback(self, request, client_id: str, user_id: str, response):
|
async def handle_callback(self, request, client_id: str, user_id: str, response):
|
||||||
client = self.get_client(client_id) or self.ensure_client_from_config(client_id)
|
client = self.get_client(client_id) or self.ensure_client_from_config(client_id)
|
||||||
@@ -941,7 +978,11 @@ class OAuthClientManager:
|
|||||||
# The Authlib client already has these configured during add_client().
|
# The Authlib client already has these configured during add_client().
|
||||||
# Passing them again causes Authlib to concatenate them (e.g., "ID1,ID1"),
|
# Passing them again causes Authlib to concatenate them (e.g., "ID1,ID1"),
|
||||||
# which results in 401 errors from the token endpoint. (Fix for #19823)
|
# which results in 401 errors from the token endpoint. (Fix for #19823)
|
||||||
token = await client.authorize_access_token(request)
|
# RFC 8707: pass resource indicator for correct JWT audience on token exchange
|
||||||
|
token_kwargs = {}
|
||||||
|
if client_info and client_info.resource:
|
||||||
|
token_kwargs['resource'] = client_info.resource
|
||||||
|
token = await client.authorize_access_token(request, **token_kwargs)
|
||||||
|
|
||||||
# Validate that we received a proper token response
|
# Validate that we received a proper token response
|
||||||
# If token exchange failed (e.g., 401), we may get an error response instead
|
# If token exchange failed (e.g., 401), we may get an error response instead
|
||||||
|
|||||||
Reference in new issue
Block a user