Merge pull request #920 from alphagov/autoconfirm_http_subscriptions

Autoconfirm http subscriptions

app/notifications/notifications_ses_callback.py

@@ -15,6 +15,7 @@ from app.dao import (
 )
 
 from app.notifications.process_client_response import validate_callback_data
+from app.notifications.utils import confirm_subscription
 
 ses_callback_blueprint = Blueprint('notifications_ses_callback', __name__)
 
@@ -31,8 +32,14 @@ def process_ses_response():
     try:
         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']))
+            subscribed_topic = confirm_subscription(ses_request)
+            if subscribed_topic:
+                current_app.logger.info("Automatically subscribed to topic: {}".format(subscribed_topic))
+                return jsonify(
+                    result="success", message="SES callback succeeded"
+                ), 200
 
         errors = validate_callback_data(data=ses_request, fields=['Message'], client_name=client_name)
         if errors:

app/notifications/utils.py

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