mirror of
https://github.com/simple-login/app.git
synced 2024-09-30 05:31:30 +02:00
add delete_header()
This commit is contained in:
parent
44527c6c4e
commit
ba46d8f7e0
@ -205,3 +205,8 @@ def add_or_replace_header(msg: Message, header: str, value: str):
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
# the header exists already
|
# the header exists already
|
||||||
msg.replace_header(header, value)
|
msg.replace_header(header, value)
|
||||||
|
|
||||||
|
|
||||||
|
def delete_header(msg: Message, header: str):
|
||||||
|
if msg[header]:
|
||||||
|
del msg[header]
|
@ -45,7 +45,7 @@ from app.email_utils import (
|
|||||||
send_email,
|
send_email,
|
||||||
add_dkim_signature,
|
add_dkim_signature,
|
||||||
get_email_domain_part,
|
get_email_domain_part,
|
||||||
add_or_replace_header)
|
add_or_replace_header, delete_header)
|
||||||
from app.extensions import db
|
from app.extensions import db
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
from app.models import GenEmail, ForwardEmail, ForwardEmailLog, CustomDomain
|
from app.models import GenEmail, ForwardEmail, ForwardEmailLog, CustomDomain
|
||||||
@ -162,9 +162,7 @@ class MailHandler:
|
|||||||
add_or_replace_header(msg, "X-SimpleLogin-Type", "Forward")
|
add_or_replace_header(msg, "X-SimpleLogin-Type", "Forward")
|
||||||
|
|
||||||
# remove reply-to header if present
|
# remove reply-to header if present
|
||||||
if msg["Reply-To"]:
|
delete_header(msg, "Reply-To")
|
||||||
LOG.d("Delete reply-to header %s", msg["Reply-To"])
|
|
||||||
del msg["Reply-To"]
|
|
||||||
|
|
||||||
# change the from header so the sender comes from @SL
|
# change the from header so the sender comes from @SL
|
||||||
# so it can pass DMARC check
|
# so it can pass DMARC check
|
||||||
@ -246,10 +244,7 @@ class MailHandler:
|
|||||||
|
|
||||||
return "450 ignored"
|
return "450 ignored"
|
||||||
|
|
||||||
# remove DKIM-Signature
|
delete_header(msg, "DKIM-Signature")
|
||||||
if msg["DKIM-Signature"]:
|
|
||||||
LOG.d("Remove DKIM-Signature %s", msg["DKIM-Signature"])
|
|
||||||
del msg["DKIM-Signature"]
|
|
||||||
|
|
||||||
# the email comes from alias
|
# the email comes from alias
|
||||||
msg.replace_header("From", alias)
|
msg.replace_header("From", alias)
|
||||||
|
Loading…
Reference in New Issue
Block a user