π The fast, Pythonic way to build MCP servers and clients.
fix(auth): include DNS in SSRF deadline (#5509)
mika1f262ba2a727
diff --git a/fastmcp_slim/fastmcp/server/auth/ssrf.py b/fastmcp_slim/fastmcp/server/auth/ssrf.pyindex 8a26960ee..b86a5b07f 100644--- a/fastmcp_slim/fastmcp/server/auth/ssrf.py+++ b/fastmcp_slim/fastmcp/server/auth/ssrf.py@@ -25,7 +25,6 @@ import asyncioimport ipaddressimport osimport socket-import timefrom collections.abc import Mappingfrom dataclasses import dataclassfrom urllib.parse import urlparse@@ -427,10 +426,37 @@ async def ssrf_safe_fetch_response("""Fetch URL with SSRF protection and return response metadata.This is equivalent to :func:`ssrf_safe_fetch` but returns response headers- and status code, and supports conditional request headers.+ and status code, and supports conditional request headers. The overall+ deadline includes DNS resolution. Cancelling the resolver await cannot stop+ an operating-system `getaddrinfo` call already running in an executor+ thread, but this coroutine stops waiting for it at the deadline."""- start_time = time.monotonic()+ try:+ return await asyncio.wait_for(+ _ssrf_safe_fetch_response(+ url,+ require_path=require_path,+ max_size=max_size,+ timeout=timeout,+ request_headers=request_headers,+ allowed_status_codes=allowed_status_codes,+ ),+ timeout=overall_timeout,+ )+ except TimeoutError as exc:+ raise SSRFFetchError(f"Overall timeout exceeded: {url}") from exc++async def _ssrf_safe_fetch_response(+ url: str,+ *,+ require_path: bool = False,+ max_size: int = 5120,+ timeout: float = 10.0,+ request_headers: Mapping[str, str] | None = None,+ allowed_status_codes: set[int] | None = None,+) -> SSRFFetchResponse:+ """Run one fetch; the public wrapper bounds this whole coroutine."""# Validate URL and resolve DNSvalidated = await validate_url(url, require_path=require_path)@@ -441,11 +467,6 @@ async def ssrf_safe_fetch_response(targets = _build_fetch_targets(validated)for target in targets:- elapsed = time.monotonic() - start_time- if elapsed > overall_timeout:- raise SSRFFetchError(f"Overall timeout exceeded: {url}")- remaining = max(1.0, overall_timeout - elapsed)-logger.debug("SSRF-safe fetch: %s -> %s", url, target.url)# In pinned mode Host is forced to the validated hostname; in proxy mode httpx@@ -469,12 +490,7 @@ async def ssrf_safe_fetch_response(# Use httpx with streaming to enforce size limit during downloadasync with (httpx2.AsyncClient(- timeout=httpx2.Timeout(- connect=min(timeout, remaining),- read=min(timeout, remaining),- write=min(timeout, remaining),- pool=min(timeout, remaining),- ),+ timeout=httpx2.Timeout(timeout),follow_redirects=False,verify=True,# Default (pinned) mode has no proxy_url and keeps trust_env's@@ -492,9 +508,6 @@ async def ssrf_safe_fetch_response(extensions=extensions,) as response,):- if time.monotonic() - start_time > overall_timeout:- raise SSRFFetchError(f"Overall timeout exceeded: {url}")-if response.status_code not in expected_statuses:raise SSRFFetchError(f"HTTP {response.status_code} fetching {url}")@@ -514,8 +527,6 @@ async def ssrf_safe_fetch_response(chunks = []total = 0async for chunk in response.aiter_bytes():- if time.monotonic() - start_time > overall_timeout:- raise SSRFFetchError(f"Overall timeout exceeded: {url}")total += len(chunk)if total > max_size:raise SSRFFetchError(diff --git a/tests/server/auth/test_ssrf_protection.py b/tests/server/auth/test_ssrf_protection.pyindex a7271cf88..b50a0eee3 100644--- a/tests/server/auth/test_ssrf_protection.py+++ b/tests/server/auth/test_ssrf_protection.py@@ -4,6 +4,8 @@ This module tests the ssrf.py module which provides SSRF-protected HTTP fetching"""import socket+import threading+import timefrom unittest.mock import AsyncMock, MagicMock, patchimport httpx2@@ -371,6 +373,27 @@ class TestSSRFSafeFetch:with pytest.raises(SSRFFetchError, match="too large"):await ssrf_safe_fetch("https://example.com/api")+ async def test_overall_timeout_bounds_dns_resolution(self):+ """A slow DNS lookup must not outlive overall_timeout."""++ release = threading.Event()++ def slow_getaddrinfo(*args, **kwargs):+ release.wait(timeout=0.5)+ return [(socket.AF_INET, socket.SOCK_STREAM, 6, "", ("93.184.216.34", 443))]++ with patch("socket.getaddrinfo", side_effect=slow_getaddrinfo):+ start = time.monotonic()+ try:+ with pytest.raises(SSRFFetchError, match="Overall timeout exceeded"):+ await ssrf_safe_fetch(+ "https://slow-dns.example.com/api", overall_timeout=0.05+ )+ elapsed = time.monotonic() - start+ finally:+ release.set()+ assert elapsed < 0.3+class TestJWKSSSRFProtection:"""Tests for SSRF protection in JWTVerifier JWKS fetching."""