darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 18:31:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3065 from alphagov/up-email-size-limit

Browse Source 
Increase email size limit to 2MBby pulling in new utils
This commit is contained in:
Pea M. Tyczynska
2020-12-16 16:14:58 +00:00
committed by GitHub
parent 34e8da7285 4fc3f95c41
commit bb41cabeb6
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notifications/validators.py
View File

@@ -153,7 +153,7 @@ def check_is_message_too_long(template_with_content):
) )
elif template_with_content.template_type == EMAIL_TYPE: elif template_with_content.template_type == EMAIL_TYPE:
message += ( message += (
f"Emails cannot be longer than 1000000 bytes. " f"Emails cannot be longer than 2000000 bytes. "
f"Your message is {template_with_content.content_size_in_bytes} bytes." f"Your message is {template_with_content.content_size_in_bytes} bytes."
) )
raise BadRequestError(message=message) raise BadRequestError(message=message)

2
requirements-app.txt
View File

@@ -29,7 +29,7 @@ notifications-python-client==5.7.0
# PaaS # PaaS
awscli-cwlogs==1.4.6 awscli-cwlogs==1.4.6
git+https://github.com/alphagov/notifications-utils.git@43.5.6#egg=notifications-utils==43.5.6 git+https://github.com/alphagov/notifications-utils.git@43.5.7#egg=notifications-utils==43.5.7
# gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains # gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains
prometheus-client==0.8.0 prometheus-client==0.8.0

14
requirements.txt
View File

@@ -31,7 +31,7 @@ notifications-python-client==5.7.0
# PaaS # PaaS
awscli-cwlogs==1.4.6 awscli-cwlogs==1.4.6
git+https://github.com/alphagov/notifications-utils.git@43.5.6#egg=notifications-utils==43.5.6 git+https://github.com/alphagov/notifications-utils.git@43.5.7#egg=notifications-utils==43.5.7
# gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains # gds-metrics requires prometheseus 0.2.0, override that requirement as 0.7.1 brings significant performance gains
prometheus-client==0.8.0 prometheus-client==0.8.0
@@ -42,14 +42,14 @@ alembic==1.4.3
amqp==1.4.9 amqp==1.4.9
anyjson==0.3.3 anyjson==0.3.3
attrs==20.3.0 attrs==20.3.0
awscli==1.18.194 awscli==1.18.197
bcrypt==3.2.0 bcrypt==3.2.0
billiard==3.3.0.23 billiard==3.3.0.23
bleach==3.2.1 bleach==3.2.1
blinker==1.4 blinker==1.4
boto==2.49.0 boto==2.49.0
boto3==1.16.34 boto3==1.16.37
botocore==1.19.34 botocore==1.19.37
certifi==2020.12.5 certifi==2020.12.5
chardet==3.0.4 chardet==3.0.4
click==7.1.2 click==7.1.2
@@ -62,7 +62,6 @@ geojson==2.5.0
govuk-bank-holidays==0.8 govuk-bank-holidays==0.8
greenlet==0.4.17 greenlet==0.4.17
idna==2.10 idna==2.10
importlib-metadata==3.1.1
Jinja2==2.11.2 Jinja2==2.11.2
jmespath==0.10.0 jmespath==0.10.0
kombu==3.0.37 kombu==3.0.37
@@ -71,8 +70,8 @@ MarkupSafe==1.1.1
mistune==0.8.4 mistune==0.8.4
monotonic==1.5 monotonic==1.5
orderedset==2.0.3 orderedset==2.0.3
packaging==20.7 packaging==20.8
phonenumbers==8.12.14 phonenumbers==8.12.15
pyasn1==0.4.8 pyasn1==0.4.8
pycparser==2.20 pycparser==2.20
pyparsing==2.4.7 pyparsing==2.4.7
@@ -93,4 +92,3 @@ statsd==3.3.0
urllib3==1.26.2 urllib3==1.26.2
webencodings==0.5.1 webencodings==0.5.1
Werkzeug==1.0.1 Werkzeug==1.0.1
zipp==3.4.0

6
tests/app/notifications/test_validators.py
View File

@@ -345,7 +345,7 @@ def test_check_is_message_too_long_fails(notify_db_session, show_prefix, char_co
def test_check_is_message_too_long_passes_for_long_email(sample_service): def test_check_is_message_too_long_passes_for_long_email(sample_service):
email_character_count = 1000003 email_character_count = 2000003
t = create_template(service=sample_service, content='a' * email_character_count, template_type='email') t = create_template(service=sample_service, content='a' * email_character_count, template_type='email')
template = templates_dao.dao_get_template_by_id_and_service_id(template_id=t.id, template = templates_dao.dao_get_template_by_id_and_service_id(template_id=t.id,
service_id=t.service_id) service_id=t.service_id)
@@ -356,8 +356,8 @@ def test_check_is_message_too_long_passes_for_long_email(sample_service):
assert e.value.status_code == 400 assert e.value.status_code == 400
expected_message = ( expected_message = (
'Your message is too long. ' + 'Your message is too long. ' +
'Emails cannot be longer than 1000000 bytes. ' + 'Emails cannot be longer than 2000000 bytes. ' +
'Your message is 1000084 bytes.' 'Your message is 2000084 bytes.'
) )
assert e.value.message == expected_message assert e.value.message == expected_message
assert e.value.fields == [] assert e.value.fields == []