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

small refactor

This commit is contained in:
Son NK 2020-05-09 22:54:55 +02:00
parent 4e4eda4efa
commit c6e293ef8e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
email_handler.py
View File

@ -478,14 +478,13 @@ def handle_reply(envelope, smtp: SMTP, msg: Message, rcpt_to: str) -> (bool, str
mailb: Mailbox = Mailbox.get_by(email=mailbox_email)
if ENFORCE_SPF and mailb.force_spf:
if msg[_IP_HEADER]:
ip = msg[_IP_HEADER]
if ip:
LOG.d("Enforce SPF")
try:
r = spf.check2(i=msg[_IP_HEADER], s=envelope.mail_from.lower(), h=None)
r = spf.check2(i=ip, s=envelope.mail_from.lower(), h=None)
except Exception:
LOG.error(
"SPF error, mailbox %s, ip %s", mailbox_email, msg[_IP_HEADER]
)
LOG.error("SPF error, mailbox %s, ip %s", mailbox_email, ip)
else:
# TODO: Handle temperr case (e.g. dns timeout)
# only an absolute pass, or no SPF policy at all is 'valid'