From 79e86471e74ab1191b8bbfde87b632d0baaffb6a Mon Sep 17 00:00:00 2001 From: Zixuan James Li Date: Sat, 13 Aug 2022 19:06:09 -0400 Subject: [PATCH] rate_limit: Extract should_rate_limit from rate_limit. This allows us to reapply this check for other rate limiting functions. Signed-off-by: Zixuan James Li --- zerver/lib/rate_limiter.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/zerver/lib/rate_limiter.py b/zerver/lib/rate_limiter.py index 3ddf7ef741..81e4b24e54 100644 --- a/zerver/lib/rate_limiter.py +++ b/zerver/lib/rate_limiter.py @@ -632,11 +632,18 @@ def rate_limit_remote_server( raise e -def rate_limit(request: HttpRequest) -> None: +def should_rate_limit(request: HttpRequest) -> bool: if not settings.RATE_LIMITING: - return + return False if client_is_exempt_from_rate_limiting(request): + return False + + return True + + +def rate_limit(request: HttpRequest) -> None: + if not should_rate_limit(request): return from zerver.lib.request import RequestNotes