Merge pull request #23 from simple-login/spf-check

Spf check
This commit is contained in:
Son Nguyen Kim 2020-01-09 10:32:50 +01:00 committed by GitHub
commit 94ecfd7bbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View file

@ -208,5 +208,7 @@ def add_or_replace_header(msg: Message, header: str, value: str):
def delete_header(msg: Message, header: str):
if msg[header]:
del msg[header]
"""a header can appear several times in message."""
for h in msg._headers:
if h[0].lower() == header.lower():
msg._headers.remove(h)

View file

@ -110,7 +110,7 @@ class MailHandler:
gen_email = GenEmail.get_by(email=alias)
if not gen_email:
LOG.d("alias %s not exist")
LOG.d("alias %s not exist", alias)
# check if alias is custom-domain alias and if the custom-domain has catch-all enabled
alias_domain = get_email_domain_part(alias)
@ -264,6 +264,9 @@ class MailHandler:
msg, "List-Unsubscribe-Post", "List-Unsubscribe=One-Click"
)
# Received-SPF is injected by postfix-policyd-spf-python can reveal user original email
delete_header(msg, "Received-SPF")
LOG.d(
"send email from %s to %s, mail_options:%s,rcpt_options:%s",
alias,