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

Decode from ASCII with replacement if errors are encountered while gathering text. Fixes #20.

Browse source
This commit is contained in:
Adam Coddington 2014-08-22 19:46:39 -07:00
parent dad65d802c
commit 591f1545c8
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
django_mailbox/models.py
View file

@ -3,6 +3,7 @@ import email
from email.message import Message as EmailMessage from email.message import Message as EmailMessage
from email.utils import formatdate, parseaddr from email.utils import formatdate, parseaddr
from email.encoders import encode_base64 from email.encoders import encode_base64
import logging
import mimetypes import mimetypes
import os.path import os.path
from quopri import encode as encode_quopri from quopri import encode as encode_quopri
@ -23,6 +24,9 @@ from six.moves.urllib.parse import parse_qs, unquote, urlparse
from .utils import convert_header_to_unicode from .utils import convert_header_to_unicode
logger = logging.getLogger(__name__)
STRIP_UNALLOWED_MIMETYPES = getattr( STRIP_UNALLOWED_MIMETYPES = getattr(
settings, settings,
'DJANGO_MAILBOX_STRIP_UNALLOWED_MIMETYPES', 'DJANGO_MAILBOX_STRIP_UNALLOWED_MIMETYPES',
@ -447,7 +451,7 @@ class Message(models.Model):
def get_text_body(self): def get_text_body(self):
def get_body_from_message(message): def get_body_from_message(message):
body = '' body = six.text_type('')
for part in message.walk(): for part in message.walk():
if ( if (
part.get_content_maintype() == 'text' part.get_content_maintype() == 'text'
@ -458,7 +462,19 @@ class Message(models.Model):
if charset: if charset:
this_part = this_part.decode(charset, 'replace') this_part = this_part.decode(charset, 'replace')
body += this_part try:
body += this_part
except ValueError:
# Since it did not declare a charset, and we *should*
# be 7-bit clean right now, let's assume it is ASCII.
body += this_part.decode('ascii', 'replace')
logger.warning(
'Error encountered while decoding text '
'payload from an incorrectly-constructed e-mail; '
'payload was converted to ASCII with '
'replacement, but some data may not be '
'represented as the sender intended.'
)
return body return body
return get_body_from_message( return get_body_from_message(