Implement option of whitelisting IPs (#265)

Bug: T204955 Change-Id: Id86539282d2b1306f65f5981d1d416aa16f30cd7
wikimedia · Sep 21, 2018 · 0ee85a3 · 0ee85a3
1 parent eab8437
commit 0ee85a3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ores/scoring_systems/scoring_system.py b/ores/scoring_systems/scoring_system.py
@@ -20,7 +20,8 @@ class ScoringSystem(dict):
 
     def __init__(self, context_map, score_cache=None,
                        metrics_collector=None, timeout=None, lock_manager=None,
-                       connections_per_ip=4, connections_per_ip_hard=7):
+                       connections_per_ip=4, connections_per_ip_hard=7,
+                       whitelisted_ips=[]):
         super().__init__()
         self.update(context_map)
         self.score_cache = score_cache or Empty()
@@ -29,6 +30,7 @@ def __init__(self, context_map, score_cache=None,
         self.connections_per_ip = connections_per_ip
         self.connections_per_ip_hard = connections_per_ip_hard
         self.lock_manager = lock_manager
+        self.whitelisted_ips = whitelisted_ips
 
     def check_context_models(self, request):
 
@@ -45,7 +47,8 @@ def score(self, request):
         locked = None
         start = time.time()
         if request.ip and (not request.precache) and \
-                self.lock_manager is not None:
+                self.lock_manager is not None and \
+                request.ip not in self.whitelisted_ips:
             locked = self._lock_ip(request.ip)
             self.metrics_collector.lock_acquired(
                 'poolcounter',
@@ -309,11 +312,13 @@ def _kwargs_from_config(cls, config, name, section_key="scoring_systems"):
         timeout = section.get('timeout')
         connections_per_ip = section.get('connections_per_ip', 4)
         connections_per_ip_hard = section.get('connections_per_ip', 7)
+        whitelisted_ips = section.get('whitelisted_ips', [])
 
         return {'context_map': context_map, 'score_cache': score_cache,
                 'metrics_collector': metrics_collector, 'timeout': timeout,
                 'connections_per_ip': connections_per_ip,
                 'connections_per_ip_hard': connections_per_ip_hard,
+                'whitelisted_ips': whitelisted_ips,
                 'lock_manager': pool_counter}
 
     @classmethod