From ba46d8f7e06d73c73de1851c1642f0efdb10f0d0 Mon Sep 17 00:00:00 2001 From: Son NK Date: Tue, 7 Jan 2020 19:49:26 +0100 Subject: [PATCH] add delete_header() --- app/email_utils.py | 7 ++++++- email_handler.py | 11 +++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/email_utils.py b/app/email_utils.py index 2ae3cb89..a07c690d 100644 --- a/app/email_utils.py +++ b/app/email_utils.py @@ -204,4 +204,9 @@ def add_or_replace_header(msg: Message, header: str, value: str): msg.add_header(header, value) except ValueError: # the header exists already - msg.replace_header(header, value) \ No newline at end of file + msg.replace_header(header, value) + + +def delete_header(msg: Message, header: str): + if msg[header]: + del msg[header] \ No newline at end of file diff --git a/email_handler.py b/email_handler.py index 60572a27..983e6fb2 100644 --- a/email_handler.py +++ b/email_handler.py @@ -45,7 +45,7 @@ from app.email_utils import ( send_email, add_dkim_signature, get_email_domain_part, - add_or_replace_header) + add_or_replace_header, delete_header) from app.extensions import db from app.log import LOG from app.models import GenEmail, ForwardEmail, ForwardEmailLog, CustomDomain @@ -162,9 +162,7 @@ class MailHandler: add_or_replace_header(msg, "X-SimpleLogin-Type", "Forward") # remove reply-to header if present - if msg["Reply-To"]: - LOG.d("Delete reply-to header %s", msg["Reply-To"]) - del msg["Reply-To"] + delete_header(msg, "Reply-To") # change the from header so the sender comes from @SL # so it can pass DMARC check @@ -246,10 +244,7 @@ class MailHandler: return "450 ignored" - # remove DKIM-Signature - if msg["DKIM-Signature"]: - LOG.d("Remove DKIM-Signature %s", msg["DKIM-Signature"]) - del msg["DKIM-Signature"] + delete_header(msg, "DKIM-Signature") # the email comes from alias msg.replace_header("From", alias)