From ee0ed7d9ec822bcd5355c0d61930aa0f1ddccdb0 Mon Sep 17 00:00:00 2001
From: Son <son@son>
Date: Mon, 11 Oct 2021 12:19:21 +0200
Subject: [PATCH] refactor: use headers.py

---
 app/email/headers.py | 16 ++++++++++++++
 email_handler.py     | 52 +++++++++++++++-----------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/email/headers.py b/app/email/headers.py
index 3615e8a5..03b7594a 100644
--- a/app/email/headers.py
+++ b/app/email/headers.py
@@ -7,6 +7,8 @@ SUBJECT = "Subject"
 FROM = "From"
 TO = "To"
 CONTENT_TYPE = "Content-Type"
+CONTENT_DISPOSITION = "Content-Disposition"
+CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding"
 MIME_VERSION = "Mime-Version"
 REPLY_TO = "Reply-To"
 RECEIVED = "Received"
@@ -21,3 +23,17 @@ DKIM_HEADERS = [
     [MESSAGE_ID.encode(), DATE.encode()],
     [FROM.encode()],
 ]
+
+SL_DIRECTION = "X-SimpleLogin-Type"
+SL_EMAIL_LOG_ID = "X-SimpleLogin-EmailLog-ID"
+SL_ENVELOPE_FROM = "X-SimpleLogin-Envelope-From"
+SL_ENVELOPE_TO = "X-SimpleLogin-Envelope-To"
+
+MIME_HEADERS = [
+    MIME_VERSION,
+    CONTENT_TYPE,
+    CONTENT_DISPOSITION,
+    CONTENT_TRANSFER_ENCODING,
+]
+# convert to lowercase to facilitate header look up
+MIME_HEADERS = [h.lower() for h in MIME_HEADERS]
diff --git a/email_handler.py b/email_handler.py
index 94d101f4..72d75234 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -141,22 +141,6 @@ from app.utils import sanitize_email
 from init_app import load_pgp_public_keys
 from server import create_app, create_light_app
 
-# forward or reply
-_DIRECTION = "X-SimpleLogin-Type"
-
-
-_EMAIL_LOG_ID_HEADER = "X-SimpleLogin-EmailLog-ID"
-_ENVELOPE_FROM = "X-SimpleLogin-Envelope-From"
-_ENVELOPE_TO = "X-SimpleLogin-Envelope-To"
-
-_MIME_HEADERS = [
-    "MIME-Version",
-    "Content-Type",
-    "Content-Disposition",
-    "Content-Transfer-Encoding",
-]
-_MIME_HEADERS = [h.lower() for h in _MIME_HEADERS]
-
 
 newrelic_app = None
 if NEWRELIC_CONFIG_PATH:
@@ -436,13 +420,13 @@ def prepare_pgp_message(
     # copy all headers from original message except all standard MIME headers
     for i in reversed(range(len(clone_msg._headers))):
         header_name = clone_msg._headers[i][0].lower()
-        if header_name.lower() not in _MIME_HEADERS:
+        if header_name.lower() not in headers.MIME_HEADERS:
             msg[header_name] = clone_msg._headers[i][1]
 
     # Delete unnecessary headers in clone_msg except _MIME_HEADERS to save space
     delete_all_headers_except(
         clone_msg,
-        _MIME_HEADERS,
+        headers.MIME_HEADERS,
     )
 
     if clone_msg[headers.CONTENT_TYPE] is None:
@@ -748,17 +732,17 @@ def forward_email_to_mailbox(
     delete_all_headers_except(
         msg,
         [
-            "From",
-            "To",
-            "Cc",
-            "Subject",
+            headers.FROM,
+            headers.TO,
+            headers.CC,
+            headers.SUBJECT,
             # do not delete original message id
             headers.MESSAGE_ID,
             # References and In-Reply-To are used for keeping the email thread
             headers.REFERENCES,
             headers.IN_REPLY_TO,
         ]
-        + _MIME_HEADERS,
+        + headers.MIME_HEADERS,
     )
 
     # create PGP email if needed
@@ -787,12 +771,12 @@ def forward_email_to_mailbox(
             return False, status.E406
 
     # add custom header
-    add_or_replace_header(msg, _DIRECTION, "Forward")
+    add_or_replace_header(msg, headers.SL_DIRECTION, "Forward")
 
-    msg[_EMAIL_LOG_ID_HEADER] = str(email_log.id)
-    msg[_ENVELOPE_FROM] = envelope.mail_from
+    msg[headers.SL_EMAIL_LOG_ID] = str(email_log.id)
+    msg[headers.SL_ENVELOPE_FROM] = envelope.mail_from
     # when an alias isn't in the To: header, there's no way for users to know what alias has received the email
-    msg[_ENVELOPE_TO] = alias.email
+    msg[headers.SL_ENVELOPE_TO] = alias.email
 
     if not msg[headers.MESSAGE_ID]:
         LOG.w("missing message id header, create one")
@@ -987,17 +971,17 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
     delete_all_headers_except(
         msg,
         [
-            "From",
-            "To",
-            "Cc",
-            "Subject",
+            headers.FROM,
+            headers.TO,
+            headers.CC,
+            headers.SUBJECT,
             # do not delete original message id
             headers.MESSAGE_ID,
             # References and In-Reply-To are used for keeping the email thread
             headers.REFERENCES,
             headers.IN_REPLY_TO,
         ]
-        + _MIME_HEADERS,
+        + headers.MIME_HEADERS,
     )
 
     # replace the reverse-alias (i.e. "ra+string@simplelogin.co") by the contact email in the email body
@@ -1053,8 +1037,8 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
         LOG.w("missing date header, add one")
         msg[headers.DATE] = date_header
 
-    msg[_DIRECTION] = "Reply"
-    msg[_EMAIL_LOG_ID_HEADER] = str(email_log.id)
+    msg[headers.SL_DIRECTION] = "Reply"
+    msg[headers.SL_EMAIL_LOG_ID] = str(email_log.id)
 
     LOG.d(
         "send email from %s to %s, mail_options:%s,rcpt_options:%s",