From ea4b0b46321ff88bccf30f74cfc3fc540574eff8 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sun, 18 Jun 2023 14:39:10 +0200 Subject: [PATCH] remail: Fix closing boundaries EmailMessage.defects reports a CloseBoundaryNotFoundDefect on the outgoing PGP message. Add the missing closing boundary after the PGP payload section and fix up the closing boundaries format in msg_strip_.*(). Signed-off-by: Thomas Gleixner --- remail/mail.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/remail/mail.py b/remail/mail.py index 02c278f..1dd6860 100644 --- a/remail/mail.py +++ b/remail/mail.py @@ -230,6 +230,7 @@ def msg_set_gpg_payload(msg, encpl, bseed, addpgp=False): content += encpl + '\n' if addpgp: content += '-----END PGP MESSAGE-----\n\n' + content += '--%s--\n' % boundary msg_set_payload(msg, msg_from_string(content)) msg_set_header(msg, 'Mime-Version', '1') @@ -269,7 +270,7 @@ def msg_strip_html(msg): content += '--%s\n' % boundary content += m.as_string() content += '\n' - content += '--%s\n' % boundary + content += '--%s--\n' % boundary msg_set_payload(msg, msg_from_string(content)) def msg_sanitize_outlook(msg):