Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: resolve issue #188 by handling rate limit exceptions correctly #220

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ The tests show a lot of different use cases that are not all covered here.

```python
from starlette.applications import Starlette
from slowapi import Limiter, _rate_limit_exceeded_handler
from slowapi import Limiter, rate_limit_exceeded_handler
from slowapi.util import get_remote_address
from slowapi.middleware import SlowAPIMiddleware
from slowapi.errors import RateLimitExceeded

limiter = Limiter(key_func=get_remote_address, default_limits=["1/minute"])
app = Starlette()
app.state.limiter = limiter
app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
app.add_exception_handler(RateLimitExceeded, rate_limit_exceeded_handler)
app.add_middleware(SlowAPIMiddleware)

# this will be limited by the default_limits
Expand Down
8 changes: 4 additions & 4 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ $ pip install slowapi
from starlette.applications import Starlette
from starlette.responses import PlainTextResponse
from starlette.requests import Request
from slowapi import Limiter, _rate_limit_exceeded_handler
from slowapi import Limiter, rate_limit_exceeded_handler
from slowapi.util import get_remote_address
from slowapi.errors import RateLimitExceeded

limiter = Limiter(key_func=get_remote_address)
app = Starlette()
app.state.limiter = limiter
app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
app.add_exception_handler(RateLimitExceeded, rate_limit_exceeded_handler)

@limiter.limit("5/minute")
async def homepage(request: Request):
Expand All @@ -42,14 +42,14 @@ The above app will have a route `t1` that will accept up to 5 requests per minut

```python
from fastapi import FastAPI, Request, Response
from slowapi import Limiter, _rate_limit_exceeded_handler
from slowapi import Limiter, rate_limit_exceeded_handler
from slowapi.util import get_remote_address
from slowapi.errors import RateLimitExceeded

limiter = Limiter(key_func=get_remote_address)
app = FastAPI()
app.state.limiter = limiter
app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
app.add_exception_handler(RateLimitExceeded, rate_limit_exceeded_handler)

# Note: the route decorator must be above the limit decorator, not below it
@app.get("/home")
Expand Down
8 changes: 6 additions & 2 deletions slowapi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
from .extension import Limiter, _rate_limit_exceeded_handler
from .extension import (
Limiter,
rate_limit_exceeded_handler,
_rate_limit_exceeded_handler,
)

__all__ = ["Limiter", "_rate_limit_exceeded_handler"]
__all__ = ["Limiter", "rate_limit_exceeded_handler", "_rate_limit_exceeded_handler"]
9 changes: 9 additions & 0 deletions slowapi/extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@ def _rate_limit_exceeded_handler(request: Request, exc: RateLimitExceeded) -> Re
return response


def rate_limit_exceeded_handler(request: Request, exc: Exception) -> Response:
"""
Handle rate limit exceeded exceptions.
"""
if isinstance(exc, RateLimitExceeded):
return _rate_limit_exceeded_handler(request, exc)
raise exc


class Limiter:
"""
Initializes the slowapi rate limiter.
Expand Down