Add setup UI for the new trigger types (bitbucket and gitlab) and add validation

util/config/validator.py

@@ -12,9 +12,10 @@ from flask import Flask
 from flask.ext.mail import Mail, Message
 from data.database import validate_database_url, User
 from storage import get_storage_driver
-from app import app, CONFIG_PROVIDER
+from app import app, CONFIG_PROVIDER, get_app_url
 from auth.auth_context import get_authenticated_user
-from util.oauth import GoogleOAuthConfig, GithubOAuthConfig
+from util.oauth import GoogleOAuthConfig, GithubOAuthConfig, GitLabOAuthConfig
+from bitbucket import BitBucket
 
 logger = logging.getLogger(__name__)
 
@@ -99,6 +100,32 @@ def _validate_mailing(config):
   test_mail.send(test_msg)
 
 
+def _validate_gitlab(config):
+  """ Validates the OAuth credentials and API endpoint for a GitLab service. """
+  github_config = config.get('GITLAB_TRIGGER_CONFIG')
+  if not github_config:
+    raise Exception('Missing GitLab client id and client secret')
+
+  endpoint = github_config.get('GITLAB_ENDPOINT')
+  if not endpoint:
+    raise Exception('Missing GitLab Endpoint')
+
+  if endpoint.find('http://') != 0 and endpoint.find('https://') != 0:
+    raise Exception('GitLab Endpoint must start with http:// or https://')
+
+  if not github_config.get('CLIENT_ID'):
+    raise Exception('Missing Client ID')
+
+  if not github_config.get('CLIENT_SECRET'):
+    raise Exception('Missing Client Secret')
+
+  client = app.config['HTTPCLIENT']
+  oauth = GitLabOAuthConfig(config, 'GITLAB_TRIGGER_CONFIG')
+  result = oauth.validate_client_id_and_secret(client, app.config)
+  if not result:
+    raise Exception('Invalid client id or client secret')
+
+
 def _validate_github(config_key):
   return lambda config: _validate_github_with_key(config_key, config)
 
@@ -107,11 +134,11 @@ def _validate_github_with_key(config_key, config):
   """ Validates the OAuth credentials and API endpoint for a Github service. """
   github_config = config.get(config_key)
   if not github_config:
-    raise Exception('Missing Github client id and client secret')
+    raise Exception('Missing GitHub client id and client secret')
 
   endpoint = github_config.get('GITHUB_ENDPOINT')
   if not endpoint:
-    raise Exception('Missing Github Endpoint')
+    raise Exception('Missing GitHub Endpoint')
 
   if endpoint.find('http://') != 0 and endpoint.find('https://') != 0:
     raise Exception('Github Endpoint must start with http:// or https://')
@@ -127,7 +154,7 @@ def _validate_github_with_key(config_key, config):
 
   client = app.config['HTTPCLIENT']
   oauth = GithubOAuthConfig(config, config_key)
-  result = oauth.validate_client_id_and_secret(client)
+  result = oauth.validate_client_id_and_secret(client, app.config)
   if not result:
     raise Exception('Invalid client id or client secret')
 
@@ -137,6 +164,28 @@ def _validate_github_with_key(config_key, config):
         raise Exception('Invalid organization: %s' % org_id)
 
 
+def _validate_bitbucket(config):
+  """ Validates the config for BitBucket. """
+  trigger_config = config.get('BITBUCKET_TRIGGER_CONFIG')
+  if not trigger_config:
+    raise Exception('Missing client ID and client secret')
+
+  if not trigger_config.get('CONSUMER_KEY'):
+    raise Exception('Missing Consumer Key')
+
+  if not trigger_config.get('CONSUMER_SECRET'):
+    raise Exception('Missing Consumer Secret')
+
+  key = trigger_config['CONSUMER_KEY']
+  secret = trigger_config['CONSUMER_SECRET']
+  callback_url = '%s/oauth1/bitbucket/callback/trigger/' % (get_app_url())
+
+  bitbucket_client = BitBucket(key, secret, callback_url)
+  (result, _, _) = bitbucket_client.get_authorization_url()
+  if not result:
+    raise Exception('Invaid consumer key or secret')
+
+
 def _validate_google_login(config):
   """ Validates the Google Login client ID and secret. """
   google_login_config = config.get('GOOGLE_LOGIN_CONFIG')
@@ -151,7 +200,7 @@ def _validate_google_login(config):
 
   client = app.config['HTTPCLIENT']
   oauth = GoogleOAuthConfig(config, 'GOOGLE_LOGIN_CONFIG')
-  result = oauth.validate_client_id_and_secret(client)
+  result = oauth.validate_client_id_and_secret(client, app.config)
   if not result:
     raise Exception('Invalid client id or client secret')
 
@@ -261,6 +310,8 @@ _VALIDATORS = {
   'mail': _validate_mailing,
   'github-login': _validate_github('GITHUB_LOGIN_CONFIG'),
   'github-trigger': _validate_github('GITHUB_TRIGGER_CONFIG'),
+  'gitlab-trigger': _validate_gitlab,
+  'bitbucket-trigger': _validate_bitbucket,
   'google-login': _validate_google_login,
   'ssl': _validate_ssl,
   'ldap': _validate_ldap,