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

[FIX] ir.mail_server: be more lenient when validating From address 

When a user has their email as name, the system will
construct the From header as "email<email>".
We previously forbade this, because the naive
check only counts the number of emails in
the From header.
We might need to drop that assert or implement
something better in the future.

bzr revid: odo@openerp.com-20130910143809-wu32dkz20es579nv
This commit is contained in:
Olivier Dony 2013-09-10 16:38:09 +02:00
parent c544085823
commit b24e37db63
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openerp/addons/base/ir/ir_mail_server.py
View File

@ -402,7 +402,8 @@ class ir_mail_server(osv.osv):
# The email's "Envelope From" (Return-Path), and all recipient addresses must only contain ASCII characters.
from_rfc2822 = extract_rfc2822_addresses(smtp_from)
assert len(from_rfc2822) == 1, "Malformed 'Return-Path' or 'From' address - it may only contain plain ASCII characters"
assert len(set(from_rfc2822)) == 1, ("Malformed 'Return-Path' or 'From' address: %r - "
"It should contain one plain ASCII email") % smtp_from
smtp_from = from_rfc2822[0]
email_to = message['To']
email_cc = message['Cc']