encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-03 12:00:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove default_to arg and use X_FORWARDED_FOR & fallback to REMOTE_ADDR

Browse Source
This commit is contained in:
kahnjw 2013-12-06 13:51:30 -08:00
parent 7019236980
commit f0ee72f578
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rest_framework/throttling.py
View File

@ -18,21 +18,20 @@ class BaseThrottle(object):
""" """
raise NotImplementedError('.allow_request() must be overridden') raise NotImplementedError('.allow_request() must be overridden')
def get_ident(self, request, default_to=None): def get_ident(self, request):
""" """
Identify the machine making the request using HTTP_X_FORWARDED_FOR if Identify the machine making the request by parsing HTTP_X_FORWARDED_FOR
present and number of proxies is > 0. If not use default if it is set if present and number of proxies is > 0. If not use all of
and available, if not fall back to REMOTE_ADDR. HTTP_X_FORWARDED_FOR if it is available, if not use REMOTE_ADDR.
""" """
default = request.META.get(default_to) xff = request.META.get('HTTP_X_FORWARDED_FOR')
remote_addr = request.META.get('REMOTE_ADDR')
num_proxies = api_settings.NUM_PROXIES num_proxies = api_settings.NUM_PROXIES
if 'HTTP_X_FORWARDED_FOR' in request.META and num_proxies: if xff and num_proxies:
xff = request.META.get('HTTP_X_FORWARDED_FOR')
return xff.split(',')[-min(num_proxies, len(xff))].strip() return xff.split(',')[-min(num_proxies, len(xff))].strip()
return default if default else request.META.get('REMOTE_ADDR') return xff if xff else remote_addr
def wait(self): def wait(self):
""" """
@ -168,7 +167,7 @@ class AnonRateThrottle(SimpleRateThrottle):
if request.user.is_authenticated(): if request.user.is_authenticated():
return None # Only throttle unauthenticated requests. return None # Only throttle unauthenticated requests.
ident = self.get_ident(request, default_to='HTTP_X_FORWARDED_FOR') ident = self.get_ident(request)
return self.cache_format % { return self.cache_format % {
'scope': self.scope, 'scope': self.scope,