mirror of
https://github.com/PrefectHQ/fastmcp.git
synced 2026-08-20 20:44:17 +02:00
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Jeremiah Lowin <jlowin@users.noreply.github.com> Co-authored-by: Marvin Context Protocol <41898282+Marvin Context Protocol@users.noreply.github.com> Co-authored-by: voidborne-d <voidborne-d@users.noreply.github.com> Co-authored-by: marvin-context-protocol[bot] <225465937+marvin-context-protocol[bot]@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: d 🔹 <258577966+voidborne-d@users.noreply.github.com> Co-authored-by: Jeremiah Lowin <153965+jlowin@users.noreply.github.com> Co-authored-by: nightcityblade <nightcityblade@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Bill Easton <strawgate@users.noreply.github.com> Co-authored-by: Sumanshu Nankana <sumanshunankana@gmail.com> Co-authored-by: Eric Robinson <ericrobinson@indeed.com> Co-authored-by: Martim Santos <martimfasantos@gmail.com> Co-authored-by: d 🔹 <liusway405@gmail.com> Co-authored-by: Matthieu B <66959271+mtthidoteu@users.noreply.github.com> Co-authored-by: Sascha Buehrle <47737812+saschabuehrle@users.noreply.github.com> Co-authored-by: Hakancan <142545736+hkc5@users.noreply.github.com> Co-authored-by: nightcityblade <jackchen@haloailabs.com> Co-authored-by: Matt Hallowell <17804673+mhallo@users.noreply.github.com> Co-authored-by: nate nowack <thrast36@gmail.com> Co-authored-by: Bill Easton <williamseaston@gmail.com> Co-authored-by: Marcus Shu <46469249+shulkx@users.noreply.github.com> Co-authored-by: Rushabh Doshi <radoshi@gmail.com> Co-authored-by: AIKAWA Shigechika <shige@aikawa.jp> Co-authored-by: Jeremy Simon <simonjer805@gmail.com> Co-authored-by: Miguel Miranda Dias <7780875+pandego@users.noreply.github.com> Co-authored-by: Anthony James Padavano <padavano.anthony@gmail.com> Co-authored-by: Mostafa Kamal <hiremostafa@gmail.com> Fix auto-close MRE script posting comment without closing (#3386) Fix WorkOS token scope verification bypass 🤖 Generated with Codex (#3407) Fix initialize McpError fallthrough 🤖 Generated with Codex (#3413) Fix transform arg collisions with passthrough params (#3431) Fix get_* returning None when latest version is disabled (#3439) Fix get_* returning None when latest version is disabled (#3421) Fix server lifespan overlap teardown (#3415) Fix $ref output schema object detection regression (#3420) resolved annotations (#3429) Fix async partial callables rejected by iscoroutinefunction (#3438) Fix async partial callables rejected by iscoroutinefunction (#3423) fix: add version to components (#3458) fix: use intent-based flag for OIDC scope patch in load_access_token (#3465) Fixes #3461 fix: normalize Google scope shorthands and surface valid_scopes (#3477) fix: resolve ty 0.0.23 type-checking errors and bump pin (#3481) fix: shield lifespan teardown from cancellation (#3480) fix: forward custom_route endpoints from mounted servers (#3462) fix updates _get_additional_http_routes() to traverse providers, Fixes #3457 fix: remove hardcoded version from CLI help text (#3456) fix: monty 0.0.8 compatibility, drop external_functions from constructor (#3468) fix: task test teardown hanging 5s per test (#3499) Closes #3498 fix: validate workspace path is a directory before cursor install (#3440) Fixes #3426 fix: handle re.error from malformed URI templates in build_regex (#3501) fix: reject empty/OIDC-only required_scopes in AzureProvider (#3503) fix: restrict $ref resolution to local refs only (SSRF/LFI) (#3502) fix warnings and timeouts (#3504) close upgrade check issue when build passes (#3505) Closes #3484 fix: URL-encode path params to prevent SSRF/path traversal (GHSA-vv7q-7jx5-f767) (#3507) fix: prevent path traversal in skill download (#3493) fix: prefer IdP-granted scopes over client-requested scopes in OAuthProxy (#3492) fix: remove unrelated transform and http.py changes from PR scope fix: remove forced follow_redirects from httpx_client_factory calls (#3496) fix: stop passing follow_redirects to httpx_client_factory fix: restore follow_redirects=True for custom httpx client factories Closes #3509 fix: CSRF double-submit cookie check in consent flow (#3519) fix: validate server names in install commands (#3522) fix: use raw strings for regex in pytest.raises match (#3523) fix: reject refresh tokens used as Bearer access tokens (#3524) fix: route ResourcesAsTools/PromptsAsTools through server middleware (#3495) fix: resolve Pyright "Module is not callable" on @tool, @resource, @prompt decorators (#3540) fix: filter warnings by message in KEY_PREFIX test (#3549) fix: suppress output schema for ToolResult subclass annotations (#3548) fix: increase sleep duration in proxy cache tests (#3567) fix: store absolute token expiry to prevent stale expires_in on reload (#3572) fix: preserve tool properties named 'title' during schema compression (#3582) Fix loopback redirect URI port matching per RFC 8252 §7.3 (#3589) Fix app tool routing: visibility check and middleware propagation (#3591) Fix query parameter serialization to respect OpenAPI explode/style settings (#3595) Fix dev apps form: union types, textarea support, JSON parsing (#3597) fix(google): replace deprecated /oauth2/v1/tokeninfo with /oauth2/v3/userinfo (#3603) fix: resolve EntraOBOToken dependency injection through MultiAuth (#3609) fix(docs): correct misleading stateless_http header (#3622) fix: filesystem provider import machinery (#3626) Closes #3625 (issues 2, 3, 6) fix: recover StdioTransport after subprocess exits (#3630) fix(server): preserve mounted tool task metadata (#3632) fix: scope deprecation warning filter to FastMCPDeprecationWarning (#3649) fix imports, add PrefabAppConfig (#3650) fix: resolve CurrentFastMCP/ctx.fastmcp to child server in mounted background tasks (#3651) Fix blocking docs issues: chart imports, Select API, Rx consistency (#3652) closed by default (#3657) Fix prompt caching middleware missing wrap/unwrap round-trip (#3666) fix: serialize object query params per OpenAPI style/explode rules (#3662) Fixes #2857 fix: HTTP request headers not accessible in background task workers (#3631) fix: restore HTTP headers in worker execution path for background tasks (#3681) fix: strip discriminator after dereferencing schemas (#3682) fix: remove stale ty:ignore directives for ty 0.0.26 (#3684) Fix docs gaps in app provider pages (#3690) fix: dev apps log panel UX improvements (#3698) fix dev server empty string args (#3700)
368 lines
12 KiB
Python
368 lines
12 KiB
Python
"""Tests for http_client parameter on token verifiers.
|
|
|
|
Verifies that all token verifiers accept an optional httpx.AsyncClient for
|
|
connection pooling (issues #3287 and #3293).
|
|
"""
|
|
|
|
import time
|
|
|
|
import httpx
|
|
import pytest
|
|
from pytest_httpx import HTTPXMock
|
|
|
|
from fastmcp.server.auth.providers.introspection import IntrospectionTokenVerifier
|
|
from fastmcp.server.auth.providers.jwt import JWTVerifier, RSAKeyPair
|
|
|
|
|
|
class TestIntrospectionHttpClient:
|
|
"""Test http_client parameter on IntrospectionTokenVerifier."""
|
|
|
|
@pytest.fixture
|
|
def shared_client(self) -> httpx.AsyncClient:
|
|
return httpx.AsyncClient(timeout=30)
|
|
|
|
def test_stores_http_client(self, shared_client: httpx.AsyncClient):
|
|
verifier = IntrospectionTokenVerifier(
|
|
introspection_url="https://auth.example.com/introspect",
|
|
client_id="test",
|
|
client_secret="secret",
|
|
http_client=shared_client,
|
|
)
|
|
assert verifier._http_client is shared_client
|
|
|
|
def test_default_http_client_is_none(self):
|
|
verifier = IntrospectionTokenVerifier(
|
|
introspection_url="https://auth.example.com/introspect",
|
|
client_id="test",
|
|
client_secret="secret",
|
|
)
|
|
assert verifier._http_client is None
|
|
|
|
async def test_uses_provided_client(
|
|
self, shared_client: httpx.AsyncClient, httpx_mock: HTTPXMock
|
|
):
|
|
"""When http_client is provided, it should be used for requests."""
|
|
httpx_mock.add_response(
|
|
url="https://auth.example.com/introspect",
|
|
method="POST",
|
|
json={
|
|
"active": True,
|
|
"client_id": "user-1",
|
|
"scope": "read",
|
|
"exp": int(time.time()) + 3600,
|
|
},
|
|
)
|
|
|
|
verifier = IntrospectionTokenVerifier(
|
|
introspection_url="https://auth.example.com/introspect",
|
|
client_id="test",
|
|
client_secret="secret",
|
|
http_client=shared_client,
|
|
)
|
|
|
|
result = await verifier.verify_token("tok")
|
|
assert result is not None
|
|
assert result.client_id == "user-1"
|
|
|
|
async def test_client_not_closed_after_call(
|
|
self, shared_client: httpx.AsyncClient, httpx_mock: HTTPXMock
|
|
):
|
|
"""User-provided client must not be closed by the verifier."""
|
|
httpx_mock.add_response(
|
|
url="https://auth.example.com/introspect",
|
|
method="POST",
|
|
json={
|
|
"active": True,
|
|
"client_id": "user-1",
|
|
"scope": "read",
|
|
"exp": int(time.time()) + 3600,
|
|
},
|
|
)
|
|
|
|
verifier = IntrospectionTokenVerifier(
|
|
introspection_url="https://auth.example.com/introspect",
|
|
client_id="test",
|
|
client_secret="secret",
|
|
http_client=shared_client,
|
|
)
|
|
|
|
await verifier.verify_token("tok")
|
|
# Client should still be open — not closed by the verifier
|
|
assert not shared_client.is_closed
|
|
|
|
async def test_reuses_client_across_calls(
|
|
self, shared_client: httpx.AsyncClient, httpx_mock: HTTPXMock
|
|
):
|
|
"""Same client instance should be reused across multiple verify_token calls."""
|
|
for _ in range(3):
|
|
httpx_mock.add_response(
|
|
url="https://auth.example.com/introspect",
|
|
method="POST",
|
|
json={
|
|
"active": True,
|
|
"client_id": "user-1",
|
|
"scope": "read",
|
|
"exp": int(time.time()) + 3600,
|
|
},
|
|
)
|
|
|
|
verifier = IntrospectionTokenVerifier(
|
|
introspection_url="https://auth.example.com/introspect",
|
|
client_id="test",
|
|
client_secret="secret",
|
|
http_client=shared_client,
|
|
)
|
|
|
|
for _ in range(3):
|
|
result = await verifier.verify_token("tok")
|
|
assert result is not None
|
|
|
|
assert not shared_client.is_closed
|
|
|
|
|
|
class TestJWTVerifierHttpClient:
|
|
"""Test http_client parameter on JWTVerifier."""
|
|
|
|
@pytest.fixture(scope="class")
|
|
def rsa_key_pair(self) -> RSAKeyPair:
|
|
return RSAKeyPair.generate()
|
|
|
|
@pytest.fixture
|
|
def shared_client(self) -> httpx.AsyncClient:
|
|
return httpx.AsyncClient(timeout=30)
|
|
|
|
def test_stores_http_client(self, shared_client: httpx.AsyncClient):
|
|
verifier = JWTVerifier(
|
|
jwks_uri="https://auth.example.com/.well-known/jwks.json",
|
|
http_client=shared_client,
|
|
)
|
|
assert verifier._http_client is shared_client
|
|
|
|
def test_default_http_client_is_none(self):
|
|
verifier = JWTVerifier(
|
|
jwks_uri="https://auth.example.com/.well-known/jwks.json",
|
|
)
|
|
assert verifier._http_client is None
|
|
|
|
async def test_jwks_fetch_uses_provided_client(
|
|
self,
|
|
rsa_key_pair: RSAKeyPair,
|
|
shared_client: httpx.AsyncClient,
|
|
httpx_mock: HTTPXMock,
|
|
):
|
|
"""When http_client is provided, JWKS fetches should use it."""
|
|
from authlib.jose import JsonWebKey
|
|
|
|
# Build a JWKS response from the RSA key pair
|
|
public_key_obj = JsonWebKey.import_key(rsa_key_pair.public_key)
|
|
jwk_dict = dict(public_key_obj.as_dict())
|
|
jwk_dict["kid"] = "test-key-1"
|
|
jwk_dict["use"] = "sig"
|
|
jwk_dict["alg"] = "RS256"
|
|
|
|
httpx_mock.add_response(
|
|
url="https://auth.example.com/.well-known/jwks.json",
|
|
json={"keys": [jwk_dict]},
|
|
)
|
|
|
|
verifier = JWTVerifier(
|
|
jwks_uri="https://auth.example.com/.well-known/jwks.json",
|
|
issuer="https://auth.example.com",
|
|
http_client=shared_client,
|
|
)
|
|
|
|
token = rsa_key_pair.create_token(
|
|
issuer="https://auth.example.com",
|
|
kid="test-key-1",
|
|
)
|
|
|
|
result = await verifier.verify_token(token)
|
|
assert result is not None
|
|
assert not shared_client.is_closed
|
|
|
|
def test_ssrf_safe_rejects_http_client_with_jwks(
|
|
self,
|
|
shared_client: httpx.AsyncClient,
|
|
):
|
|
"""ssrf_safe=True and http_client cannot be used together with JWKS."""
|
|
with pytest.raises(ValueError, match="cannot be used with ssrf_safe=True"):
|
|
JWTVerifier(
|
|
jwks_uri="https://auth.example.com/.well-known/jwks.json",
|
|
ssrf_safe=True,
|
|
http_client=shared_client,
|
|
)
|
|
|
|
def test_ssrf_safe_allows_http_client_with_static_key(
|
|
self,
|
|
rsa_key_pair: RSAKeyPair,
|
|
shared_client: httpx.AsyncClient,
|
|
):
|
|
"""ssrf_safe with http_client is allowed when using static public_key (no HTTP)."""
|
|
# This should NOT raise — static key means no JWKS fetching
|
|
verifier = JWTVerifier(
|
|
public_key=rsa_key_pair.public_key,
|
|
ssrf_safe=True,
|
|
http_client=shared_client,
|
|
)
|
|
assert verifier._http_client is shared_client
|
|
assert verifier.ssrf_safe is True
|
|
|
|
|
|
class TestGitHubHttpClient:
|
|
"""Test http_client parameter on GitHubTokenVerifier."""
|
|
|
|
def test_stores_http_client(self):
|
|
from fastmcp.server.auth.providers.github import GitHubTokenVerifier
|
|
|
|
client = httpx.AsyncClient()
|
|
verifier = GitHubTokenVerifier(http_client=client)
|
|
assert verifier._http_client is client
|
|
|
|
async def test_uses_provided_client(self, httpx_mock: HTTPXMock):
|
|
from fastmcp.server.auth.providers.github import GitHubTokenVerifier
|
|
|
|
client = httpx.AsyncClient()
|
|
httpx_mock.add_response(
|
|
url="https://api.github.com/user",
|
|
json={"id": 123, "login": "testuser"},
|
|
)
|
|
httpx_mock.add_response(
|
|
url="https://api.github.com/user/repos",
|
|
headers={"x-oauth-scopes": "user,repo"},
|
|
json=[],
|
|
)
|
|
|
|
verifier = GitHubTokenVerifier(http_client=client)
|
|
result = await verifier.verify_token("ghp_test")
|
|
assert result is not None
|
|
assert not client.is_closed
|
|
|
|
|
|
class TestDiscordHttpClient:
|
|
"""Test http_client parameter on DiscordTokenVerifier."""
|
|
|
|
def test_stores_http_client(self):
|
|
from fastmcp.server.auth.providers.discord import DiscordTokenVerifier
|
|
|
|
client = httpx.AsyncClient()
|
|
verifier = DiscordTokenVerifier(
|
|
expected_client_id="test-client-id",
|
|
http_client=client,
|
|
)
|
|
assert verifier._http_client is client
|
|
|
|
|
|
class TestGoogleHttpClient:
|
|
"""Test http_client parameter on GoogleTokenVerifier."""
|
|
|
|
def test_stores_http_client(self):
|
|
from fastmcp.server.auth.providers.google import GoogleTokenVerifier
|
|
|
|
client = httpx.AsyncClient()
|
|
verifier = GoogleTokenVerifier(http_client=client)
|
|
assert verifier._http_client is client
|
|
|
|
|
|
class TestWorkOSHttpClient:
|
|
"""Test http_client parameter on WorkOSTokenVerifier."""
|
|
|
|
def test_stores_http_client(self):
|
|
from fastmcp.server.auth.providers.workos import WorkOSTokenVerifier
|
|
|
|
client = httpx.AsyncClient()
|
|
verifier = WorkOSTokenVerifier(
|
|
authkit_domain="https://test.authkit.app",
|
|
http_client=client,
|
|
)
|
|
assert verifier._http_client is client
|
|
|
|
|
|
class TestProviderHttpClientPassthrough:
|
|
"""Test that convenience providers pass http_client to their verifiers."""
|
|
|
|
def test_github_provider_threads_http_client(self):
|
|
from fastmcp.server.auth.providers.github import (
|
|
GitHubProvider,
|
|
GitHubTokenVerifier,
|
|
)
|
|
|
|
client = httpx.AsyncClient()
|
|
provider = GitHubProvider(
|
|
client_id="test",
|
|
client_secret="secret",
|
|
base_url="https://example.com",
|
|
http_client=client,
|
|
)
|
|
# OAuthProxy stores token verifier as _token_validator
|
|
verifier = provider._token_validator
|
|
assert isinstance(verifier, GitHubTokenVerifier)
|
|
assert verifier._http_client is client
|
|
|
|
def test_discord_provider_threads_http_client(self):
|
|
from fastmcp.server.auth.providers.discord import (
|
|
DiscordProvider,
|
|
DiscordTokenVerifier,
|
|
)
|
|
|
|
client = httpx.AsyncClient()
|
|
provider = DiscordProvider(
|
|
client_id="test",
|
|
client_secret="secret",
|
|
base_url="https://example.com",
|
|
http_client=client,
|
|
)
|
|
verifier = provider._token_validator
|
|
assert isinstance(verifier, DiscordTokenVerifier)
|
|
assert verifier._http_client is client
|
|
|
|
def test_google_provider_threads_http_client(self):
|
|
from fastmcp.server.auth.providers.google import (
|
|
GoogleProvider,
|
|
GoogleTokenVerifier,
|
|
)
|
|
|
|
client = httpx.AsyncClient()
|
|
provider = GoogleProvider(
|
|
client_id="test",
|
|
client_secret="secret",
|
|
base_url="https://example.com",
|
|
http_client=client,
|
|
)
|
|
verifier = provider._token_validator
|
|
assert isinstance(verifier, GoogleTokenVerifier)
|
|
assert verifier._http_client is client
|
|
|
|
def test_workos_provider_threads_http_client(self):
|
|
from fastmcp.server.auth.providers.workos import (
|
|
WorkOSProvider,
|
|
WorkOSTokenVerifier,
|
|
)
|
|
|
|
client = httpx.AsyncClient()
|
|
provider = WorkOSProvider(
|
|
client_id="test",
|
|
client_secret="secret",
|
|
authkit_domain="https://test.authkit.app",
|
|
base_url="https://example.com",
|
|
http_client=client,
|
|
)
|
|
verifier = provider._token_validator
|
|
assert isinstance(verifier, WorkOSTokenVerifier)
|
|
assert verifier._http_client is client
|
|
|
|
def test_azure_provider_threads_http_client(self):
|
|
from fastmcp.server.auth.providers.azure import AzureProvider
|
|
from fastmcp.server.auth.providers.jwt import JWTVerifier
|
|
|
|
client = httpx.AsyncClient()
|
|
provider = AzureProvider(
|
|
client_id="test-client-id",
|
|
client_secret="secret",
|
|
tenant_id="test-tenant-id",
|
|
required_scopes=["read"],
|
|
base_url="https://example.com",
|
|
http_client=client,
|
|
)
|
|
verifier = provider._token_validator
|
|
assert isinstance(verifier, JWTVerifier)
|
|
assert verifier._http_client is client
|