Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix DKIM fail on reply phase: the DKIM-signature should be added at the end of processing

This commit is contained in:
Son NK 2019-12-17 21:43:31 +02:00
parent 4799721667
commit 569fda47a9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
email_handler.py
View File

@ -234,10 +234,10 @@ class MailHandler:
return "250 ignored" return "250 ignored"
# todo: add DKIM-Signature for custom domain # remove DKIM-Signature
# add DKIM-Signature for non-custom-domain alias if msg["DKIM-Signature"]:
if alias.endswith(EMAIL_DOMAIN): LOG.d("Remove DKIM-Signature %s", msg["DKIM-Signature"])
add_dkim_signature(msg, EMAIL_DOMAIN) del msg["DKIM-Signature"]
# email seems to come from alias # email seems to come from alias
msg.replace_header("From", alias) msg.replace_header("From", alias)
@ -258,6 +258,11 @@ class MailHandler:
envelope.rcpt_options, envelope.rcpt_options,
) )
# todo: add DKIM-Signature for custom domain
# add DKIM-Signature for non-custom-domain alias
if alias.endswith(EMAIL_DOMAIN):
add_dkim_signature(msg, EMAIL_DOMAIN)
msg_raw = msg.as_string().encode() msg_raw = msg.as_string().encode()
smtp.sendmail( smtp.sendmail(
alias, alias,