Merge remote-tracking branch 'origin/master' into ephemeral

endpoints/notificationmethod.py

@@ -1,14 +1,10 @@
 import logging
-import io
-import os.path
-import tarfile
-import base64
 import json
 import requests
 import re
 
 from flask.ext.mail import Message
-from app import mail, app, get_app_url
+from app import mail, app
 from data import model
 from workers.worker import JobException
 
@@ -363,11 +359,8 @@ class SlackMethod(NotificationMethod):
     return 'slack'
 
   def validate(self, repository, config_data):
-    if not config_data.get('token', ''):
-      raise CannotValidateNotificationMethodException('Missing Slack Token')
-
-    if not config_data.get('subdomain', '').isalnum():
-      raise CannotValidateNotificationMethodException('Missing Slack Subdomain Name')
+    if not config_data.get('url', ''):
+      raise CannotValidateNotificationMethodException('Missing Slack Callback URL')
 
   def format_for_slack(self, message):
     message = message.replace('\n', '')
@@ -378,10 +371,8 @@ class SlackMethod(NotificationMethod):
   def perform(self, notification, event_handler, notification_data):
     config_data = json.loads(notification.config_json)
 
-    token = config_data.get('token', '')
-    subdomain = config_data.get('subdomain', '')
-
-    if not token or not subdomain:
+    url = config_data.get('url', '')
+    if not url:
       return
 
     owner = model.get_user_or_org(notification.repository.namespace_user.username)
@@ -389,8 +380,6 @@ class SlackMethod(NotificationMethod):
       # Something went wrong.
       return
 
-    url = 'https://%s.slack.com/services/hooks/incoming-webhook?token=%s' % (subdomain, token)
-
     level = event_handler.get_level(notification_data['event_data'], notification_data)
     color = {
       'info': '#ffffff',
@@ -426,5 +415,5 @@ class SlackMethod(NotificationMethod):
         raise NotificationMethodPerformException(error_message)
 
     except requests.exceptions.RequestException as ex:
-      logger.exception('Slack method was unable to be sent: %s' % ex.message)
+      logger.exception('Slack method was unable to be sent: %s', ex.message)
       raise NotificationMethodPerformException(ex.message)

endpoints/web.py

@@ -19,7 +19,7 @@ from util.cache import no_cache
 from endpoints.common import common_login, render_page_template, route_show_if, param_required
 from endpoints.csrf import csrf_protect, generate_csrf_token
 from endpoints.registry import set_cache_headers
-from util.names import parse_repository_name
+from util.names import parse_repository_name, parse_repository_name_and_tag
 from util.useremails import send_email_changed
 from auth import scopes
 
@@ -224,14 +224,14 @@ def robots():
 @web.route('/<path:repository>')
 @no_cache
 @process_oauth
-@parse_repository_name
-def redirect_to_repository(namespace, reponame):
+@parse_repository_name_and_tag
+def redirect_to_repository(namespace, reponame, tag):
   permission = ReadRepositoryPermission(namespace, reponame)
   is_public = model.repository_is_public(namespace, reponame)
 
   if permission.can() or is_public:
     repository_name = '/'.join([namespace, reponame])
-    return redirect(url_for('web.repository', path=repository_name))
+    return redirect(url_for('web.repository', path=repository_name, tag=tag))
 
   abort(404)