replace inline checks with decorator

.travis.yml

@@ -3,7 +3,6 @@ sudo: required
 language: python
 
 python:
-  - "3.5"
   - "3.6"
 
 install:

Dockerfile

@@ -1,17 +1,19 @@
 FROM ubuntu:xenial
 
 # Mostly Mike Grima: [email protected]
-MAINTAINER NetflixOSS <[email protected]>
-
-# Install the Python RTM bot itself:
-ARG RTM_VERSION
-ADD python-rtmbot-${RTM_VERSION}.tar.gz /
+LABEL maintainer="[email protected]"
 
 RUN \
   # Install Python:
   apt-get update && \
   apt-get upgrade -y && \
-  apt-get install python3 python3-venv nano -y
+  apt-get install python3 python3-venv nano curl -y
+
+# Install the Python RTM bot itself:
+ARG RTM_VERSION="0.4.0"
+ARG RTM_PATH="python-rtmbot-${RTM_VERSION}"
+RUN curl -L https://github.com/slackhq/python-rtmbot/archive/${RTM_VERSION}.tar.gz > /${RTM_PATH}.tar.gz && tar xvzf python-rtmbot-0.4.0.tar.gz
+
 
 # Add all the other stuff to the plugins:
 COPY / /python-rtmbot-${RTM_VERSION}/hubcommander
@@ -20,19 +22,16 @@ COPY / /python-rtmbot-${RTM_VERSION}/hubcommander
 RUN \
   # Rename the rtmbot:
   mv /python-rtmbot-${RTM_VERSION} /rtmbot && \
-
   # Set up the VENV:
   pyvenv /venv && \
-
   # Install all the deps:
   /bin/bash -c "source /venv/bin/activate && pip install --upgrade pip" && \
   /bin/bash -c "source /venv/bin/activate && pip install --upgrade setuptools" && \
   /bin/bash -c "source /venv/bin/activate && pip install wheel" && \
   /bin/bash -c "source /venv/bin/activate && pip install /rtmbot/hubcommander" && \
-
   # The launcher script:
   mv /rtmbot/hubcommander/launch_in_docker.sh / && chmod +x /launch_in_docker.sh && \
-  rm /rtmbot/hubcommander/python-rtmbot-${RTM_VERSION}.tar.gz
+  rm /python-rtmbot-${RTM_VERSION}.tar.gz
 
 # DEFINE YOUR ENV VARS FOR SECRETS HERE:
 ENV SLACK_TOKEN="REPLACEMEINCMDLINE" \

auth_plugins/duo/plugin.py

@@ -30,35 +30,46 @@ class DuoPlugin(BotAuthPlugin):
     def __init__(self):
         super().__init__()
 
-        self.client = None
+        self.clients = {}
 
     def setup(self, secrets, **kwargs):
-        if not secrets.get("DUO_IKEY") or not secrets.get("DUO_SKEY") or not secrets.get("DUO_HOST"):
-            raise NoSecretsProvidedError("Must provide secrets to enable authentication.")
+        for variable, secret in secrets.items():
+            if "DUO_" in variable:
+                domain, host, ikey, skey = secret.split(",")
+                self.clients[domain] = Client(ikey, skey, host)
 
-        self.client = Client(secrets["DUO_IKEY"], secrets["DUO_SKEY"], secrets["DUO_HOST"])
+        if not len(self.clients):
+            raise NoSecretsProvidedError("Must provide secrets to enable authentication.")
 
     def authenticate(self, data, user_data, **kwargs):
+        # Which domain does this user belong to?
+        domain = user_data["profile"]["email"].split("@")[1]
+        if not self.clients.get(domain):
+            send_error(data["channel"], "💀 @{}: Duo in this bot is not configured for the domain: `{}`. It needs "
+                                        "to be configured for you to run this command."
+                       .format(user_data["name"], domain), markdown=True, thread=data["ts"])
+            return False
+
         send_info(data["channel"], "🎟 @{}: Sending a Duo notification to your device. You must approve!"
                   .format(user_data["name"]), markdown=True, ephemeral_user=user_data["id"])
 
         try:
-            result = self._perform_auth(user_data)
+            result = self._perform_auth(user_data, self.clients[domain])
         except InvalidDuoResponseError as idre:
             send_error(data["channel"], "💀 @{}: There was a problem communicating with Duo. Got this status: {}. "
                                         "Aborting..."
-                       .format(user_data["name"], str(idre)), markdown=True)
+                       .format(user_data["name"], str(idre)), thread=data["ts"], markdown=True)
             return False
 
         except CantDuoUserError as _:
             send_error(data["channel"], "💀 @{}: I can't Duo authenticate you. Please consult with your identity team."
                                         " Aborting..."
-                       .format(user_data["name"]), markdown=True)
+                       .format(user_data["name"]), thread=data["ts"], markdown=True)
             return False
 
         except Exception as e:
             send_error(data["channel"], "💀 @{}: I encountered some issue with Duo... Here are the details: ```{}```"
-                       .format(user_data["name"], str(e)), markdown=True)
+                       .format(user_data["name"], str(e)), thread=data["ts"], markdown=True)
             return False
 
         if not result:
@@ -71,14 +82,14 @@ def authenticate(self, data, user_data, **kwargs):
                      .format(user_data["name"]), markdown=True, ephemeral_user=user_data["id"])
         return True
 
-    def _perform_auth(self, user_data):
+    def _perform_auth(self, user_data, client):
         # Push to devices:
         duo_params = {
             "username": user_data["profile"]["email"],
             "factor": "push",
             "device": "auto"
         }
-        response, data = self.client.api_call("POST", "/auth/v2/auth", duo_params)
+        response, data = client.api_call("POST", "/auth/v2/auth", duo_params)
         result = json.loads(data.decode("utf-8"))
 
         if response.status != 200:

bot_components/decorators.py

@@ -81,13 +81,10 @@ def perform_additional_verification(plugin_obj, args, **kwargs):
                         elif argument.get("lowercase", True):
                             args[real_arg_name] = args[real_arg_name].lower()
 
-                        # Perform cleanups? This will remove things like the annoying macOS "smart quotes",
-                        # and the <>, {}, &lt;&gt; from the variables if `cleanup=False` not set.
+                        # Perform cleanups? Removes <>, {}, &lt;&gt; from the variables if `cleanup=False` not set.
                         if argument.get("cleanup", True):
                             args[real_arg_name] = args[real_arg_name].replace("<", "") \
                                 .replace(">", "").replace("{", "").replace("}", "") \
-                                .replace(u'\u201C', "\"").replace(u'\u201D', "\"") \
-                                .replace(u'\u2018', "\'").replace(u'\u2019', "\'") \
                                 .replace("[", "").replace("]", "") \
                                 .replace("&lt;", "").replace("&gt;", "")
 
@@ -140,6 +137,10 @@ def decorated_command(plugin_obj, data, user_data):
 
                         parser.add_argument(argument["name"], **argument["properties"])
 
+            # Remove all the macOS "Smart Quotes":
+            data["text"] = data["text"].replace(u'\u201C', "\"").replace(u'\u201D', "\"") \
+                .replace(u'\u2018', "\'").replace(u'\u2019', "\'")
+
             # Remove the command from the command string:
             split_args = shlex.split(data["text"])[1:]
             try:

bot_components/parse_functions.py

@@ -121,6 +121,24 @@ def extract_repo_name(plugin_obj, reponame, **kwargs):
     return split_repo.replace(">", "")
 
 
+def extract_multiple_repo_names(plugin_obj, repos, **kwargs):
+    """
+    Does what the above does, but does it for a comma separated list of repos.
+    :param plugin_obj:
+    :param repos:
+    :param kwargs:
+    :return:
+    """
+    repo_list = repos.split(",")
+
+    parsed_repos = []
+
+    for repo in repo_list:
+        parsed_repos.append(extract_repo_name(plugin_obj, repo, **kwargs))
+
+    return parsed_repos
+
+
 def parse_toggles(plugin_obj, toggle, toggle_type="toggle", **kwargs):
     """
     Parses typical toggle values, like off, on, enabled, disabled, true, false, etc.

build_docker.sh

@@ -26,12 +26,12 @@ if [ -z ${BUILD_TAG} ]; then
   BUILD_TAG="latest"
 fi
 
-# If this is running in Travis, AND the Python version IS NOT 3.5, then don't build
+# If this is running in Travis, AND the Python version IS NOT 3.6, then don't build
 # the Docker image:
 if [ $TRAVIS ]; then
     PYTHON_VERSION=$( python --version )
-    if [[ $PYTHON_VERSION != *"3.5"* ]]; then
-        echo "This only builds Docker images in the Python 3.5 Travis job"
+    if [[ $PYTHON_VERSION != *"3.6"* ]]; then
+        echo "This only builds Docker images in the Python 3.6 Travis job"
         exit 0
     fi
 fi
@@ -55,5 +55,12 @@ echo "[-->] Now building the Docker image..."
 # Build that Docker image...
 docker build  -t netflixoss/hubcommander:${BUILD_TAG} --rm=true . --build-arg RTM_VERSION=${RTM_VERSION}
 
+cmd_st="$?"
+if [ $cmd_st -gt 0 ]
+then
+  echo "Error building image. Exiting."
+  exit $cmd_st
+fi
+
 echo
 echo "DONE!"

command_plugins/github/decorators.py

@@ -9,13 +9,38 @@
 from hubcommander.bot_components.slack_comm import send_error
 
 
-def repo_must_exist(org_arg="org", repo_arg="repo"):
+def repo_must_exist(org_arg="org"):
     def command_decorator(func):
         def decorated_command(github_plugin, data, user_data, *args, **kwargs):
+            # Just 1 repo -- or multiple?
+            if kwargs.get("repo"):
+                repos = [kwargs["repo"]]
+            else:
+                repos = kwargs["repos"]
+
             # Check if the specified GitHub repo exists:
-            if not github_plugin.check_if_repo_exists(data, user_data, kwargs[repo_arg], kwargs[org_arg]):
-                return
+            for repo in repos:
+                if not github_plugin.check_if_repo_exists(data, user_data, repo, kwargs[org_arg]):
+                    return
+
+            # Run the next function:
+            return func(github_plugin, data, user_data, *args, **kwargs)
+
+        return decorated_command
+
+    return command_decorator
+
 
+def team_must_exist(org_arg="org", team_arg="team"):
+    def command_decorator(func):
+        def decorated_command(github_plugin, data, user_data, *args, **kwargs):
+            # Check if the specified GitHub team exists:
+            kwargs['team_id'] = github_plugin.find_team_id_by_name(kwargs[org_arg], kwargs[team_arg])
+            if not kwargs.get("team_id"):
+                send_error(data["channel"], "@{}: The GitHub team: {} does not exist.".format(user_data["name"],
+                                                                                              kwargs[team_arg]),
+                           thread=data["ts"])
+                return
             # Run the next function:
             return func(github_plugin, data, user_data, *args, **kwargs)
 
@@ -33,13 +58,15 @@ def decorated_command(github_plugin, data, user_data, *args, **kwargs):
 
                 if not found_user:
                     send_error(data["channel"], "@{}: The GitHub user: {} does not exist.".format(user_data["name"],
-                                                                                                  kwargs[user_arg]))
+                                                                                                  kwargs[user_arg]),
+                               thread=data["ts"])
                     return
 
             except Exception as e:
                 send_error(data["channel"],
                            "@{}: A problem was encountered communicating with GitHub to verify the user's GitHub "
-                           "id. Here are the details:\n{}".format(user_data["name"], str(e)))
+                           "id. Here are the details:\n{}".format(user_data["name"], str(e)),
+                           thread=data["ts"])
                 return
 
             # Run the next function:
@@ -66,7 +93,7 @@ def decorated_command(github_plugin, data, user_data, *args, **kwargs):
                 send_error(data["channel"],
                            "@{}: This repository does not have the branch: `{}`.".format(user_data["name"],
                                                                                          kwargs[branch_arg]),
-                           markdown=True)
+                           markdown=True, thread=data["ts"])
                 return
 
             # Run the next function: