From 44b0aba4f399a0b7e31208a2d62d6f5984b05bfc Mon Sep 17 00:00:00 2001 From: Son Date: Tue, 10 May 2022 11:19:25 +0200 Subject: [PATCH 1/4] fix verp generation --- app/email_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/email_utils.py b/app/email_utils.py index a899ad5f..31fc8f57 100644 --- a/app/email_utils.py +++ b/app/email_utils.py @@ -1378,7 +1378,7 @@ def generate_verp_email( # Encoded as a list to minimize size of email address # Time is in minutes granularity and start counting on 2022-01-01 to reduce bytes to represent time data = [ - verp_type.bounce_forward.value, + verp_type.value, object_id, int((time.time() - VERP_TIME_START) / 60), ] From 4dbbc4ed5e4820f7d18f5223bbaec04a07ce9a3f Mon Sep 17 00:00:00 2001 From: Son Date: Tue, 10 May 2022 11:23:40 +0200 Subject: [PATCH 2/4] add test --- tests/test_email_utils.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/test_email_utils.py b/tests/test_email_utils.py index 513ddb2c..42fe8492 100644 --- a/tests/test_email_utils.py +++ b/tests/test_email_utils.py @@ -754,6 +754,13 @@ def test_generate_verp_email(object_id): assert info[1] == object_id +def test_generate_verp_email_forward_reply_phase(): + # make sure the verp type is taken into account in verp generation + assert generate_verp_email(VerpType.bounce_forward, 1) != generate_verp_email( + VerpType.bounce_reply, 1 + ) + + def test_add_header_multipart_with_invalid_part(): msg = load_eml_file("multipart_alternative.eml") parts = msg.get_payload() + ["invalid"] From b1b3c15a9f1479cf33e22db46a1eff344143516a Mon Sep 17 00:00:00 2001 From: Son Date: Tue, 10 May 2022 11:23:52 +0200 Subject: [PATCH 3/4] fix --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 9a2176c0..57b585b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -87,6 +87,7 @@ tldextract = "^3.1.2" flask-debugtoolbar-sqlalchemy = "^0.2.0" twilio = "^7.3.2" Deprecated = "^1.2.13" +cryptography = "37.0.1" [tool.poetry.dev-dependencies] pytest = "^7.0.0" From 21255866b6d43f1a078a7d9e10f0bbf2200f11b0 Mon Sep 17 00:00:00 2001 From: Son Date: Tue, 10 May 2022 14:53:50 +0200 Subject: [PATCH 4/4] improve test --- tests/test_email_utils.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/test_email_utils.py b/tests/test_email_utils.py index 42fe8492..a1207b36 100644 --- a/tests/test_email_utils.py +++ b/tests/test_email_utils.py @@ -755,10 +755,16 @@ def test_generate_verp_email(object_id): def test_generate_verp_email_forward_reply_phase(): - # make sure the verp type is taken into account in verp generation - assert generate_verp_email(VerpType.bounce_forward, 1) != generate_verp_email( - VerpType.bounce_reply, 1 - ) + """make sure the verp type is taken into account in verp generation""" + for phase in [ + VerpType.bounce_forward, + VerpType.bounce_reply, + VerpType.transactional, + ]: + verp = generate_verp_email(phase, 100) + verp_info = get_verp_info_from_email(verp) + assert verp_info[0] == phase + assert verp_info[1] == 100 def test_add_header_multipart_with_invalid_part():