summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-04 14:18:52 +0200
committerKali Kaneko <kali@leap.se>2013-09-04 14:18:52 +0200
commit902cd22ae446d79c7edac1d6b74a123f4bd876a3 (patch)
treee38c3274f2986aa0b85a74342c08105406605b82
parent618f13ab5f8ce41b2065289ae341cce7e0674854 (diff)
parent551a4d7bd1630847333ba67b8609491372230540 (diff)
Merge remote-tracking branch 'chiiph/bug/properly_parse_addr' into develop
-rw-r--r--changes/properly_parse_addr2
-rw-r--r--src/leap/mx/mail_receiver.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/properly_parse_addr b/changes/properly_parse_addr
new file mode 100644
index 0000000..a41ba05
--- /dev/null
+++ b/changes/properly_parse_addr
@@ -0,0 +1,2 @@
+ o Properly parse mail address of the form "Name
+ <user@domain>". Fixes #3653. \ No newline at end of file
diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py
index 24ba2fe..5875034 100644
--- a/src/leap/mx/mail_receiver.py
+++ b/src/leap/mx/mail_receiver.py
@@ -24,6 +24,7 @@ import os
import uuid as pyuuid
import json
+import email.utils
from email import message_from_string
@@ -219,6 +220,7 @@ class MailReceiver(Service):
"Delivered-To: field")
log.msg("Mail owner: %s" % (owner,))
+ owner = email.utils.parseaddr(owner)[1]
log.msg("%s received a new mail" % (owner,))
dpubk = self._users_cdb.getPubKey(owner)
duuid = self._users_cdb.queryByAddress(owner)