Enable Inbound sms IP blocking

app/authentication/auth.py

@@ -60,7 +60,7 @@ def restrict_ip_sms():
         current_app.logger.info("Inbound sms ip route list {}"
                                 .format(ip_route))
         if len(ip_list) >= 3:
-            inbound_ip = IPv4Address(ip_list[len(ip_list) - 3])
+            inbound_ip = IPv4Address(ip_list[len(ip_list) - 3].strip())
 
             # IP whitelist
             allowed_ips = current_app.config.get('SMS_INBOUND_WHITELIST')
@@ -70,10 +70,10 @@ def restrict_ip_sms():
                 for allowed_ip in allowed_ips
             )
 
-            # if allowed:
+            if allowed:
-            #    return
+                return
-            # else:
+            else:
-            #    raise AuthError('Unknown source IP address from the SMS provider', 403)
+                raise AuthError('Unknown source IP address from the SMS provider', 403)
 
             current_app.logger.info({
                 'message': 'Inbound sms ip address',
@@ -87,7 +87,7 @@ def restrict_ip_sms():
     current_app.logger.error('Traffic from unknown source or route, X-Forwarded-For="{}"'.format(
         request.headers.get("X-Forwarded-For"))
     )
-    # raise AuthError('Traffic from unknown source or route', 403)
+    raise AuthError('Traffic from unknown source or route', 403)
 
 
 def requires_admin_auth():

app/config.py

@@ -339,6 +339,8 @@ class Test(Config):
         }
     }
 
+    SMS_INBOUND_WHITELIST = ['203.0.113.195']
+
 
 class Preview(Config):
     NOTIFY_EMAIL_DOMAIN = 'notify.works'

tests/app/authentication/test_authentication.py

@@ -338,7 +338,7 @@ def test_allow_valid_ips(restrict_ip_sms_app):
     assert response.status_code == 200
 
 
-@pytest.mark.xfail(reason='Currently not blocking invalid IPs', strict=True)
+# @pytest.mark.xfail(reason='Currently not blocking invalid IPs', strict=True)
 def test_reject_invalid_ips(restrict_ip_sms_app):
     with pytest.raises(AuthError) as exc_info:
         restrict_ip_sms_app.get(
@@ -351,17 +351,17 @@ def test_reject_invalid_ips(restrict_ip_sms_app):
     assert exc_info.value.short_message == 'Unknown source IP address from the SMS provider'
 
 
-@pytest.mark.xfail(reason='Currently not blocking invalid senders', strict=True)
+# @pytest.mark.xfail(reason='Currently not blocking invalid senders', strict=True)
 def test_illegitimate_ips(restrict_ip_sms_app):
     with pytest.raises(AuthError) as exc_info:
         restrict_ip_sms_app.get(
             path='/',
             headers=[
-                ('X-Forwarded-For', '111.111.111.111, 999.999.999.999, 333.333.333.333, 127.0.0.1')
+                ('X-Forwarded-For', '111.111.111.111, 123.123.123.123, 333.333.333.333, 127.0.0.1')
             ]
         )
 
-    assert exc_info.value.short_message == 'Unknown IP route not from known SMS provider'
+    assert exc_info.value.short_message == 'Unknown source IP address from the SMS provider'
 
 
 def test_allow_valid_ips_bits(restrict_ip_sms_app):

tests/app/notifications/rest/test_callbacks.py

@@ -14,14 +14,37 @@ from tests.app.notifications.test_notifications_ses_callback import ses_confirma
 from tests.app.conftest import sample_notification as create_sample_notification
 
 
-def test_dvla_callback_returns_400_with_invalid_request(client):
+def firetext_post(client, data):
-    data = json.dumps({"foo": "bar"})
+    return client.post(
-    response = client.post(
+        path='/notifications/sms/firetext',
+        data=data,
+        headers=[
+            ('Content-Type', 'application/x-www-form-urlencoded'),
+            ('X-Forwarded-For', '203.0.113.195, 70.41.3.18, 150.172.238.178')
+        ])
+
+
+def mmg_post(client, data):
+    return client.post(
+        path='/notifications/sms/mmg',
+        data=data,
+        headers=[
+            ('Content-Type', 'application/json'),
+            ('X-Forwarded-For', '203.0.113.195, 70.41.3.18, 150.172.238.178')
+        ])
+
+
+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
 
 
@@ -29,12 +52,7 @@ def test_dvla_callback_autoconfirms_subscription(client, mocker):
     autoconfirm_mock = mocker.patch('app.notifications.notifications_letter_callback.autoconfirm_subscription')
 
     data = ses_confirmation_callback()
-    response = client.post(
+    response = dvla_post(client, data)
-        path='/notifications/letter/dvla',
-        data=data,
-        headers=[('Content-Type', 'application/json')]
-    )
-
     assert response.status_code == 200
     assert autoconfirm_mock.called
 
@@ -45,11 +63,7 @@ def test_dvla_callback_autoconfirm_does_not_call_update_letter_notifications_tas
         mocker.patch('app.notifications.notifications_letter_callback.update_letter_notifications_statuses.apply_async')
 
     data = ses_confirmation_callback()
-    response = client.post(
+    response = dvla_post(client, data)
-        path='/notifications/letter/dvla',
-        data=data,
-        headers=[('Content-Type', 'application/json')]
-    )
 
     assert response.status_code == 200
     assert autoconfirm_mock.called
@@ -60,11 +74,7 @@ def test_dvla_callback_calls_update_letter_notifications_task(client, mocker):
     update_task = \
         mocker.patch('app.notifications.notifications_letter_callback.update_letter_notifications_statuses.apply_async')
     data = _sample_sns_s3_callback()
-    response = client.post(
+    response = dvla_post(client, data)
-        path='/notifications/letter/dvla',
-        data=data,
-        headers=[('Content-Type', 'application/json')]
-    )
 
     assert response.status_code == 200
     assert update_task.called
@@ -74,31 +84,23 @@ def test_dvla_callback_calls_update_letter_notifications_task(client, mocker):
 def test_dvla_callback_does_not_raise_error_parsing_json_for_plaintext_header(client, mocker):
     mocker.patch('app.notifications.notifications_letter_callback.update_letter_notifications_statuses.apply_async')
     data = _sample_sns_s3_callback()
-    response = client.post(
+    response = dvla_post(client, data)
-        path='/notifications/letter/dvla',
-        data=data,
-        headers=[('Content-Type', 'text/plain')]
-    )
 
     assert response.status_code == 200
 
 
 def test_firetext_callback_should_not_need_auth(client, mocker):
     mocker.patch('app.statsd_client.incr')
-    response = client.post(
+    data = 'mobile=441234123123&status=0&reference=send-sms-code&time=2016-03-10 14:17:00'
-        path='/notifications/sms/firetext',
-        data='mobile=441234123123&status=0&reference=send-sms-code&time=2016-03-10 14:17:00',
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
+    response = firetext_post(client, data)
     assert response.status_code == 200
 
 
 def test_firetext_callback_should_return_400_if_empty_reference(client, mocker):
     mocker.patch('app.statsd_client.incr')
-    response = client.post(
+    data = 'mobile=441234123123&status=0&reference=&time=2016-03-10 14:17:00'
-        path='/notifications/sms/firetext',
+    response = firetext_post(client, data)
-        data='mobile=441234123123&status=0&reference=&time=2016-03-10 14:17:00',
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 400
@@ -108,11 +110,8 @@ def test_firetext_callback_should_return_400_if_empty_reference(client, mocker):
 
 def test_firetext_callback_should_return_400_if_no_reference(client, mocker):
     mocker.patch('app.statsd_client.incr')
-    response = client.post(
+    data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00'
-        path='/notifications/sms/firetext',
+    response = firetext_post(client, data)
-        data='mobile=441234123123&status=0&time=2016-03-10 14:17:00',
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
-
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 400
     assert json_resp['result'] == 'error'
@@ -121,11 +120,8 @@ def test_firetext_callback_should_return_400_if_no_reference(client, mocker):
 
 def test_firetext_callback_should_return_200_if_send_sms_reference(client, mocker):
     mocker.patch('app.statsd_client.incr')
-    response = client.post(
+    data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference=send-sms-code'
-        path='/notifications/sms/firetext',
+    response = firetext_post(client, data)
-        data='mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference=send-sms-code',
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
-
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 200
     assert json_resp['result'] == 'success'
@@ -134,11 +130,8 @@ def test_firetext_callback_should_return_200_if_send_sms_reference(client, mocke
 
 def test_firetext_callback_should_return_400_if_no_status(client, mocker):
     mocker.patch('app.statsd_client.incr')
-    response = client.post(
+    data = 'mobile=441234123123&time=2016-03-10 14:17:00&reference=send-sms-code'
-        path='/notifications/sms/firetext',
+    response = firetext_post(client, data)
-        data='mobile=441234123123&time=2016-03-10 14:17:00&reference=send-sms-code',
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
-
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 400
     assert json_resp['result'] == 'error'
@@ -147,10 +140,8 @@ def test_firetext_callback_should_return_400_if_no_status(client, mocker):
 
 def test_firetext_callback_should_return_400_if_unknown_status(client, mocker):
     mocker.patch('app.statsd_client.incr')
-    response = client.post(
+    data = 'mobile=441234123123&status=99&time=2016-03-10 14:17:00&reference={}'.format(uuid.uuid4())
-        path='/notifications/sms/firetext',
+    response = firetext_post(client, data)
-        data='mobile=441234123123&status=99&time=2016-03-10 14:17:00&reference={}'.format(uuid.uuid4()),
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 400
@@ -160,11 +151,8 @@ def test_firetext_callback_should_return_400_if_unknown_status(client, mocker):
 
 def test_firetext_callback_returns_200_when_notification_id_not_found_or_already_updated(client, mocker):
     mocker.patch('app.statsd_client.incr')
-    response = client.post(
+    data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference=1234'
-        path='/notifications/sms/firetext',
+    response = firetext_post(client, data)
-        data='mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference=1234',
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
-
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 400
     assert json_resp['result'] == 'error'
@@ -179,12 +167,9 @@ def test_callback_should_return_200_if_cannot_find_notification_id(
 ):
     mocker.patch('app.statsd_client.incr')
     missing_notification_id = uuid.uuid4()
-    response = client.post(
+    data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference={}'.format(
-        path='/notifications/sms/firetext',
+        missing_notification_id)
-        data='mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference={}'.format(
+    response = firetext_post(client, data)
-            missing_notification_id
-        ),
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 200
@@ -206,13 +191,9 @@ def test_firetext_callback_should_update_notification_status(
 
     original = get_notification_by_id(notification.id)
     assert original.status == 'sending'
-
+    data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference={}'.format(
-    response = client.post(
+        notification.id)
-        path='/notifications/sms/firetext',
+    response = firetext_post(client, data)
-        data='mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference={}'.format(
-            notification.id
-        ),
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 200
@@ -241,12 +222,9 @@ def test_firetext_callback_should_update_notification_status_failed(
     original = get_notification_by_id(notification.id)
     assert original.status == 'sending'
 
-    response = client.post(
+    data = 'mobile=441234123123&status=1&time=2016-03-10 14:17:00&reference={}'.format(
-        path='/notifications/sms/firetext',
+        notification.id)
-        data='mobile=441234123123&status=1&time=2016-03-10 14:17:00&reference={}'.format(
+    response = firetext_post(client, data)
-            notification.id
-        ),
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 200
@@ -264,13 +242,9 @@ def test_firetext_callback_should_update_notification_status_pending(client, not
     )
     original = get_notification_by_id(notification.id)
     assert original.status == 'sending'
-
+    data = 'mobile=441234123123&status=2&time=2016-03-10 14:17:00&reference={}'.format(
-    response = client.post(
+        notification.id)
-        path='/notifications/sms/firetext',
+    response = firetext_post(client, data)
-        data='mobile=441234123123&status=2&time=2016-03-10 14:17:00&reference={}'.format(
-            notification.id
-        ),
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     json_resp = json.loads(response.get_data(as_text=True))
     assert response.status_code == 200
@@ -297,36 +271,19 @@ def test_firetext_callback_should_update_multiple_notification_status_sent(
     notification3 = create_sample_notification(
         notify_db, notify_db_session, status='sending', sent_at=datetime.utcnow()
     )
+    data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference={}'.format(
+        notification1.id)
 
-    client.post(
+    firetext_post(client, data)
-        path='/notifications/sms/firetext',
+    firetext_post(client, data)
-        data='mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference={}'.format(
+    firetext_post(client, data)
-            notification1.id
-        ),
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
-
-    client.post(
-        path='/notifications/sms/firetext',
-        data='mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference={}'.format(
-            notification2.id
-        ),
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
-
-    client.post(
-        path='/notifications/sms/firetext',
-        data='mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference={}'.format(
-            notification3.id
-        ),
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
 
 def test_process_mmg_response_return_200_when_cid_is_send_sms_code(client):
     data = '{"reference": "10100164", "CID": "send-sms-code", "MSISDN": "447775349060", "status": "3", \
         "deliverytime": "2016-04-05 16:01:07"}'
 
-    response = client.post(path='notifications/sms/mmg',
+    response = mmg_post(client, data)
-                           data=data,
-                           headers=[('Content-Type', 'application/json')])
     assert response.status_code == 200
     json_data = json.loads(response.data)
     assert json_data['result'] == 'success'
@@ -345,9 +302,8 @@ def test_process_mmg_response_returns_200_when_cid_is_valid_notification_id(
                        "status": "3",
                        "deliverytime": "2016-04-05 16:01:07"})
 
-    response = client.post(path='notifications/sms/mmg',
+    response = mmg_post(client, data)
-                           data=data,
+
-                           headers=[('Content-Type', 'application/json')])
     assert response.status_code == 200
     json_data = json.loads(response.data)
     assert json_data['result'] == 'success'
@@ -367,9 +323,7 @@ def test_process_mmg_response_status_5_updates_notification_with_permanently_fai
                        "MSISDN": "447777349060",
                        "status": 5})
 
-    response = client.post(path='notifications/sms/mmg',
+    response = mmg_post(client, data)
-                           data=data,
-                           headers=[('Content-Type', 'application/json')])
     assert response.status_code == 200
     json_data = json.loads(response.data)
     assert json_data['result'] == 'success'
@@ -388,9 +342,7 @@ def test_process_mmg_response_status_2_updates_notification_with_permanently_fai
                        "MSISDN": "447777349060",
                        "status": 2})
 
-    response = client.post(path='notifications/sms/mmg',
+    response = mmg_post(client, data)
-                           data=data,
-                           headers=[('Content-Type', 'application/json')])
     assert response.status_code == 200
     json_data = json.loads(response.data)
     assert json_data['result'] == 'success'
@@ -410,9 +362,7 @@ def test_process_mmg_response_status_4_updates_notification_with_temporary_faile
                        "MSISDN": "447777349060",
                        "status": 4})
 
-    response = client.post(path='notifications/sms/mmg',
+    response = mmg_post(client, data)
-                           data=data,
-                           headers=[('Content-Type', 'application/json')])
     assert response.status_code == 200
     json_data = json.loads(response.data)
     assert json_data['result'] == 'success'
@@ -431,9 +381,7 @@ def test_process_mmg_response_unknown_status_updates_notification_with_failed(
                        "MSISDN": "447777349060",
                        "status": 10})
 
-    response = client.post(path='notifications/sms/mmg',
+    response = mmg_post(client, data)
-                           data=data,
-                           headers=[('Content-Type', 'application/json')])
     assert response.status_code == 200
     json_data = json.loads(response.data)
     assert json_data['result'] == 'success'
@@ -448,9 +396,7 @@ def test_process_mmg_response_returns_400_for_malformed_data(client):
                        "no_status": 00,
                        "deliverytime": "2016-04-05 16:01:07"})
 
-    response = client.post(path='notifications/sms/mmg',
+    response = mmg_post(client, data)
-                           data=data,
-                           headers=[('Content-Type', 'application/json')])
     assert response.status_code == 400
     json_data = json.loads(response.data)
     assert json_data['result'] == 'error'
@@ -463,9 +409,7 @@ def test_mmg_callback_returns_200_when_notification_id_not_found_or_already_upda
     data = '{"reference": "10100164", "CID": "send-sms-code", "MSISDN": "447775349060", "status": "3", \
              "deliverytime": "2016-04-05 16:01:07"}'
 
-    response = client.post(path='notifications/sms/mmg',
+    response = mmg_post(client, data)
-                           data=data,
-                           headers=[('Content-Type', 'application/json')])
     assert response.status_code == 200
 
 
@@ -484,9 +428,7 @@ def test_process_mmg_response_records_statsd(notify_db, notify_db_session, clien
                            "status": "3",
                            "deliverytime": "2016-04-05 16:01:07"})
 
-        client.post(path='notifications/sms/mmg',
+        mmg_post(client, data)
-                    data=data,
-                    headers=[('Content-Type', 'application/json')])
 
         app.statsd_client.incr.assert_any_call("callback.mmg.delivered")
         app.statsd_client.timing_with_dates.assert_any_call(
@@ -503,12 +445,9 @@ def test_firetext_callback_should_record_statsd(client, notify_db, notify_db_ses
             notify_db, notify_db_session, status='sending', sent_at=datetime.utcnow()
         )
 
-        client.post(
+        data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00&code=101&reference={}'.format(
-            path='/notifications/sms/firetext',
+            notification.id)
-            data='mobile=441234123123&status=0&time=2016-03-10 14:17:00&code=101&reference={}'.format(
+        firetext_post(client, data)
-                notification.id
-            ),
-            headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
         app.statsd_client.timing_with_dates.assert_any_call(
             "callback.firetext.elapsed-time", datetime.utcnow(), notification.sent_at

tests/app/notifications/test_receive_notification.py

@@ -19,6 +19,26 @@ from tests.app.db import create_inbound_number, create_service
 from tests.app.conftest import sample_service
 
 
+def firetext_post(client, data):
+    return client.post(
+        path='/notifications/sms/receive/firetext',
+        data=data,
+        headers=[
+            ('Content-Type', 'application/x-www-form-urlencoded'),
+            ('X-Forwarded-For', '203.0.113.195, 70.41.3.18, 150.172.238.178')
+        ])
+
+
+def mmg_post(client, data):
+    return client.post(
+        path='/notifications/sms/receive/mmg',
+        data=json.dumps(data),
+        headers=[
+            ('Content-Type', 'application/json'),
+            ('X-Forwarded-For', '203.0.113.195, 70.41.3.18, 150.172.238.178')
+        ])
+
+
 def test_receive_notification_returns_received_to_mmg(client, mocker, sample_service_full_permissions):
     mocked = mocker.patch("app.notifications.receive_notifications.tasks.send_inbound_sms_to_service.apply_async")
     data = {
@@ -30,9 +50,7 @@ def test_receive_notification_returns_received_to_mmg(client, mocker, sample_ser
         "Channel": "SMS",
         "DateRecieved": "2012-06-27 12:33:00"
     }
-    response = client.post(path='/notifications/sms/receive/mmg',
+    response = mmg_post(client, data)
-                           data=json.dumps(data),
-                           headers=[('Content-Type', 'application/json')])
 
     assert response.status_code == 200
     assert response.get_data(as_text=True) == 'RECEIVED'
@@ -62,11 +80,7 @@ def test_receive_notification_from_mmg_without_permissions_does_not_persist(
         "Channel": "SMS",
         "DateRecieved": "2012-06-27 12:33:00"
     }
-    response = client.post(
+    response = mmg_post(client, data)
-        path='/notifications/sms/receive/mmg',
-        data=json.dumps(data),
-        headers=[('Content-Type', 'application/json')]
-    )
 
     assert response.status_code == 200
     assert response.get_data(as_text=True) == 'RECEIVED'
@@ -93,11 +107,7 @@ def test_receive_notification_from_firetext_without_permissions_does_not_persist
         "app.notifications.receive_notifications.has_inbound_sms_permissions", return_value=False)
 
     data = "source=07999999999&destination=07111111111&message=this is a message&time=2017-01-01 12:00:00"
-    response = client.post(
+    response = firetext_post(client, data)
-        path='/notifications/sms/receive/firetext',
-        data=data,
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')]
-    )
 
     assert response.status_code == 200
     result = json.loads(response.get_data(as_text=True))
@@ -117,7 +127,7 @@ def test_receive_notification_without_permissions_does_not_create_inbound_even_w
     mocked_has_permissions = mocker.patch(
         "app.notifications.receive_notifications.has_inbound_sms_permissions", return_value=False)
 
-    data = json.dumps({
+    data = {
         "ID": "1234",
         "MSISDN": "447700900855",
         "Message": "Some message to notify",
@@ -125,11 +135,9 @@ def test_receive_notification_without_permissions_does_not_create_inbound_even_w
         "Number": inbound_number.number,
         "Channel": "SMS",
         "DateRecieved": "2012-06-27 12:33:00"
-    })
+    }
 
-    response = client.post(path='/notifications/sms/receive/mmg',
+    response = mmg_post(client, data)
-                           data=data,
-                           headers=[('Content-Type', 'application/json')])
 
     assert response.status_code == 200
     assert len(InboundSms.query.all()) == 0
@@ -235,9 +243,7 @@ def test_receive_notification_error_if_not_single_matching_service(client, notif
         'DateRecieved': '2017-01-02 03:04:05',
         'ID': 'bar',
     }
-    response = client.post(path='/notifications/sms/receive/mmg',
+    response = mmg_post(client, data)
-                           data=json.dumps(data),
-                           headers=[('Content-Type', 'application/json')])
 
     # we still return 'RECEIVED' to MMG
     assert response.status_code == 200
@@ -254,10 +260,7 @@ def test_receive_notification_returns_received_to_firetext(notify_db_session, cl
 
     data = "source=07999999999&destination=07111111111&message=this is a message&time=2017-01-01 12:00:00"
 
-    response = client.post(
+    response = firetext_post(client, data)
-        path='/notifications/sms/receive/firetext',
-        data=data,
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     assert response.status_code == 200
     result = json.loads(response.get_data(as_text=True))
@@ -278,10 +281,7 @@ def test_receive_notification_from_firetext_persists_message(notify_db_session,
 
     data = "source=07999999999&destination=07111111111&message=this is a message&time=2017-01-01 12:00:00"
 
-    response = client.post(
+    response = firetext_post(client, data)
-        path='/notifications/sms/receive/firetext',
-        data=data,
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     assert response.status_code == 200
     result = json.loads(response.get_data(as_text=True))
@@ -307,10 +307,7 @@ def test_receive_notification_from_firetext_persists_message_with_normalized_pho
 
     data = "source=(+44)7999999999&destination=07111111111&message=this is a message&time=2017-01-01 12:00:00"
 
-    response = client.post(
+    response = firetext_post(client, data)
-        path='/notifications/sms/receive/firetext',
-        data=data,
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     assert response.status_code == 200
     result = json.loads(response.get_data(as_text=True))
@@ -330,10 +327,7 @@ def test_returns_ok_to_firetext_if_mismatched_sms_sender(notify_db_session, clie
 
     data = "source=(+44)7999999999&destination=07111111111&message=this is a message&time=2017-01-01 12:00:00"
 
-    response = client.post(
+    response = firetext_post(client, data)
-        path='/notifications/sms/receive/firetext',
-        data=data,
-        headers=[('Content-Type', 'application/x-www-form-urlencoded')])
 
     assert response.status_code == 200
     result = json.loads(response.get_data(as_text=True))