diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py index 48fed2e203e..2ed441959fd 100644 --- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py +++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py @@ -2080,6 +2080,34 @@ class MCPServerManager: def _registered_server(self, server: MCPServer) -> MCPServer: return self.registry.get(server.server_id) or self.config_mcp_servers.get(server.server_id) or server + async def _discover_oauth_metadata_within_deadline( + self, + server_url: str | None, + issuer_anchor: str | None, + *, + allow_origin_fallback: bool, + warn_when_no_metadata: bool, + ) -> MCPOAuthMetadata | None: + discovery: Final = ( + self._fetch_issuer_anchored_oauth_metadata(issuer_anchor, server_url) + if issuer_anchor is not None + else self._descovery_metadata( + server_url=server_url or "", + allow_origin_fallback=allow_origin_fallback, + warn_when_no_metadata=warn_when_no_metadata, + ) + ) + try: + return await asyncio.wait_for(discovery, timeout=MCP_METADATA_TIMEOUT) + except asyncio.TimeoutError: + verbose_logger.warning( + "MCP OAuth discovery for %s timed out after %ss; " + "OAuth endpoints stay unresolved until a rebuild succeeds", + server_url, + MCP_METADATA_TIMEOUT, + ) + return None + async def _discover_oauth_metadata_for_server(self, server: MCPServer) -> MCPOAuthMetadata | None: manual_issuer: Final = _blank_to_none(server.issuer) manual_authorization_url: Final = _blank_to_none(server.authorization_url) @@ -2627,11 +2655,10 @@ class MCPServerManager: discovery_deferred = should_discover and not self._oauth_discovery_on_startup if not should_discover or discovery_deferred: mcp_oauth_metadata = None - elif use_issuer_anchor and manual_issuer is not None: - mcp_oauth_metadata = await self._fetch_issuer_anchored_oauth_metadata(manual_issuer, server_url) else: - mcp_oauth_metadata = await self._descovery_metadata( - server_url=server_url, + mcp_oauth_metadata = await self._discover_oauth_metadata_within_deadline( + server_url, + manual_issuer if use_issuer_anchor else None, allow_origin_fallback=is_discovery_auth_type, warn_when_no_metadata=warn_on_empty_discovery, ) @@ -3120,16 +3147,16 @@ class MCPServerManager: (is_discovery_auth_type and not has_all_upstream_oauth_fields) or obo_needs_discovery ) discovery_deferred: Final = needs_discovery and not self._oauth_discovery_on_startup - if not needs_discovery or discovery_deferred: - mcp_oauth_metadata: MCPOAuthMetadata | None = None - elif use_issuer_anchor and manual_issuer is not None: - mcp_oauth_metadata = await self._fetch_issuer_anchored_oauth_metadata(manual_issuer, server_url) - else: - mcp_oauth_metadata = await self._descovery_metadata( - server_url=server_url, + mcp_oauth_metadata: Final = ( + None + if not needs_discovery or discovery_deferred + else await self._discover_oauth_metadata_within_deadline( + server_url, + manual_issuer if use_issuer_anchor else None, allow_origin_fallback=is_discovery_auth_type, warn_when_no_metadata=warn_on_empty_discovery, ) + ) if use_issuer_anchor: return mcp_oauth_metadata, discovery_deferred gated_metadata: Final = ( diff --git a/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py index 20397c4005c..88363171ed3 100644 --- a/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py +++ b/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py @@ -4640,6 +4640,67 @@ class TestMCPServerManager: assert metadata is None assert "HTTP 200 (no RFC 9728 challenge)" in attempts[0] + @pytest.mark.asyncio + @pytest.mark.parametrize("source", ["config", "database"]) + async def test_startup_discovery_gives_up_on_metadata_that_never_finishes( + self, source: str, monkeypatch: pytest.MonkeyPatch + ): + body: Final = _OpenEventStream() + + def respond(request: httpx.Request) -> httpx.Response: + if request.url.path == "/mcp": + return httpx.Response(200) + if request.url.path == "/.well-known/oauth-protected-resource/mcp": + return httpx.Response(200, headers={"Content-Type": "application/json"}, stream=body) + return httpx.Response(404) + + monkeypatch.setenv("LITELLM_MCP_OAUTH_DISCOVERY_ON_STARTUP", "1") + manager: Final = MCPServerManager() + with ( + patch( + "litellm.proxy._experimental.mcp_server.mcp_server_manager.get_async_httpx_client", + return_value=_handler_answering(respond), + ), + patch("litellm.proxy._experimental.mcp_server.mcp_server_manager.MCP_METADATA_TIMEOUT", 0.05), + ): + if source == "config": + await asyncio.wait_for( + manager.load_servers_from_config( + { + "stuck": { + "url": "https://stuck.example.com/mcp", + "transport": "http", + "auth_type": "oauth2", + "oauth2_flow": "authorization_code", + "client_id": "qa-client", + } + } + ), + timeout=5, + ) + server = next(iter(manager.config_mcp_servers.values())) + else: + server = await asyncio.wait_for( + manager.build_mcp_server_from_table( + LiteLLM_MCPServerTable( + server_id="stuck", + alias="stuck", + url="https://stuck.example.com/mcp", + transport=MCPTransport.http, + auth_type=MCPAuth.oauth2, + oauth2_flow="authorization_code", + created_at=datetime.now(), + updated_at=datetime.now(), + ), + credentials_are_encrypted=False, + ), + timeout=5, + ) + + assert body.read_started.is_set() + assert server.authorization_url is None + assert server.token_url is None + @pytest.mark.asyncio async def test_fetch_single_authorization_server_metadata_supports_azure_issuer_path( self,