odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #286 from jbq/bugfix 

[FIX] mail: detection of MIME type

When parsing the mail headers, the content-type may has a 'type' attribute for Multipart/Related  objects (rfc2387).
Previous check would match on attached files of type text instead of real `content-type: text/`.
This commit is contained in:
Martin Trigaux 2014-06-02 18:10:36 +02:00
parent e61fb4d80a 310ecb0d60
commit 530d8bf3ce
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/mail/mail_thread.py
View File

@ -780,7 +780,14 @@ class mail_thread(osv.AbstractModel):
body = u''
if save_original:
attachments.append(('original_email.eml', message.as_string()))
if not message.is_multipart() or 'text/' in message.get('content-type', ''):
# Be careful, content-type may contain tricky content like in the
# following example so test the MIME type with startswith()
#
# Content-Type: multipart/related;
# boundary="_004_3f1e4da175f349248b8d43cdeb9866f1AMSPR06MB343eurprd06pro_";
# type="text/html"
if not message.is_multipart() or message.get('content-type', '').startswith("text/"):
encoding = message.get_content_charset()
body = message.get_payload(decode=True)
body = tools.ustr(body, encoding, errors='replace')