From ca2511220d1f0198a4e73432e87774a8fe30fba9 Mon Sep 17 00:00:00 2001 From: Gaudenz Steinlin Date: Tue, 12 Oct 2010 23:20:53 +0200 Subject: [PATCH 1/2] Encode multipart messages for crypt operations Sup crashed when trying to encode a multipart message for crypto operations. This encodes each part of the message separately. It also changes the encoding for text/* parts to quoted-printable. This only concerns the transfer encoding and does not change the charset in any way. --- lib/sup/modes/edit-message-mode.rb | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/sup/modes/edit-message-mode.rb b/lib/sup/modes/edit-message-mode.rb index f27eb5c..1bf9378 100644 --- a/lib/sup/modes/edit-message-mode.rb +++ b/lib/sup/modes/edit-message-mode.rb @@ -403,8 +403,11 @@ protected if @crypto_selector && @crypto_selector.val != :none from_email = Person.from_address(@header["From"]).email to_email = [@header["To"], @header["Cc"], @header["Bcc"]].flatten.compact.map { |p| Person.from_address(p).email } - m.header["Content-Transfer-Encoding"] = 'base64' - m.body = [m.body].pack('m') + if m.multipart? + m.each_part {|p| p = transfer_encode p} + else + m = transfer_encode m + end m = CryptoManager.send @crypto_selector.val, from_email, to_email, m end @@ -520,6 +523,25 @@ private [] end end + + def transfer_encode msg_part + ## return the message unchanged if it's already encoded + if (msg_part.header["Content-Transfer-Encoding"] == "base64" || + msg_part.header["Content-Transfer-Encoding"] == "quoted-printable") + return msg_part + end + + ## encode to quoted-printable for all text/* MIME types, + ## use base64 otherwise + if msg_part.header["Content-Type"] =~ /text\/.*/ + msg_part.header["Content-Transfer-Encoding"] = 'quoted-printable' + msg_part.body = [msg_part.body].pack('M') + else + msg_part.header["Content-Transfer-Encoding"] = 'base64' + msg_part.body = [msg_part.body].pack('m') + end + msg_part + end end end -- 1.7.2.3