darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 13:39:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix 500 error due to inconsistent recipient check

Browse Source 
This strengthens the initial check of what's in the session to make
sure it contains some kind of recipient. Without this, we get:

    Traceback (most recent call last):
      File "/home/vcap/deps/0/python/lib/python3.9/site-packages/flask/app.py", line 1950, in full_dispatch_request
        rv = self.dispatch_request()
      File "/home/vcap/deps/0/python/lib/python3.9/site-packages/flask/app.py", line 1936, in dispatch_request
        return self.view_functions[rule.endpoint](**req.view_args)
      File "/home/vcap/app/app/utils/user.py", line 26, in wrap_func
        return func(*args, **kwargs)
      File "/home/vcap/app/app/main/views/send.py", line 1041, in send_notification
        recipient=session['recipient'] or InsensitiveDict(session['placeholders'])['address line 1'],
      File "/home/vcap/deps/0/python/lib/python3.9/site-packages/notifications_utils/insensitive_dict.py", line 41, in __getitem__
        return super().__getitem__(self.make_key(key))
    KeyError: 'addressline1'

I'm not sure how to reproduce this, but this should at least give
the user a better experience, instead of a 500 page.
This commit is contained in:
Ben Thorner
2022-02-18 12:38:02 +00:00
parent 73cc034676
commit a30a317153
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/main/views/send.py
View File

@@ -1025,7 +1025,9 @@ def get_template_error_dict(exception):
@main.route("/services/<uuid:service_id>/template/<uuid:template_id>/notification/check", methods=['POST'])
@user_has_permissions('send_messages', restrict_admin_usage=True)
def send_notification(service_id, template_id):
if {'recipient', 'placeholders'} - set(session.keys()):
recipient = get_recipient()
if not recipient:
return redirect(url_for(
'.send_one_off',
service_id=service_id,
@@ -1038,9 +1040,9 @@ def send_notification(service_id, template_id):
noti = notification_api_client.send_notification(
service_id,
template_id=db_template['id'],
recipient=session['recipient'] or InsensitiveDict(session['placeholders'])['address line 1'],
recipient=recipient,
personalisation=session['placeholders'],
sender_id=session['sender_id'] if 'sender_id' in session else None
sender_id=session.get('sender_id', None),
)
except HTTPError as exception:
current_app.logger.info('Service {} could not send notification: "{}"'.format(
@@ -1096,3 +1098,13 @@ def get_spreadsheet_column_headings_from_template(template):
column_headings.append(column_heading)
return column_headings
def get_recipient():
if {'recipient', 'placeholders'} - set(session.keys()):
return None
return (
session['recipient'] or
InsensitiveDict(session['placeholders']).get('address line 1')
)