From 70709d6a7f28746c5fc7b2d7687802f83f5c85e3 Mon Sep 17 00:00:00 2001
From: "Tobias Dussa (TGD)" <dussa@dfn-cert.de>
Date: Mon, 16 Sep 2024 15:55:32 +0200
Subject: [PATCH] Now handles UTF-8 messages more resiliently.
---
reaction-mailcreate/createMails.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/reaction-mailcreate/createMails.py b/reaction-mailcreate/createMails.py
index 9637f8f..a65b85a 100755
--- a/reaction-mailcreate/createMails.py
+++ b/reaction-mailcreate/createMails.py
@@ -20,6 +20,7 @@
from email.generator import Generator
from email.message import EmailMessage
+from email.mime.text import MIMEText
from email.utils import formatdate, make_msgid
import argparse
import csv
@@ -347,8 +348,8 @@ def createMail(data):
directory = os.path.dirname(output)
# Generate email body and attachments
- message = EmailMessage()
- message.set_content(template.render(data))
+ message = MIMEText(template.render(data))
+ message.set_charset('utf-8')
for attach in args.attach:
with open(attach, 'rb') as attachment:
message.add_attachment(attachment.read(), *magic.from_file(attach, mime=True).split('/'))
--
GitLab