simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-09-20 15:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

handle both emails with reply+ and ra+ prefix

Browse source
This commit is contained in:
Son NK 2019-12-15 16:09:24 +02:00
parent 8c3834c957
commit 46b0872710
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
email_handler.py
View file

@ -79,19 +79,22 @@ class MailHandler:
smtp = SMTP(POSTFIX_SERVER, 25) smtp = SMTP(POSTFIX_SERVER, 25)
msg = Parser(policy=SMTPUTF8).parsestr(message_data) msg = Parser(policy=SMTPUTF8).parsestr(message_data)
if not envelope.rcpt_tos[0].startswith("reply+"): # Forward case # Reply case
LOG.debug("Forward phase") # reply+ or ra+ (reverse-alias) prefix
app = new_app() if envelope.rcpt_tos[0].startswith("reply+") or envelope.rcpt_tos[0].startswith(
"ra+"
with app.app_context(): ):
return self.handle_forward(envelope, smtp, msg)
else:
LOG.debug("Reply phase") LOG.debug("Reply phase")
app = new_app() app = new_app()
with app.app_context(): with app.app_context():
return self.handle_reply(envelope, smtp, msg) return self.handle_reply(envelope, smtp, msg)
else: # Forward case
LOG.debug("Forward phase")
app = new_app()
with app.app_context():
return self.handle_forward(envelope, smtp, msg)
def handle_forward(self, envelope, smtp, msg: EmailMessage) -> str: def handle_forward(self, envelope, smtp, msg: EmailMessage) -> str:
"""return *status_code message*""" """return *status_code message*"""
@ -146,10 +149,10 @@ class MailHandler:
# so it can pass DMARC check # so it can pass DMARC check
# replace the email part in from: header # replace the email part in from: header
from_header = ( from_header = (
get_email_name(msg["From"]) get_email_name(msg["From"])
+ " - " + " - "
+ website_email.replace("@", " at ") + website_email.replace("@", " at ")
+ f" <{forward_email.reply_email}>" + f" <{forward_email.reply_email}>"
) )
msg.replace_header("From", from_header) msg.replace_header("From", from_header)
LOG.d("new from header:%s", from_header) LOG.d("new from header:%s", from_header)