From 9147206d0f8e0fdb16783a3b59de111d46c32086 Mon Sep 17 00:00:00 2001 From: Zichao Lin Date: Wed, 24 Jul 2024 00:24:10 +0800 Subject: [PATCH] fix: email address not displayed on the mask --- main.py | 6 +++++- template.html | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 1f5e48f..0c92209 100644 --- a/main.py +++ b/main.py @@ -4,6 +4,7 @@ import smtplib import email from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText +from email.utils import parseaddr import time import logging import socks @@ -20,7 +21,10 @@ def decode_mime_words(s): def add_mask(original_msg, content): original_subject = decode_mime_words(original_msg['Subject']) - header = f"""
Forwarded Email

From: {original_msg['From']}

To: {original_msg['To']}

Subject: {original_subject}

""" + from_name, from_address = parseaddr(original_msg['From']) + to_name, to_address = parseaddr(original_msg['To']) + print(original_msg) + header = f"""
Forwarded Email

From: {from_name} >{from_address}<

To: {to_name} >{to_address}<

Subject: {original_subject}

""" footer = f"""
FORWARDED

Notice:

 This is a automatically forwarded email, which means it may contains something bad.

 You shouldn't reply directly to this email, it will never reach your destination!

""" return header + content + footer diff --git a/template.html b/template.html index 9b7b9a7..3ba019d 100644 --- a/template.html +++ b/template.html @@ -25,8 +25,8 @@ Forwarded Email 		-

From: {original_msg['From']}

-

To: {original_msg['To']}

+

From: {from_name} >{from_address}<

+

To: {to_name} >{to_address}<

Subject: {original_subject}