paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

decorators: Extract rate_limit_request_by_ip function.

Browse Source
This commit is contained in:
Mateusz Mandera
2021-07-19 20:28:37 +02:00
committed by Tim Abbott
parent 119f1da04a
commit 4418aefde4
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/decorator.py
View File

@@ -862,6 +862,15 @@ def rate_limit_ip(request: HttpRequest, ip_addr: str, domain: str) -> None:
RateLimitedIPAddr(ip_addr, domain=domain).rate_limit_request(request) RateLimitedIPAddr(ip_addr, domain=domain).rate_limit_request(request)
def rate_limit_request_by_ip(request: HttpRequest, domain: str) -> None:
# REMOTE_ADDR is set by SetRemoteAddrFromRealIpHeader in conjunction
# with the nginx configuration to guarantee this to be *the* correct
# IP address to use - without worrying we'll grab the IP of a proxy.
ip_addr = request.META["REMOTE_ADDR"]
assert ip_addr
rate_limit_ip(request, ip_addr, domain=domain)
def rate_limit_remote_server( def rate_limit_remote_server(
request: HttpRequest, remote_server: "RemoteZulipServer", domain: str request: HttpRequest, remote_server: "RemoteZulipServer", domain: str
) -> None: ) -> None:
@@ -893,12 +902,7 @@ def rate_limit() -> Callable[[ViewFuncT], ViewFuncT]:
user = request.user user = request.user
if isinstance(user, AnonymousUser): if isinstance(user, AnonymousUser):
# REMOTE_ADDR is set by SetRemoteAddrFromRealIpHeader in conjunction rate_limit_request_by_ip(request, domain="api_by_ip")
# with the nginx configuration to guarantee this to be *the* correct
# IP address to use - without worrying we'll grab the IP of a proxy.
ip_addr = request.META["REMOTE_ADDR"]
assert ip_addr
rate_limit_ip(request, ip_addr, domain="api_by_ip")
return func(request, *args, **kwargs) return func(request, *args, **kwargs)
elif settings.ZILENCER_ENABLED and isinstance(user, RemoteZulipServer): elif settings.ZILENCER_ENABLED and isinstance(user, RemoteZulipServer):
rate_limit_remote_server(request, user, domain="api_by_remote_server") rate_limit_remote_server(request, user, domain="api_by_remote_server")