Disroot/gpg-lacre
9
15
Fork 4
Code Issues 38 Pull requests 1 Releases 3 Wiki Activity

Bugfix: Handle multipart messages and especially nested multipart messages correct and not mess up them

Browse source
This commit is contained in:
fkrone 2015-03-14 21:52:33 +01:00
parent 8f2b256dab
commit 600b57e6ef
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gpg-mailgate.py
View file

@ -183,8 +183,6 @@ def encrypt_all_payloads_mime( message, gpg_to_cmdline ):
submsg2.set_payload("\n" + message.get_payload())
else:
processed_payloads = generate_message_from_payloads(message)
processed_payloads.set_type("multipart/mixed")
processed_payloads.set_param('inline', "", 'Content-Disposition' )
submsg2.set_payload(processed_payloads.as_string())
message.preamble = "This is an OpenPGP/MIME encrypted message (RFC 2440 and 3156)"
@ -339,11 +337,11 @@ def sanitize_case_sense( address ):
def generate_message_from_payloads( payloads, submsg = None ):
if submsg == None:
submsg = email.message.Message()
submsg = email.mime.multipart.MIMEMultipart(payloads.get_content_subtype())
for payload in payloads.get_payload():
if( type( payload.get_payload() ) == list ):
submsg.attach(generate_message_from_payloads(payload, submsg))
submsg.attach(attach_payload_list_to_message(payload, email.mime.multipart.MIMEMultipart(payload.get_content_subtype())))
else:
submsg.attach(payload)