darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 14:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make code a bit more defensive and add som logging

Browse Source
This commit is contained in:
Athanasios Voutsadakis
2017-04-28 16:10:41 +01:00
parent 336462cdb2
commit cfed90e502
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/notifications/notifications_ses_callback.py
View File

@@ -32,13 +32,14 @@ def process_ses_response():
try: try:
ses_request = json.loads(request.data) ses_request = json.loads(request.data)
if 'Type' in ses_request and ses_request['Type'] == 'SubscriptionConfirmation': if ses_request.get('Type') == 'SubscriptionConfirmation':
current_app.logger.info("SNS subscription confirmation url: {}".format(ses_request['SubscribeURL'])) current_app.logger.info("SNS subscription confirmation url: {}".format(ses_request['SubscribeURL']))
subscribed_topic = confirm_subscription(ses_request) subscribed_topic = confirm_subscription(ses_request)
current_app.logger.info("Automatically subscribed to topic: {}".format(subscribed_topic)) if subscribed_topic:
return jsonify( current_app.logger.info("Automatically subscribed to topic: {}".format(subscribed_topic))
result="success", message="SES callback succeeded" return jsonify(
), 200 result="success", message="SES callback succeeded"
), 200
errors = validate_callback_data(data=ses_request, fields=['Message'], client_name=client_name) errors = validate_callback_data(data=ses_request, fields=['Message'], client_name=client_name)
if errors: if errors:

14
app/notifications/utils.py
View File

@@ -1,8 +1,18 @@
from flask import current_app
import requests import requests
def confirm_subscription(confirmation_request): def confirm_subscription(confirmation_request):
url = confirmation_request['SubscribeURL'] url = confirmation_request.get('SubscribeURL')
if not url:
current_app.logger.warning("SubscribeURL does not exist or empty")
return
response = requests.get(url) response = requests.get(url)
response.raise_for_status() try:
response.raise_for_status()
except Exception as e:
current_app.logger.warning("Response: {}".format(response.text))
raise e
return confirmation_request['TopicArn'] return confirmation_request['TopicArn']