From 8930a53beaaf5b0cad2db36170a5488b2accd34a Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Wed, 7 Dec 2022 12:35:31 -0500 Subject: [PATCH] remove rest of letter callback --- app/__init__.py | 6 --- .../notifications_letter_callback.py | 36 --------------- .../test_notifications_letter_callbacks.py | 46 ------------------- 3 files changed, 88 deletions(-) delete mode 100644 app/notifications/notifications_letter_callback.py delete mode 100644 tests/app/notifications/test_notifications_letter_callbacks.py diff --git a/app/__init__.py b/app/__init__.py index bfd519fe5..489e37db5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -144,9 +144,6 @@ def register_blueprint(application): letter_branding_blueprint, ) from app.letters.rest import letter_job - from app.notifications.notifications_letter_callback import ( - letter_callback_blueprint, - ) from app.notifications.notifications_ses_callback import ( ses_callback_blueprint, ) @@ -243,9 +240,6 @@ def register_blueprint(application): letter_job.before_request(requires_admin_auth) application.register_blueprint(letter_job) - letter_callback_blueprint.before_request(requires_no_auth) - application.register_blueprint(letter_callback_blueprint) - billing_blueprint.before_request(requires_admin_auth) application.register_blueprint(billing_blueprint) diff --git a/app/notifications/notifications_letter_callback.py b/app/notifications/notifications_letter_callback.py deleted file mode 100644 index c970bc144..000000000 --- a/app/notifications/notifications_letter_callback.py +++ /dev/null @@ -1,36 +0,0 @@ -import json -from functools import wraps - -from flask import Blueprint, current_app, jsonify, request - -from app.config import QueueNames -from app.notifications.utils import autoconfirm_subscription -from app.schema_validation import validate -from app.v2.errors import register_errors - -letter_callback_blueprint = Blueprint('notifications_letter_callback', __name__) -register_errors(letter_callback_blueprint) - - -dvla_sns_callback_schema = { - "$schema": "http://json-schema.org/draft-07/schema#", - "description": "sns callback received on s3 update", - "type": "object", - "title": "dvla internal sns callback", - "properties": { - "Type": {"enum": ["Notification", "SubscriptionConfirmation"]}, - "MessageId": {"type": "string"}, - "Message": {"type": ["string", "object"]} - }, - "required": ["Type", "MessageId", "Message"] -} - - -def validate_schema(schema): - def decorator(f): - @wraps(f) - def wrapper(*args, **kw): - validate(request.get_json(force=True), schema) - return f(*args, **kw) - return wrapper - return decorator diff --git a/tests/app/notifications/test_notifications_letter_callbacks.py b/tests/app/notifications/test_notifications_letter_callbacks.py deleted file mode 100644 index 9fd0fb01d..000000000 --- a/tests/app/notifications/test_notifications_letter_callbacks.py +++ /dev/null @@ -1,46 +0,0 @@ -import pytest -from flask import json - - -def dvla_post(client, data): - return client.post( - path='/notifications/letter/dvla', - data=data, - headers=[('Content-Type', 'application/json')] - ) - - -def test_dvla_callback_returns_400_with_invalid_request(client): - data = json.dumps({"foo": "bar"}) - response = dvla_post(client, data) - assert response.status_code == 400 - - -def test_dvla_callback_autoconfirms_subscription(client, mocker): - autoconfirm_mock = mocker.patch('app.notifications.notifications_letter_callback.autoconfirm_subscription') - - data = _sns_confirmation_callback() - response = dvla_post(client, data) - assert response.status_code == 200 - assert autoconfirm_mock.called - - -def _sample_sns_s3_callback(filename): - message_contents = '''{"Records":[{"eventVersion":"2.0","eventSource":"aws:s3","awsRegion":"eu-west-1","eventTime":"2017-05-16T11:38:41.073Z","eventName":"ObjectCreated:Put","userIdentity":{"principalId":"some-p-id"},"requestParameters":{"sourceIPAddress":"8.8.8.8"},"responseElements":{"x-amz-request-id":"some-r-id","x-amz-id-2":"some-x-am-id"},"s3":{"s3SchemaVersion":"1.0","configurationId":"some-c-id","bucket":{"name":"some-bucket","ownerIdentity":{"principalId":"some-p-id"},"arn":"some-bucket-arn"}, - "object":{"key":"%s"}}}]}''' % (filename) # noqa - return json.dumps({ - "SigningCertURL": "foo.pem", - "UnsubscribeURL": "bar", - "Signature": "some-signature", - "Type": "Notification", - "Timestamp": "2016-05-03T08:35:12.884Z", - "SignatureVersion": "1", - "MessageId": "6adbfe0a-d610-509a-9c47-af894e90d32d", - "Subject": "Amazon S3 Notification", - "TopicArn": "sample-topic-arn", - "Message": message_contents - }) - - -def _sns_confirmation_callback(): - return b'{\n "Type": "SubscriptionConfirmation",\n "MessageId": "165545c9-2a5c-472c-8df2-7ff2be2b3b1b",\n "Token": "2336412f37fb687f5d51e6e241d09c805a5a57b30d712f794cc5f6a988666d92768dd60a747ba6f3beb71854e285d6ad02428b09ceece29417f1f02d609c582afbacc99c583a916b9981dd2728f4ae6fdb82efd087cc3b7849e05798d2d2785c03b0879594eeac82c01f235d0e717736",\n "TopicArn": "arn:aws:sns:us-west-2:123456789012:MyTopic",\n "Message": "You have chosen to subscribe to the topic arn:aws:sns:us-west-2:123456789012:MyTopic.\\nTo confirm the subscription, visit the SubscribeURL included in this message.",\n "SubscribeURL": "https://sns.us-west-2.amazonaws.com/?Action=ConfirmSubscription&TopicArn=arn:aws:sns:us-west-2:123456789012:MyTopic&Token=2336412f37fb687f5d51e6e241d09c805a5a57b30d712f794cc5f6a988666d92768dd60a747ba6f3beb71854e285d6ad02428b09ceece29417f1f02d609c582afbacc99c583a916b9981dd2728f4ae6fdb82efd087cc3b7849e05798d2d2785c03b0879594eeac82c01f235d0e717736",\n "Timestamp": "2012-04-26T20:45:04.751Z",\n "SignatureVersion": "1",\n "Signature": "EXAMPLEpH+DcEwjAPg8O9mY8dReBSwksfg2S7WKQcikcNKWLQjwu6A4VbeS0QHVCkhRS7fUQvi2egU3N858fiTDN6bkkOxYDVrY0Ad8L10Hs3zH81mtnPk5uvvolIC1CXGu43obcgFxeL3khZl8IKvO61GWB6jI9b5+gLPoBc1Q=",\n "SigningCertURL": "https://sns.us-west-2.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem"\n}' # noqa