Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

More robust extraction of domain from email address when generating message IDs.

Browse Source
This commit is contained in:
Hadley 2017-02-22 20:01:28 -08:00
parent 8e37f60686
commit 865733fc73
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/utils/smtp.py
View File

@ -18,7 +18,7 @@ def create_mail(from_, to, subject, text=None, attachment_data=None,
assert text or attachment_data assert text or attachment_data
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.utils import formatdate from email.utils import formatdate, parseaddr
from email import encoders from email import encoders
import uuid import uuid
@ -30,7 +30,12 @@ def create_mail(from_, to, subject, text=None, attachment_data=None,
outer.preamble = 'You will not see this in a MIME-aware mail reader.\n' outer.preamble = 'You will not see this in a MIME-aware mail reader.\n'
# generate a Message-Id for this email # generate a Message-Id for this email
msgid_domain = from_.partition("@")[2] # Parse out the address from the From line, and then the domain from that
from_email = parseaddr(from_)[1]
msgid_domain = from_email.partition("@")[2].strip()
if msgid_domain.endswith(">"):
# This can sometimes sneak through parseaddr if the input is malformed
msgid_domain = msgid_domain[:-1]
if not msgid_domain: if not msgid_domain:
# from address didn't provide a domain, let's make a best guess # from address didn't provide a domain, let's make a best guess
msgid_domain = safe_localhost() msgid_domain = safe_localhost()