π The fast, Pythonic way to build MCP servers and clients.
Use a monotonic clock in the rate limiters (#5689)
Asem ahmedd93e4c1e30a0
diff --git a/fastmcp_slim/fastmcp/server/middleware/rate_limiting.py b/fastmcp_slim/fastmcp/server/middleware/rate_limiting.pyindex 720101370..4b73e8e6e 100644--- a/fastmcp_slim/fastmcp/server/middleware/rate_limiting.py+++ b/fastmcp_slim/fastmcp/server/middleware/rate_limiting.py@@ -35,7 +35,7 @@ class TokenBucketRateLimiter:self.capacity = capacityself.refill_rate = refill_rateself.tokens = capacity- self.last_refill = time.time()+ self.last_refill = time.monotonic()self._lock = anyio.Lock()async def consume(self, tokens: int = 1) -> bool:@@ -48,7 +48,7 @@ class TokenBucketRateLimiter:True if tokens were available and consumed, False otherwise"""async with self._lock:- now = time.time()+ now = time.monotonic()elapsed = now - self.last_refill# Add tokens based on elapsed time@@ -79,7 +79,7 @@ class SlidingWindowRateLimiter:async def is_allowed(self) -> bool:"""Check if a request is allowed."""async with self._lock:- now = time.time()+ now = time.monotonic()cutoff = now - self.window_seconds# Remove old requests outside the windowdiff --git a/tests/server/middleware/test_rate_limiting.py b/tests/server/middleware/test_rate_limiting.pyindex 7d8bd4432..59f4e6a50 100644--- a/tests/server/middleware/test_rate_limiting.py+++ b/tests/server/middleware/test_rate_limiting.py@@ -2,6 +2,7 @@import asyncioimport warnings+from types import SimpleNamespacefrom unittest.mock import AsyncMock, MagicMockimport pytest@@ -65,8 +66,8 @@ class TestTokenBucketRateLimiter:"""Test token refill over time."""current_time = 0.0monkeypatch.setattr(- "fastmcp.server.middleware.rate_limiting.time.time",- lambda: current_time,+ "fastmcp.server.middleware.rate_limiting.time",+ SimpleNamespace(monotonic=lambda: current_time),)limiter = TokenBucketRateLimiter(@@ -83,6 +84,20 @@ class TestTokenBucketRateLimiter:current_time += 0.25assert await limiter.consume(2) is True+ async def test_wall_clock_step_back_does_not_drain_tokens(self, monkeypatch):+ """A backwards step of the wall clock (an NTP correction, say) is not+ negative elapsed time."""+ wall_time = 1_000_000.0+ monkeypatch.setattr(+ "fastmcp.server.middleware.rate_limiting.time",+ SimpleNamespace(time=lambda: wall_time, monotonic=lambda: 0.0),+ )++ limiter = TokenBucketRateLimiter(capacity=5, refill_rate=1.0)++ wall_time -= 3600+ assert await limiter.consume(1) is True+async def test_denied_consumes_do_not_freeze_clock(self, monkeypatch):"""Regression for #4056: a client that retries quickly after beingdenied must not be able to bypass the configured refill rate.@@ -93,8 +108,8 @@ class TestTokenBucketRateLimiter:"""current_time = 0.0monkeypatch.setattr(- "fastmcp.server.middleware.rate_limiting.time.time",- lambda: current_time,+ "fastmcp.server.middleware.rate_limiting.time",+ SimpleNamespace(monotonic=lambda: current_time),)limiter = TokenBucketRateLimiter(capacity=10, refill_rate=10.0)@@ -150,8 +165,8 @@ class TestSlidingWindowRateLimiter:"""Test sliding window behavior."""current_time = 0.0monkeypatch.setattr(- "fastmcp.server.middleware.rate_limiting.time.time",- lambda: current_time,+ "fastmcp.server.middleware.rate_limiting.time",+ SimpleNamespace(monotonic=lambda: current_time),)limiter = SlidingWindowRateLimiter(max_requests=2, window_seconds=1)@@ -167,6 +182,24 @@ class TestSlidingWindowRateLimiter:# Should be able to make requests againassert await limiter.is_allowed() is True+ async def test_wall_clock_step_back_does_not_extend_window(self, monkeypatch):+ """A backwards step of the wall clock must not keep old requests inside+ the window."""+ wall_time = 1_000_000.0+ monotonic_time = 0.0+ monkeypatch.setattr(+ "fastmcp.server.middleware.rate_limiting.time",+ SimpleNamespace(time=lambda: wall_time, monotonic=lambda: monotonic_time),+ )++ limiter = SlidingWindowRateLimiter(max_requests=1, window_seconds=60)+ assert await limiter.is_allowed() is True+ assert await limiter.is_allowed() is False++ wall_time -= 3600+ monotonic_time += 61+ assert await limiter.is_allowed() is True+class TestRateLimitingMiddleware:"""Test rate limiting middleware."""@@ -281,8 +314,8 @@ class TestRateLimitingMiddleware:):current_time = 0.0monkeypatch.setattr(- "fastmcp.server.middleware.rate_limiting.time.time",- lambda: current_time,+ "fastmcp.server.middleware.rate_limiting.time",+ SimpleNamespace(monotonic=lambda: current_time),)middleware = RateLimitingMiddleware(max_requests_per_second=0.4, global_limit=global_limit