Allow even less arbitrary file uploads

slackbot/plugins/upload.py

@@ -6,20 +6,21 @@
 
 
 @respond_to(r'upload \<?(.*)\>?')
-def upload(message, url):
+def upload(message, thing):
     # message.channel.upload_file(slack_filename, local_filename,
     #                             initial_comment='')
-    url = url.lstrip('<').rstrip('>')
-    message.reply('uploading {}'.format(url))
-    if url.startswith('http'):
+    if thing == 'favicon':
+        url = 'https://slack.com/favicon.ico'
+        message.reply('uploading {}'.format(url))
         with create_tmp_file() as tmpf:
             download_file(url, tmpf)
             message.channel.upload_file(url, tmpf,
                                         'downloaded from {}'.format(url))
-    elif url == 'slack.png':
+    elif thing == 'slack.png':
+        message.reply('uploading slack.png')
         cwd = os.path.abspath(os.path.dirname(__file__))
         fname = os.path.join(cwd, '../../tests/functional/slack.png')
-        message.channel.upload_file(url, fname)
+        message.channel.upload_file(thing, fname)
 
 
 @respond_to('send_string_content')

tests/functional/driver.py

@@ -170,7 +170,8 @@ def _has_got_message_rtm(self, channel, match, tosender=True, thread=False):
             match = six.text_type(r'\<@{}\>: {}').format(self.driver_userid, match)
         with self._events_lock:
             for event in self.events:
-                if 'type' not in event or 'text' not in event:
+                if 'type' not in event or \
+                        (event['type'] == 'message' and 'text' not in event):
                     print('Unusual event received: ' + repr(event))
                 if (not thread or (thread and event.get('thread_ts', False))) \
                         and event['type'] == 'message' and re.match(match, event['text'], re.DOTALL):

tests/functional/test_functional.py

@@ -101,7 +101,7 @@ def test_bot_upload_file(driver):
 def test_bot_upload_file_from_link(driver):
     url = 'https://slack.com/favicon.ico'
     fname = basename(url)
-    driver.send_direct_message('upload %s' % url)
+    driver.send_direct_message('upload favicon')
     driver.wait_for_bot_direct_message('uploading <%s>' % url)
     driver.wait_for_file_uploaded(fname)