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

Preserve current default behavior.

Browse Source
This commit is contained in:
kahnjw 2013-12-05 11:32:56 -08:00
parent 900cb676e5
commit 7019236980
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/throttling.py
View File

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