mail-gpg 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b7e6ef944bc641fa51f189b379859528044939a7eeca16d44cdeab8f46fdbc0c
-  data.tar.gz: aaa67237e62a803b4d369f81a70d71511e55b175c4ba95714137d6a0aa649cfe
+SHA1:
+  metadata.gz: 62b5362e85b38c7c385a84c56270dea80710517a
+  data.tar.gz: 78e3dacfe29c126d91089b380083d32edfd35d9f
 SHA512:
-  metadata.gz: 3c5224711ba09fe1b59cfb6076fe4c8c09838e0915411411fe044b5b04d76949bb74eb81e8e9a0242c8996a5be6c380c43d2662942fe58714c1d838c71ecf756
-  data.tar.gz: 25e41d97a17fc966d4839f96b7c827432c1e7f60905d9675238633660efa5a930c4ff9028c91c84ab8db66f0884601fb0ff5fc8b760c194ceae37fab261f09e8
+  metadata.gz: 36cadc855dc15bc8dbab934a44602d97c8a8831c575970ed61c4e3c3cce7bf86ac2d2cc956b910d0916aa53dd1702af001d57986d055e048e12f4868833c7931
+  data.tar.gz: d3a34b8a693ebf7b4e52aaff895af7275b01b335eac7c537443bab7eed61ceee1b86b5d7266fc35941e482d7ddd4e2044a42b8ad60f0e2189a4c7763bcd93c55

data/History.txt

@@ -1,3 +1,8 @@
+== 0.4.3 2020-02-12
+
+* fix bad signatures of some mails with Mail 2.7.1 by always enforcing
+  base64 encoding for signed content
+
 == 0.4.2 2019-09-02
 
 * do not die on invalid content-transfer encodings when checking if a message

data/lib/mail/gpg/sign_part.rb

@@ -24,19 +24,8 @@ module Mail
           return false
         end
 
-        # Work around the problem that plain_part.raw_source prefixes an
-        # erroneous CRLF, <https://github.com/mikel/mail/issues/702>.
-        if ! plain_part.raw_source.empty?
-          plaintext = [ plain_part.header.raw_source,
-                        "\r\n\r\n",
-                        plain_part.body.raw_source
-                      ].join
-        else
-          plaintext = plain_part.encoded
-        end
-
         signature = signature_part.body.encoded
-        GpgmeHelper.sign_verify(plaintext, signature, options)
+        GpgmeHelper.sign_verify(plain_part.encoded, signature, options)
       end
     end
   end

data/lib/mail/gpg/signed_part.rb

@@ -8,7 +8,7 @@ module Mail
 
       def self.build(cleartext_mail)
         new do
-          if cleartext_mail.body.multipart?
+          if cleartext_mail.multipart?
             if cleartext_mail.content_type =~ /^(multipart[^;]+)/
               # preserve multipart/alternative etc
               content_type $1
@@ -16,11 +16,18 @@ module Mail
               content_type 'multipart/mixed'
             end
             cleartext_mail.body.parts.each do |p|
-              add_part p
+              add_part Mail::Gpg::SignedPart.build(p)
             end
           else
             content_type cleartext_mail.content_type
-            body cleartext_mail.body.raw_source
+            if disposition = cleartext_mail.content_disposition
+              content_disposition disposition
+            end
+
+            # brute force approach to avoid messed up line endings that break
+            # signatures with Mail 2.7
+            body Mail::Encodings::Base64.encode cleartext_mail.body.to_s
+            body.encoding = 'base64'
           end
         end
       end

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

data/test/message_test.rb

@@ -38,24 +38,96 @@ class MessageTest < MailGpgTestCase
       end
     end
 
+    context "with multi line utf-8 body and gpg signing only" do
+      setup do
+        @mail.charset = 'UTF-8'
+        @body = <<-END
+        one
+        two
+        euro €
+        three
+        END
+
+        @mail.body = @body
+        @mail.gpg sign: true, password: 'abc'
+        @mail.deliver
+        @signed = Mail.new @mails.first.to_s
+        @verified = @signed.verify
+        # Mail gem from 2.7.1 onwards converts "\n" to "\r\n"
+        @body = Mail::Utilities.to_crlf(@body)
+      end
+
+      should 'keep body unchanged' do
+        body = @verified.body.to_s.force_encoding 'UTF-8'
+        assert_equal @body, body
+      end
+
+      should 'verify signed mail' do
+        refute @signed.encrypted?
+        assert @signed.multipart?, "message should be multipart"
+        assert @signed.signed?, "message should be signed"
+        assert sign_part = @signed.parts.last
+        GPGME::Crypto.new.verify(sign_part.body.to_s, signed_text: @signed.parts.first.encoded) do |sig|
+          assert sig.valid?, "Signature is not valid"
+        end
+
+        assert @verified.signature_valid?, "Signature check failed!"
+        refute @verified.multipart?
+      end
+
+    end
+
     context "with gpg signing only" do
       setup do
         @mail.gpg sign: true, password: 'abc'
       end
 
+      context 'with attachment' do
+        setup do
+          p = Mail::Part.new do
+            body "and\nanother part euro €"
+          end
+          @mail.add_part p
+          # if we do not force it to binary, the line ending is changed to CRLF. WTF?
+          @attachment_data = "this is\n € not an image".force_encoding(Encoding::BINARY)
+          @mail.attachments['test.jpg'] = { mime_type: 'image/jpeg',
+                                            content: @attachment_data }
+
+          @mail.deliver
+          @signed = Mail.new @mails.first.to_s
+          @verified = @signed.verify
+        end
+
+        should 'verify signature' do
+          assert @verified.signature_valid?
+        end
+
+        should 'have original three parts' do
+          assert_equal 3, @verified.parts.size
+          assert_equal 'i am unencrypted', @verified.parts[0].body.to_s
+          assert_equal "and\r\nanother part euro €", @verified.parts[1].body.to_s.force_encoding('UTF-8')
+          assert attachment = @verified.parts[2]
+          assert attachment.attachment?
+          assert_equal "attachment; filename=test.jpg", attachment.content_disposition
+          assert_equal @attachment_data, attachment.body.to_s
+        end
+
+      end
+
       context 'with multiple parts' do
         setup do
           p = Mail::Part.new do
-            body 'and another part'
+            body "and\nanother part euro €"
           end
           @mail.add_part p
           p = Mail::Part.new do
-            body 'and a third part'
+            content_type "text/html; charset=UTF-8"
+            body "and an\nHTML part €"
           end
           @mail.add_part p
 
           @mail.deliver
-          @signed = @mails.first
+          @signed = Mail.new @mails.first.to_s
           @verified = @signed.verify
         end
 
@@ -67,8 +139,8 @@ class MessageTest < MailGpgTestCase
           assert_equal 3, @mail.parts.size
           assert_equal 3, @verified.parts.size
           assert_equal 'i am unencrypted', @verified.parts[0].body.to_s
-          assert_equal 'and another part', @verified.parts[1].body.to_s
-          assert_equal 'and a third part', @verified.parts[2].body.to_s
+          assert_equal "and\r\nanother part euro €", @verified.parts[1].body.to_s.force_encoding('UTF-8')
+          assert_equal "and an\r\nHTML part €", @verified.parts[2].body.to_s.force_encoding('UTF-8')
         end
       end
 
@@ -133,25 +205,42 @@ class MessageTest < MailGpgTestCase
       end
     end
 
-    context 'with encryption and signing' do
+    context 'utf-8 with encryption and signing' do
       setup do
+        @body = "one\neuro €"
+        @mail.charset = 'UTF-8'
+        @mail.body @body
         @mail.gpg encrypt: true, sign: true, password: 'abc'
         @mail.deliver
+        assert_equal 1, @mails.size
+        assert m = @mails.first
+        @received = Mail.new m.to_s
       end
 
       should 'decrypt and check signature' do
-        assert_equal 1, @mails.size
-        assert m = @mails.first
+        m = @received
         assert_equal 'test', m.subject
         assert m.multipart?
         assert m.encrypted?
         assert decrypted = m.decrypt(:password => 'abc', verify: true)
         assert_equal 'test', decrypted.subject
         assert decrypted == @mail
-        assert_equal 'i am unencrypted', decrypted.body.to_s
+        assert_equal "one\r\neuro €", decrypted.body.to_s.force_encoding('UTF-8')
         assert decrypted.signature_valid?
         assert_equal 1, decrypted.signatures.size
       end
+
+      should 'preserve headers in raw_source output' do
+        m = @received
+        assert decrypted = m.decrypt(:password => 'abc', verify: true)
+        assert s = decrypted.raw_source
+        assert s.include?('From: joe@foo.bar')
+        assert s.include?('To: jane@foo.bar')
+        assert s.include?('Subject: test')
+
+        body = decrypted.body.to_s.force_encoding('UTF-8')
+        assert body.include?('euro €'), s
+      end
     end
 
     context "with gpg turned on" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jens Kraemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: GPG/MIME encryption plugin for the Ruby Mail Library