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 <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2023-06-18 14:39:10 +02:00
parent 2760a2d671
commit ea4b0b4632

View file

@ -230,6 +230,7 @@ def msg_set_gpg_payload(msg, encpl, bseed, addpgp=False):
content += encpl + '\n' content += encpl + '\n'
if addpgp: if addpgp:
content += '-----END PGP MESSAGE-----\n\n' content += '-----END PGP MESSAGE-----\n\n'
content += '--%s--\n' % boundary
msg_set_payload(msg, msg_from_string(content)) msg_set_payload(msg, msg_from_string(content))
msg_set_header(msg, 'Mime-Version', '1') msg_set_header(msg, 'Mime-Version', '1')
@ -269,7 +270,7 @@ def msg_strip_html(msg):
content += '--%s\n' % boundary content += '--%s\n' % boundary
content += m.as_string() content += m.as_string()
content += '\n' content += '\n'
content += '--%s\n' % boundary content += '--%s--\n' % boundary
msg_set_payload(msg, msg_from_string(content)) msg_set_payload(msg, msg_from_string(content))
def msg_sanitize_outlook(msg): def msg_sanitize_outlook(msg):