pacnpal/django-anymail
1
0
Fork 0
mirror of https://github.com/pacnpal/django-anymail.git synced 2025-12-20 03:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Amazon SES: Fix header encoding problem

Browse Source 
A combination of long display name and
commas (or other special characters) could
result in invalid address headers.
See details in #369.

Fix by removing unnecessary email.policy
override, which was causing new header folding
code to run with headers built using Compat32
legacy header encoding. The two don't mix.

Fixes #369
This commit is contained in:
Mike Edmunds
2024-06-22 16:52:45 -07:00
parent c4b2e08b16
commit 567fbb52ab
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
anymail/backends/amazon_ses.py
View File

@@ -165,13 +165,10 @@ class AmazonSESV2SendEmailPayload(AmazonSESBasePayload):
Serialize self.mime_message as an RFC-5322/-2045 MIME message,
encoded as 7bit-clean, us-ascii byte data.
"""
# Amazon SES does not support `Content-Transfer-Encoding: 8bit`. And using 8bit
# with SES open or click tracking results in mis-encoded characters. To avoid
# this, convert any 8bit parts to 7bit quoted printable or base64. (We own
# self.mime_message, so destructively modifying it should be OK.)
# (You might think cte_type="7bit" in the email.policy below would cover this,
# but it seems that cte_type is only examined as the MIME parts are constructed,
# not when an email.generator serializes them.)
# Amazon SES discourages `Content-Transfer-Encoding: 8bit`. And using
# 8bit with SES open or click tracking results in mis-encoded characters.
# To avoid this, convert any 8bit parts to 7bit quoted printable or base64.
# (We own self.mime_message, so destructively modifying it should be OK.)
for part in self.mime_message.walk():
if part["Content-Transfer-Encoding"] == "8bit":
del part["Content-Transfer-Encoding"]
@@ -181,7 +178,8 @@ class AmazonSESV2SendEmailPayload(AmazonSESBasePayload):
else:
email.encoders.encode_base64(part)
self.mime_message.policy = email.policy.default.clone(cte_type="7bit")
# (All message and part headers should already be 7bit clean,
# so there's no need to try to override email.policy here.)
return self.mime_message.as_bytes()
def parse_recipient_status(self, response):