From c85ed7d29eaf24adb3423b4e822a2ef8d6897085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Casaj=C3=BAs?= Date: Wed, 29 Jun 2022 19:48:22 +0200 Subject: [PATCH] Fix: Always treat references header as a string (#1127) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Adrià Casajús --- email_handler.py | 4 +- tests/example_emls/reference_encoded.eml | 63 ++++++++++++++++++++++++ tests/test_email_handler.py | 11 +++++ 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 tests/example_emls/reference_encoded.eml diff --git a/email_handler.py b/email_handler.py index b205ad80..9bbf1915 100644 --- a/email_handler.py +++ b/email_handler.py @@ -959,7 +959,7 @@ def replace_sl_message_id_by_original_message_id(msg): # Replace SL Message-ID by original Message-ID in References header if msg[headers.REFERENCES]: - message_ids = msg[headers.REFERENCES].split() + message_ids = str(msg[headers.REFERENCES]).split() new_message_ids = [] for message_id in message_ids: matching = MessageIDMatching.get_by(sl_message_id=message_id) @@ -1292,7 +1292,7 @@ def replace_original_message_id(alias: Alias, email_log: EmailLog, msg: Message) # Replace all original headers in References header by SL Message ID header if needed if msg[headers.REFERENCES]: - message_ids = msg[headers.REFERENCES].split() + message_ids = str(msg[headers.REFERENCES]).split() new_message_ids = [] for message_id in message_ids: matching = MessageIDMatching.get_by(original_message_id=message_id) diff --git a/tests/example_emls/reference_encoded.eml b/tests/example_emls/reference_encoded.eml new file mode 100644 index 00000000..7db38388 --- /dev/null +++ b/tests/example_emls/reference_encoded.eml @@ -0,0 +1,63 @@ +Received: by mail-ed1-f49.google.com with SMTP id ej4so13657316edb.7 + for ; Mon, 27 Jun 2022 08:48:15 -0700 (PDT) +X-Gm-Message-State: AJIora8exR9DGeRFoKAtjzwLtUpH5hqx6Zt3tm8n4gUQQivGQ3fELjUV + yT7RQIfeW9Kv2atuOcgtmGYVU4iQ8VBeLmK1xvOYL4XpXfrT7ZrJNQ== +Authentication-Results: mx.google.com; + dkim=pass header.i=@matera.eu header.s=fnt header.b=XahYMey7; + dkim=pass header.i=@sendgrid.info header.s=smtpapi header.b="QOCS/yjt"; + spf=pass (google.com: domain of bounces+14445963-ab4e-csyndic.quartz=gmail.com@front-mail.matera.eu designates 168.245.4.42 as permitted sender) smtp.mailfrom="bounces+14445963-ab4e-csyndic.quartz=gmail.com@front-mail.matera.eu"; + dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=matera.eu +Received: from out.frontapp.com (unknown) + by geopod-ismtpd-3-0 (SG) + with ESMTP id d2gM2N7PT7W8d2-UEC4ESA + for ; + Mon, 27 Jun 2022 15:48:11.014 +0000 (UTC) +Content-Type: multipart/alternative; + boundary="----sinikael-?=_1-16563448907660.10629093370416887" +In-Reply-To: + +References: + + + + + +To: {{ alias_email }} +Subject: Something +Message-ID: +X-Mailer: Front (1.0; +https://frontapp.com; + +msgid=af07e94a66ece6564ae30a2aaac7a34c@frontapp.com) +X-Feedback-ID: 14445963:SG +X-SG-EID: + =?us-ascii?Q?XtlxQDg5i3HqMzQY2Upg19JPZBVl1RybInUUL2yta9uBoIU4KU1FMJ5DjWrz6g?= + =?us-ascii?Q?fJUK5Qmneg2uc46gwp5BdHdp6Foaq5gg3xJriv3?= + =?us-ascii?Q?9OA=2FWRifeylU9O+ngdNbOKXoeJAkROmp2mCgw9x?= + =?us-ascii?Q?uud+EclOT9mYVtbZsydOLLm6Y2PPswQl8lnmiku?= + =?us-ascii?Q?DAhkG15HTz2FbWGWNDFb7VrSsN5ddjAscr6sIHw?= + =?us-ascii?Q?S48R5fnXmfhPbmlCgqFjr0FGphfuBdNAt6z6w8a?= + =?us-ascii?Q?o9u1EYDIX7zWHZ+Tr3eyw=3D=3D?= +X-SG-ID: + =?us-ascii?Q?N2C25iY2uzGMFz6rgvQsb8raWjw0ZPf1VmjsCkspi=2FI9PhcvqXQTpKqqyZkvBe?= + =?us-ascii?Q?+2RscnQ4WPkA+BN1vYgz1rezTVIqgp+rlWrKk8o?= + =?us-ascii?Q?HoB5dzpX6HKWtWCVRi10zwlDN1+pJnySoIUrlaT?= + =?us-ascii?Q?PA2aqQKmMQbjTl0CUAFryR8hhHcxdS0cQowZSd7?= + =?us-ascii?Q?XNjJWLvCGF7ODwg=2FKr+4yRE8UvULS2nrdO2wWyQ?= + =?us-ascii?Q?AiFHdPdZsRlgNomEo=3D?= +X-Spamd-Result: default: False [-2.00 / 13.00]; + ARC_ALLOW(-1.00)[google.com:s=arc-20160816:i=1]; + MIME_GOOD(-0.10)[multipart/alternative,text/plain]; + REPLYTO_ADDR_EQ_FROM(0.00)[]; + FORGED_RECIPIENTS_FORWARDING(0.00)[]; + NEURAL_HAM(-0.00)[-0.981]; + FREEMAIL_TO(0.00)[gmail.com]; + RCVD_TLS_LAST(0.00)[]; + FREEMAIL_ENVFROM(0.00)[gmail.com]; + MIME_TRACE(0.00)[0:+,1:+,2:~]; + RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.49:from] + +------sinikael-?=_1-16563448907660.10629093370416887 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable + +Hello +------sinikael-?=_1-16563448907660.10629093370416887-- diff --git a/tests/test_email_handler.py b/tests/test_email_handler.py index c2a488f2..d42123f7 100644 --- a/tests/test_email_handler.py +++ b/tests/test_email_handler.py @@ -255,3 +255,14 @@ def test_email_sent_to_noreplies(flask_client): envelope.rcpt_tos = [config.NOREPLY] result = email_handler.handle(envelope, msg) assert result == status.E515 + + +def test_references_header(flask_client): + user = create_new_user() + alias = Alias.create_new_random(user) + msg = load_eml_file("reference_encoded.eml", {"alias_email": alias.email}) + envelope = Envelope() + envelope.mail_from = "somewhere@rainbow.com" + envelope.rcpt_tos = [alias.email] + result = email_handler.handle(envelope, msg) + assert result == status.E200