Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

Keep the JWKS refresh lock clear of subclass attributes (#5770)

nate nowack307aa565c39e
diff --git a/fastmcp_slim/fastmcp/server/auth/providers/jwt.py b/fastmcp_slim/fastmcp/server/auth/providers/jwt.py
index 5370811e7..8ecda8ad2 100644
--- a/fastmcp_slim/fastmcp/server/auth/providers/jwt.py
+++ b/fastmcp_slim/fastmcp/server/auth/providers/jwt.py
@@ -339,7 +339,7 @@ class JWTVerifier(TokenVerifier):
self._cache_ttl = 3600 # 1 hour
self._jwks_refresh_interval = jwks_refresh_interval
self._jwks_last_refresh_attempt: float | None = None
- self._jwks_refresh_lock = anyio.Lock()
+ self._shared_jwks_refresh_lock = anyio.Lock()
async def _get_verification_key(self, token: str) -> str | bytes:
"""Get the verification key for the token."""
@@ -370,7 +370,7 @@ class JWTVerifier(TokenVerifier):
# If no kid but only one key cached, use it
return next(iter(self._jwks_cache.values()))
- async with self._jwks_refresh_lock:
+ async with self._shared_jwks_refresh_lock:
current_time = time.monotonic()
fresh = current_time - self._jwks_cache_time < self._cache_ttl
if fresh:
diff --git a/tests/server/auth/test_jwks_refresh.py b/tests/server/auth/test_jwks_refresh.py
index f8fb605a8..400191d20 100644
--- a/tests/server/auth/test_jwks_refresh.py
+++ b/tests/server/auth/test_jwks_refresh.py
@@ -222,3 +222,25 @@ async def test_failed_refresh_does_not_reuse_expired_keys(
clock[0] += 31
assert await verifier._get_jwks_key("current") == original
assert len(requests) == 3
+
+
+async def test_subclass_lock_around_inherited_lookup_does_not_deadlock(
+ key_data: dict[str, Any],
+):
+ class LockingVerifier(JWTVerifier):
+ def __init__(self, **kwargs: Any):
+ super().__init__(**kwargs)
+ self._jwks_refresh_lock = asyncio.Lock()
+
+ async def _get_jwks_key(self, kid: str | None) -> str:
+ async with self._jwks_refresh_lock:
+ return await super()._get_jwks_key(kid)
+
+ async def respond(request: httpx2.Request) -> httpx2.Response:
+ return httpx2.Response(200, json={"keys": [key_data]})
+
+ async with httpx2.AsyncClient(transport=httpx2.MockTransport(respond)) as client:
+ verifier = LockingVerifier(
+ jwks_uri="https://issuer.example/keys", http_client=client
+ )
+ assert await asyncio.wait_for(verifier._get_jwks_key("current"), 1)