vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #378 from mjibson/notification-ssl-client-certs

Browse source 
Send SSL client certs on webhook notifications
This commit is contained in:
Matt Jibson 2015-08-20 12:14:39 -04:00
commit 513ade5fae
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
endpoints/notificationmethod.py
View file

@ -4,8 +4,9 @@ import requests
import re import re
from flask.ext.mail import Message from flask.ext.mail import Message
from app import mail, app from app import mail, app, OVERRIDE_CONFIG_DIRECTORY
from data import model from data import model
from util.config.validator import SSL_FILENAMES
from workers.queueworker import JobException from workers.queueworker import JobException
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -20,6 +21,11 @@ class NotificationMethodPerformException(JobException):
pass pass
SSLClientCert = None
if app.config['PREFERRED_URL_SCHEME'] == 'https':
# TODO(jschorr): move this into the config provider library
SSLClientCert = [OVERRIDE_CONFIG_DIRECTORY + f for f in SSL_FILENAMES]
class NotificationMethod(object): class NotificationMethod(object):
def __init__(self): def __init__(self):
pass pass
@ -177,7 +183,7 @@ class WebhookMethod(NotificationMethod):
headers = {'Content-type': 'application/json'} headers = {'Content-type': 'application/json'}
try: try:
resp = requests.post(url, data=json.dumps(payload), headers=headers) resp = requests.post(url, data=json.dumps(payload), headers=headers, cert=SSLClientCert)
if resp.status_code/100 != 2: if resp.status_code/100 != 2:
error_message = '%s response for webhook to url: %s' % (resp.status_code, url) error_message = '%s response for webhook to url: %s' % (resp.status_code, url)
logger.error(error_message) logger.error(error_message)