diff options
| -rwxr-xr-x | Mailman/Handlers/CookHeaders.py | 13 | ||||
| -rwxr-xr-x | NEWS | 7 |
2 files changed, 17 insertions, 3 deletions
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py index c6f25044..78701850 100755 --- a/Mailman/Handlers/CookHeaders.py +++ b/Mailman/Handlers/CookHeaders.py @@ -120,7 +120,16 @@ def process(mlist, msg, msgdata): mlist, msg, msgdata, repl=False) # Do we change the from so the list takes ownership of the email if (msgdata.get('from_is_list') or mlist.from_is_list) and not fasttrack: - realname, email = parseaddr(msg['from']) + # Be as robust as possible here. + faddrs = getaddresses(msg.get_all('from', [])) + if len(faddrs) == 1: + realname, email = o_from = faddrs[0] + else: + # No From: or multiple addresses. Just punt and take + # the get_sender result. + realname = '' + email = msgdata['original_sender'] + o_from = (realname, email) if not realname: if mlist.isMember(email): realname = mlist.getMemberName(email) or email @@ -128,8 +137,6 @@ def process(mlist, msg, msgdata): realname = email # Remove domain from realname if it looks like an email address realname = re.sub(r'@([^ .]+\.)+[^ .]+$', '---', realname) - # Remember the original From: here for adding to Reply-To: below. - o_from = parseaddr(msg['from']) change_header('From', formataddr(('%s via %s' % (realname, mlist.real_name), mlist.GetListEmail())), @@ -5,6 +5,13 @@ Copyright (C) 1998-2014 by the Free Software Foundation, Inc. Here is a history of user visible changes to Mailman. +2.1.19 (xx-xxx-xxxx) + + Bug fixes and other patches + + - Handle missing From: header addresses for DMARC mitigation actions. + (LP: #1318025) + 2.1.18-1 (06-May-2014) Bug fixes and other patches |