From 89f26c5e040febd27bc9142b0096ca119bb3fa32 Mon Sep 17 00:00:00 2001
From: kahnjw
Date: Fri, 6 Dec 2013 14:21:52 -0800
Subject: Add get_ident method to pass new tests.

---
 rest_framework/throttling.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'rest_framework/throttling.py')

diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index a946d837..60e46d47 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -18,6 +18,21 @@ class BaseThrottle(object):
         """
         raise NotImplementedError('.allow_request() must be overridden')
 
+    def get_ident(self, request):
+        """
+        Identify the machine making the request by parsing HTTP_X_FORWARDED_FOR
+        if present and number of proxies is > 0. If not use all of
+        HTTP_X_FORWARDED_FOR if it is available, if not use REMOTE_ADDR.
+        """
+        xff = request.META.get('HTTP_X_FORWARDED_FOR')
+        remote_addr = request.META.get('REMOTE_ADDR')
+        num_proxies = api_settings.NUM_PROXIES
+
+        if xff and num_proxies:
+            return xff.split(',')[-min(num_proxies, len(xff))].strip()
+
+        return xff if xff else remote_addr
+
     def wait(self):
         """
         Optionally, return a recommended number of seconds to wait before
@@ -152,13 +167,9 @@ class AnonRateThrottle(SimpleRateThrottle):
         if request.user.is_authenticated():
             return None  # Only throttle unauthenticated requests.
 
-        ident = request.META.get('HTTP_X_FORWARDED_FOR')
-        if ident is None:
-            ident = request.META.get('REMOTE_ADDR')
-
         return self.cache_format % {
             'scope': self.scope,
-            'ident': ident
+            'ident': self.get_ident(request)
         }
 
 
@@ -176,7 +187,7 @@ class UserRateThrottle(SimpleRateThrottle):
         if request.user.is_authenticated():
             ident = request.user.id
         else:
-            ident = request.META.get('REMOTE_ADDR', None)
+            ident = self.get_ident(request)
 
         return self.cache_format % {
             'scope': self.scope,
@@ -224,7 +235,7 @@ class ScopedRateThrottle(SimpleRateThrottle):
         if request.user.is_authenticated():
             ident = request.user.id
         else:
-            ident = request.META.get('REMOTE_ADDR', None)
+            ident = self.get_ident(request)
 
         return self.cache_format % {
             'scope': self.scope,
-- 
cgit v1.2.3


From 83da4949c099fcf7e7636c98b9052b502e1bf74b Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 13 Dec 2013 00:02:18 +0000
Subject: Allow NUM_PROXIES=0 and include more docs

---
 rest_framework/throttling.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'rest_framework/throttling.py')

diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index 60e46d47..c40f3065 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -28,8 +28,12 @@ class BaseThrottle(object):
         remote_addr = request.META.get('REMOTE_ADDR')
         num_proxies = api_settings.NUM_PROXIES
 
-        if xff and num_proxies:
-            return xff.split(',')[-min(num_proxies, len(xff))].strip()
+        if num_proxies is not None:
+            if num_proxies == 0 or xff is None:
+                return remote_addr
+            addrs = xff.split(',')
+            client_addr = addrs[-min(num_proxies, len(xff))]
+            return client_addr.strip()
 
         return xff if xff else remote_addr
 
-- 
cgit v1.2.3


From d18d32669ac47178f26409f149160dc2c0c5359c Mon Sep 17 00:00:00 2001
From: tuky
Date: Wed, 12 Feb 2014 18:11:18 +0100
Subject: remove spaces from META['HTTP_X_FORWARDED_FOR'] as throttle key

memcached cannot handle spaces in keys---
 rest_framework/throttling.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'rest_framework/throttling.py')

diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index a946d837..56023bda 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -155,6 +155,8 @@ class AnonRateThrottle(SimpleRateThrottle):
         ident = request.META.get('HTTP_X_FORWARDED_FOR')
         if ident is None:
             ident = request.META.get('REMOTE_ADDR')
+        else:
+            ident = u''.join(ident.split())
 
         return self.cache_format % {
             'scope': self.scope,
-- 
cgit v1.2.3


From 5e4336845fed97a819e69669ed7aa3b9bf443edb Mon Sep 17 00:00:00 2001
From: tuky
Date: Fri, 14 Feb 2014 13:47:17 +0100
Subject: Update throttling.py

python 3 u'' gone---
 rest_framework/throttling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/throttling.py')

diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index 56023bda..c36b58bf 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -156,7 +156,7 @@ class AnonRateThrottle(SimpleRateThrottle):
         if ident is None:
             ident = request.META.get('REMOTE_ADDR')
         else:
-            ident = u''.join(ident.split())
+            ident = ''.join(ident.split())
 
         return self.cache_format % {
             'scope': self.scope,
-- 
cgit v1.2.3


From 59b47eac14778767a17e56bd8adc0610417f2878 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 20 Aug 2014 12:32:24 +0100
Subject: Fix cache_throttle typo

---
 rest_framework/throttling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/throttling.py')

diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index 7e9f9d71..361dbddf 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -60,7 +60,7 @@ class SimpleRateThrottle(BaseThrottle):
 
     cache = default_cache
     timer = time.time
-    cache_format = 'throtte_%(scope)s_%(ident)s'
+    cache_format = 'throttle_%(scope)s_%(ident)s'
     scope = None
     THROTTLE_RATES = api_settings.DEFAULT_THROTTLE_RATES
 
-- 
cgit v1.2.3