Merge branch 'master' into vb-remove-ip-whitelist

app/notifications/receive_notifications.py

@@ -34,11 +34,11 @@ def receive_mmg_sms():
 
     if not auth:
         current_app.logger.warning("Inbound sms (MMG) no auth header")
-        # abort(401)
+        abort(401)
     elif auth.username not in current_app.config['MMG_INBOUND_SMS_USERNAME'] \
             or auth.password not in current_app.config['MMG_INBOUND_SMS_AUTH']:
         current_app.logger.warning("Inbound sms (MMG) incorrect username ({}) or password".format(auth.username))
-        # abort(403)
+        abort(403)
 
     inbound_number = strip_leading_forty_four(post_data['Number'])
 

tests/app/notifications/test_receive_notification.py

@@ -428,7 +428,6 @@ def test_firetext_inbound_sms_auth(notify_db_session, notify_api, client, mocker
     ["", [], 401],
     ["testkey", [], 403],
 ])
-@pytest.mark.skip(reason="aborts are disabled at the moment")
 def test_mmg_inbound_sms_auth(notify_db_session, notify_api, client, mocker, auth, keys, status_code):
     mocker.patch("app.notifications.receive_notifications.tasks.send_inbound_sms_to_service.apply_async")