simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2025-02-24 07:43:54 +08:00
Code Issues Projects Releases Packages Wiki Activity

refactor

Browse source
This commit is contained in:
Son NK 2021-03-17 10:16:09 +01:00
parent d0dd64bf7b
commit 826e4455cf
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/email_utils.py
View file

@ -63,7 +63,6 @@ from app.utils import (
convert_to_alphanumeric, convert_to_alphanumeric,
sanitize_email, sanitize_email,
) )
from email_handler import _IP_HEADER
def render(template_name, **kwargs) -> str: def render(template_name, **kwargs) -> str:
@ -997,8 +996,10 @@ def parse_id_from_bounce(email_address: str) -> int:
return int(email_address[email_address.find("+") : email_address.rfind("+")]) return int(email_address[email_address.find("+") : email_address.rfind("+")])
_IP_HEADER = "X-SimpleLogin-Client-IP"
def spf_pass( def spf_pass(
ip: str,
envelope, envelope,
mailbox: Mailbox, mailbox: Mailbox,
user: User, user: User,
@ -1006,6 +1007,7 @@ def spf_pass(
contact_email: str, contact_email: str,
msg: Message, msg: Message,
) -> bool: ) -> bool:
ip = msg[_IP_HEADER]
if ip: if ip:
LOG.d("Enforce SPF on %s %s", ip, envelope.mail_from) LOG.d("Enforce SPF on %s %s", ip, envelope.mail_from)
try: try:

5
email_handler.py
View file

@ -125,7 +125,7 @@ from server import create_app, create_light_app
# forward or reply # forward or reply
_DIRECTION = "X-SimpleLogin-Type" _DIRECTION = "X-SimpleLogin-Type"
_IP_HEADER = "X-SimpleLogin-Client-IP"
_EMAIL_LOG_ID_HEADER = "X-SimpleLogin-EmailLog-ID" _EMAIL_LOG_ID_HEADER = "X-SimpleLogin-EmailLog-ID"
_ENVELOPE_FROM = "X-SimpleLogin-Envelope-From" _ENVELOPE_FROM = "X-SimpleLogin-Envelope-From"
@ -804,8 +804,7 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
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:
ip = msg[_IP_HEADER] if not spf_pass(envelope, mailbox, user, alias, contact.website_email, msg):
if not spf_pass(ip, envelope, mailbox, user, alias, contact.website_email, msg):
# cannot use 4** here as sender will retry. 5** because that generates bounce report # cannot use 4** here as sender will retry. 5** because that generates bounce report
return True, "250 SL E11" return True, "250 SL E11"