Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle "multipart/signed" in add_header()

This commit is contained in:
Son NK 2020-12-31 15:50:03 +01:00
parent ef2624ccea
commit a34af98de8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/email_utils.py
View File

@ -758,7 +758,8 @@ def decode_text(text: str, encoding: EmailEncoding = EmailEncoding.NO) -> str:
def add_header(msg: Message, text_header, html_header) -> Message: def add_header(msg: Message, text_header, html_header) -> Message:
if msg.get_content_type() == "text/plain": content_type = msg.get_content_type().lower()
if content_type == "text/plain":
encoding = get_encoding(msg) encoding = get_encoding(msg)
payload = msg.get_payload() payload = msg.get_payload()
if type(payload) is str: if type(payload) is str:
@ -768,7 +769,7 @@ def add_header(msg: Message, text_header, html_header) -> Message:
{decode_text(payload, encoding)}""" {decode_text(payload, encoding)}"""
clone_msg.set_payload(encode_text(new_payload, encoding)) clone_msg.set_payload(encode_text(new_payload, encoding))
return clone_msg return clone_msg
elif msg.get_content_type() == "text/html": elif content_type == "text/html":
encoding = get_encoding(msg) encoding = get_encoding(msg)
payload = msg.get_payload() payload = msg.get_payload()
if type(payload) is str: if type(payload) is str:
@ -788,7 +789,7 @@ def add_header(msg: Message, text_header, html_header) -> Message:
clone_msg = copy(msg) clone_msg = copy(msg)
clone_msg.set_payload(encode_text(new_payload, encoding)) clone_msg.set_payload(encode_text(new_payload, encoding))
return clone_msg return clone_msg
elif msg.get_content_type() in ("multipart/alternative", "multipart/related"): elif content_type in ("multipart/alternative", "multipart/related"):
new_parts = [] new_parts = []
for part in msg.get_payload(): for part in msg.get_payload():
new_parts.append(add_header(part, text_header, html_header)) new_parts.append(add_header(part, text_header, html_header))
@ -796,10 +797,10 @@ def add_header(msg: Message, text_header, html_header) -> Message:
clone_msg.set_payload(new_parts) clone_msg.set_payload(new_parts)
return clone_msg return clone_msg
elif msg.get_content_type() == "multipart/mixed": elif content_type in ("multipart/mixed", "multipart/signed"):
new_parts = [] new_parts = []
parts = list(msg.get_payload()) parts = list(msg.get_payload())
LOG.d("only add header for the first part") LOG.d("only add header for the first part for %s", content_type)
for ix, part in enumerate(parts): for ix, part in enumerate(parts):
if ix == 0: if ix == 0:
new_parts.append(add_header(part, text_header, html_header)) new_parts.append(add_header(part, text_header, html_header))
@ -810,7 +811,7 @@ def add_header(msg: Message, text_header, html_header) -> Message:
clone_msg.set_payload(new_parts) clone_msg.set_payload(new_parts)
return clone_msg return clone_msg
LOG.d("No header added for %s", msg.get_content_type()) LOG.d("No header added for %s", content_type)
return msg return msg