Jafner/calibre-web
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Possible fix for #2301 (sending emails from custom domain name server)

Browse Source
This commit is contained in:
Ozzie Isaacs 2022-02-14 17:35:20 +01:00
parent e9b674f46e
commit ef7c6731bc
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cps/tasks/mail.py Normal file → Executable file
View File

@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import sys
import os import os
import smtplib import smtplib
import threading import threading
@ -25,7 +24,7 @@ import mimetypes
from io import StringIO from io import StringIO
from email.message import EmailMessage from email.message import EmailMessage
from email.utils import parseaddr
from email import encoders from email import encoders
@ -37,6 +36,7 @@ from cps.services import gmail
from cps import logger, config from cps import logger, config
from cps import gdriveutils from cps import gdriveutils
import uuid
log = logger.create() log = logger.create()
@ -122,15 +122,27 @@ class TaskEmail(CalibreTask):
self.asyncSMTP = None self.asyncSMTP = None
self.results = dict() self.results = dict()
# from calibre code:
# https://github.com/kovidgoyal/calibre/blob/731ccd92a99868de3e2738f65949f19768d9104c/src/calibre/utils/smtp.py#L60
def get_msgid_domain(self):
try:
# Parse out the address from the From line, and then the domain from that
from_email = parseaddr(self.settings["mail_from"])[1]
msgid_domain = from_email.partition('@')[2].strip()
# This can sometimes sneak through parseaddr if the input is malformed
msgid_domain = msgid_domain.rstrip('>').strip()
except Exception:
msgid_domain = ''
return msgid_domain or 'calibre-web.com'
def prepare_message(self): def prepare_message(self):
message = EmailMessage() message = EmailMessage()
# message = MIMEMultipart() # message = MIMEMultipart()
message['to'] = self.recipent message['From'] = self.settings["mail_from"]
message['from'] = self.settings["mail_from"] message['To'] = self.recipent
message['subject'] = self.subject message['Subject'] = self.subject
message['Message-Id'] = make_msgid('calibre-web')
message['Date'] = formatdate(localtime=True) message['Date'] = formatdate(localtime=True)
# text = self.text message['Message-Id'] = "{}@{}".format(uuid.uuid4(), self.get_msgid_domain()) # f"<{uuid.uuid4()}@{get_msgid_domain(from_)}>" # make_msgid('calibre-web')
message.set_content(self.text.encode('UTF-8'), "text", "plain") message.set_content(self.text.encode('UTF-8'), "text", "plain")
if self.attachment: if self.attachment:
data = self._get_attachment(self.filepath, self.attachment) data = self._get_attachment(self.filepath, self.attachment)