Mirror/app-MAIL-temp
1
0
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-11-18 01:40:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor handle_bounce

Browse source
This commit is contained in:
Son NK 2020-03-17 12:12:11 +01:00 committed by Son NK
parent 84ba2ed718
commit 1d579e7490
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
email_handler.py
View file

@ -420,13 +420,14 @@ def handle_reply(envelope, smtp: SMTP, msg: Message, rcpt_to: str) -> str:
alias.user, alias.user,
) )
handle_bounce(address, envelope, contact, alias, msg, smtp, user, mailbox_email) handle_bounce(contact, alias, msg, user, mailbox_email)
return "550 ignored" return "550 ignored"
# only mailbox can send email to the reply-email # only mailbox can send email to the reply-email
if envelope.mail_from.lower() != mailbox_email.lower(): if envelope.mail_from.lower() != mailbox_email.lower():
LOG.warning( LOG.warning(
f"Reply email can only be used by user email. Actual mail_from: %s. msg from header: %s, User email %s. reply_email %s", f"Reply email can only be used by mailbox. "
f"Actual mail_from: %s. msg from header: %s, Mailbox %s. reply_email %s",
envelope.mail_from, envelope.mail_from,
msg["From"], msg["From"],
mailbox_email, mailbox_email,
@ -520,7 +521,10 @@ def handle_reply(envelope, smtp: SMTP, msg: Message, rcpt_to: str) -> str:
return "250 Message accepted for delivery" return "250 Message accepted for delivery"
def handle_bounce(address, envelope, contact, alias, msg, smtp, user, mailbox_email): def handle_bounce(
contact: Contact, alias: Alias, msg: Message, user: User, mailbox_email: str
):
address = alias.email
fel: EmailLog = EmailLog.create(contact_id=contact.id, bounced=True) fel: EmailLog = EmailLog.create(contact_id=contact.id, bounced=True)
db.session.commit() db.session.commit()