mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-10 06:48:19 +02:00
Code Activity

Ensure UTF-8 surogates escaped on save - fix #159

Browse source
This commit is contained in:
Adam Dobrawy 2018-01-03 03:36:09 +01:00
parent 7252295601
commit 38d2ed11e0
4 changed files with 89 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
django_mailbox/models.py
View file

@ -346,7 +346,6 @@ class Mailbox(models.Model):
def _process_message(self, message):
msg = Message()
settings = utils.get_settings()
if settings['store_original_message']:
self._process_save_original_message(message, msg)
msg.mailbox = self
@ -386,10 +385,14 @@ class Mailbox(models.Model):
def _process_save_original_message(self, message, msg):
settings = utils.get_settings()
if six.PY3:
content = message.as_string().encode('ascii', 'surrogateescape')
else:
content = message.as_string()
if settings['compress_original_message']:
with NamedTemporaryFile(suffix=".eml.gz") as fp_tmp:
with gzip.GzipFile(fileobj=fp_tmp, mode="w") as fp:
fp.write(message.as_string().encode('utf-8'))
fp.write(content)
msg.eml.save(
"%s.eml.gz" % (uuid.uuid4(), ),
File(fp_tmp),
@ -399,7 +402,7 @@ class Mailbox(models.Model):
else:
msg.eml.save(
'%s.eml' % uuid.uuid4(),
ContentFile(message.as_string()),
ContentFile(content),
save=False
)