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

add contact to handle_unknown_mailbox logging

This commit is contained in:
Son NK 2020-09-16 17:24:42 +02:00
parent b9b442294b
commit 5c8d31111c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
email_handler.py
View File

@ -745,7 +745,7 @@ async def handle_reply(envelope, smtp: SMTP, msg: Message, rcpt_to: str) -> (boo
mailbox = alias.mailbox mailbox = alias.mailbox
else: else:
# only mailbox can send email to the reply-email # only mailbox can send email to the reply-email
handle_unknown_mailbox(envelope, msg, reply_email, user, alias) handle_unknown_mailbox(envelope, msg, reply_email, user, alias, contact)
return False, "550 SL E7" return False, "550 SL E7"
if ENFORCE_SPF and mailbox.force_spf and not alias.disable_email_spoofing_check: if ENFORCE_SPF and mailbox.force_spf and not alias.disable_email_spoofing_check:
@ -978,15 +978,18 @@ def spf_pass(
return True return True
def handle_unknown_mailbox(envelope, msg, reply_email: str, user: User, alias: Alias): def handle_unknown_mailbox(
envelope, msg, reply_email: str, user: User, alias: Alias, contact: Contact
):
LOG.warning( LOG.warning(
f"Reply email can only be used by mailbox. " f"Reply email can only be used by mailbox. "
f"Actual mail_from: %s. msg from header: %s, reverse-alias %s, %s %s", f"Actual mail_from: %s. msg from header: %s, reverse-alias %s, %s %s %s",
envelope.mail_from, envelope.mail_from,
msg["From"], msg["From"],
reply_email, reply_email,
alias, alias,
user, user,
contact,
) )
send_email_with_rate_control( send_email_with_rate_control(