From f2544ff8ec71b2959a4106d0f6b68cb0560b1df5 Mon Sep 17 00:00:00 2001
From: Dean Liu <dliu@lyft.com>
Date: Fri, 26 Oct 2018 18:07:36 -0700
Subject: [PATCH 1/2] Support pagination of get_users

---
 securitybot/chat/slack.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/securitybot/chat/slack.py b/securitybot/chat/slack.py
index 6d9510c..2d6812a 100644
--- a/securitybot/chat/slack.py
+++ b/securitybot/chat/slack.py
@@ -7,6 +7,7 @@
 import logging
 from slackclient import SlackClient
 import json
+import time
 
 from securitybot.user import User
 from securitybot.chat.chat import Chat, ChatException
@@ -84,7 +85,22 @@ def get_users(self):
                     }
             }
         '''
-        return self._api_call('users.list')['members']
+        members = []
+        next_cursor = None
+        while True:
+            response = self._api_call('users.list', cursor=next_cursor)
+            if response.get('error', '').lower() == 'ratelimited':
+                logging.debug('Hit rate limiting on users.list.  Sleeping 10s and trying again.')
+                time.sleep(10)
+            else:
+                active_members = [m for m in response['members'] if m.get('deleted') is False]
+                members.extend(active_members)
+                logging.debug('Fetched {} members', len(members))
+                next_cursor = response['response_metadata'].get('next_cursor')
+                if not next_cursor:
+                    break
+
+        return members
 
     def get_messages(self):
         # type () -> List[Dict[str, Any]]

From 8ad830f499653882cb56095cf562add4825522dc Mon Sep 17 00:00:00 2001
From: Dean Liu <dliu@lyft.com>
Date: Thu, 1 Nov 2018 08:57:26 -0700
Subject: [PATCH 2/2] Support pagination of get_users and add retries if rate
 limited

---
 securitybot/chat/slack.py | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/securitybot/chat/slack.py b/securitybot/chat/slack.py
index 2d6812a..1b9eaef 100644
--- a/securitybot/chat/slack.py
+++ b/securitybot/chat/slack.py
@@ -14,6 +14,9 @@
 
 from typing import Any, Dict, List
 
+RATE_LIMIT_SLEEP = 10 # sleep 10 seconds when rate limit
+RATE_LIMIT_TRIES = 6  # maximum 6 tries (60s) when rate limit reached
+
 class Slack(Chat):
     '''
     A wrapper around the Slack API designed for Securitybot.
@@ -38,7 +41,7 @@ def _validate(self):
             raise ChatException('Unable to connect to Slack API.')
         logging.info('Connection to Slack API successful!')
 
-    def _api_call(self, method, **kwargs):
+    def _api_call(self, method, rate_limit_retry=False, **kwargs):
         # type: (str, **Any) -> Dict[str, Any]
         '''
         Performs a _validated_ Slack API call. After performing a normal API
@@ -51,7 +54,19 @@ def _api_call(self, method, **kwargs):
         Returns:
             (dict): Parsed JSON from the response.
         '''
-        response = self._slack.api_call(method, **kwargs)
+        cur_try = 0
+        while True:
+            response = self._slack.api_call(method, **kwargs)
+            if cur_try > RATE_LIMIT_TRIES:
+                raise ChatException('Slack rate limit max tries reached.')
+
+            if response.get('error', '').lower() == 'ratelimited' and rate_limit_retry:
+                logging.debug('Rate limiting reached.  Sleeping {}.'.format(RATE_LIMIT_SLEEP))
+                cur_try += 1
+                time.sleep(RATE_LIMIT_SLEEP)
+            else:
+                break
+
         if not ('ok' in response and response['ok']):
             if kwargs:
                 logging.error('Bad Slack API request on {} with {}'.format(method, kwargs))
@@ -88,17 +103,15 @@ def get_users(self):
         members = []
         next_cursor = None
         while True:
-            response = self._api_call('users.list', cursor=next_cursor)
-            if response.get('error', '').lower() == 'ratelimited':
-                logging.debug('Hit rate limiting on users.list.  Sleeping 10s and trying again.')
-                time.sleep(10)
-            else:
-                active_members = [m for m in response['members'] if m.get('deleted') is False]
-                members.extend(active_members)
-                logging.debug('Fetched {} members', len(members))
-                next_cursor = response['response_metadata'].get('next_cursor')
-                if not next_cursor:
-                    break
+            response = self._api_call('users.list', rate_limit_retry=True, cursor=next_cursor)
+            active_members = [m for m in response['members'] if not m.get('deleted')]
+            members.extend(active_members)
+            logging.debug('Fetched {} members'.format(len(members)))
+
+            metadata = response.get('response_metadata')
+            next_cursor = metadata.get('next_cursor') if metadata else None
+            if not metadata or not metadata.get('next_cursor'):
+                break
 
         return members