mail-gpg 0.1.0 → 0.1.1

data/lib/mail/gpg.rb

@@ -23,18 +23,18 @@ module Mail
     # local keychain before sending the mail.
     # :always_trust : send encrypted mail to untrusted receivers, true by default
     def self.encrypt(cleartext_mail, options = {})
-			construct_mail(cleartext_mail, options) do
-				receivers = []
-				receivers += cleartext_mail.to if cleartext_mail.to
-				receivers += cleartext_mail.cc if cleartext_mail.cc
-				receivers += cleartext_mail.bcc if cleartext_mail.bcc
+      construct_mail(cleartext_mail, options) do
+        receivers = []
+        receivers += cleartext_mail.to if cleartext_mail.to
+        receivers += cleartext_mail.cc if cleartext_mail.cc
+        receivers += cleartext_mail.bcc if cleartext_mail.bcc
 
-				if options[:sign_as]
-					options[:sign] = true
-					options[:signers] = options.delete(:sign_as)
-				elsif options[:sign]
-					options[:signers] = cleartext_mail.from
-				end
+        if options[:sign_as]
+          options[:sign] = true
+          options[:signers] = options.delete(:sign_as)
+        elsif options[:sign]
+          options[:signers] = cleartext_mail.from
+        end
 
         add_part VersionPart.new
         add_part EncryptedPart.new(cleartext_mail,
@@ -44,16 +44,16 @@ module Mail
       end
     end
 
-		def self.sign(cleartext_mail, options = {})
-			construct_mail(cleartext_mail, options) do
-				options[:sign_as] ||= cleartext_mail.from
-				add_part SignPart.new(cleartext_mail, options)
-				add_part Mail::Part.new(cleartext_mail)	
+    def self.sign(cleartext_mail, options = {})
+      construct_mail(cleartext_mail, options) do
+        options[:sign_as] ||= cleartext_mail.from
+        add_part SignPart.new(cleartext_mail, options)
+        add_part Mail::Part.new(cleartext_mail)
 
-				content_type "multipart/signed; micalg=pgp-sha1; protocol=\"application/pgp-signature\"; boundary=#{boundary}"
-				body.preamble = options[:preamble] || "This is an OpenPGP/MIME signed message (RFC 4880 and 3156)"
-			end	
-		end
+        content_type "multipart/signed; micalg=pgp-sha1; protocol=\"application/pgp-signature\"; boundary=#{boundary}"
+        body.preamble = options[:preamble] || "This is an OpenPGP/MIME signed message (RFC 4880 and 3156)"
+      end
+    end
 
     def self.decrypt(encrypted_mail, options = {})
       if encrypted_mime?(encrypted_mail)
@@ -64,7 +64,7 @@ module Mail
         raise EncodingError, "Unsupported encryption format '#{encrypted_mail.content_type}'"
       end
     end
-    
+
     def self.encrypted?(mail)
       return true if encrypted_mime?(mail)
       return true if encrypted_inline?(mail)
@@ -73,7 +73,7 @@ module Mail
 
     private
 
-		def self.construct_mail(cleartext_mail, options, &block)	
+    def self.construct_mail(cleartext_mail, options, &block)
       Mail.new do
         self.perform_deliveries = cleartext_mail.perform_deliveries
         %w(from to cc bcc subject reply_to in_reply_to).each do |field|
@@ -82,9 +82,9 @@ module Mail
         cleartext_mail.header.fields.each do |field|
           header[field.name] = field.value if field.name =~ /^X-/
         end
-				instance_eval &block
-			end
-		end
+        instance_eval &block
+      end
+    end
 
     # decrypts PGP/MIME (RFC 3156, section 4) encrypted mail
     def self.decrypt_pgp_mime(encrypted_mail, options)
@@ -95,7 +95,17 @@ module Mail
       if !VersionPart.isVersionPart? encrypted_mail.parts[0]
         raise EncodingError, "RFC 3136 first part not a valid version part '#{encrypted_mail.parts[0]}'"
       end
-      Mail.new(DecryptedPart.new(encrypted_mail.parts[1], options))
+      Mail.new(DecryptedPart.new(encrypted_mail.parts[1], options)) do
+        %w(from to cc bcc subject reply_to in_reply_to).each do |field|
+          send field, encrypted_mail.send(field)
+        end
+        # copy header fields
+        # headers from the encrypted part (which are already set by Mail.new
+        # above) will be preserved.
+        encrypted_mail.header.fields.each do |field|
+          header[field.name] = field.value if field.name =~ /^X-/ && header[field.name].nil?
+        end
+      end
     end
 
     # decrypts inline PGP encrypted mail

data/lib/mail/gpg/decrypted_part.rb

@@ -7,9 +7,9 @@ module Mail
       # :verify: decrypt and verify
       def initialize(cipher_part, options = {})
         if cipher_part.mime_type != EncryptedPart::CONTENT_TYPE
-          raise EncodingError, "RFC 3136 incorrect mime type for encrypted part '#{cipher_part.mime_type}'"
+          raise EncodingError, "RFC 3156 incorrect mime type for encrypted part '#{cipher_part.mime_type}'"
         end
-      
+
         decrypted = GpgmeHelper.decrypt(cipher_part.body.decoded, options)
         super(decrypted)
       end

data/lib/mail/gpg/delivery_handler.rb

@@ -10,7 +10,7 @@ module Mail
             if options.delete(:encrypt)
               encrypted_mail = Mail::Gpg.encrypt(mail, options)
             elsif options[:sign] || options[:sign_as]
-							encrypted_mail = Mail::Gpg.sign(mail, options)
+              encrypted_mail = Mail::Gpg.sign(mail, options)
             else
               # encrypt and sign are off -> do not encrypt or sign
               yield

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/test/decrypted_part_test.rb

@@ -20,18 +20,18 @@ class DecryptedPartTest < Test::Unit::TestCase
       assert mail.message_id == @mail.message_id
       assert mail.message_id != @part.message_id
     end
-    
+
     should 'decrypt and verify' do
       assert mail = Mail::Gpg::DecryptedPart.new(@part, { :verify => true, :password => 'abc' })
       assert mail == @mail
       assert mail.message_id == @mail.message_id
       assert mail.message_id != @part.message_id
     end
-    
+
     should 'raise encoding error for non gpg mime type' do
       part = Mail::Part.new(@part)
       part.content_type = 'text/plain'
       assert_raise(EncodingError) { Mail::Gpg::DecryptedPart.new(part) }
-    end    
+    end
   end
 end

data/test/gpg_test.rb

@@ -28,20 +28,20 @@ class GpgTest < Test::Unit::TestCase
     assert_equal mail.to_s, clear
   end
 
-	def check_signature(mail = @mail, signed = @signed)
-		assert signature = signed.parts.detect{|p| p.content_type =~ /signature\.asc/}.body.to_s
-		GPGME::Crypto.new.verify(signature, signed_text: mail.encoded) do |sig| 
-			assert true == sig.valid?
-		end
-	end
+  def check_signature(mail = @mail, signed = @signed)
+    assert signature = signed.parts.detect{|p| p.content_type =~ /signature\.asc/}.body.to_s
+    GPGME::Crypto.new.verify(signature, signed_text: mail.encoded) do |sig|
+      assert true == sig.valid?
+    end
+  end
 
-	def check_mime_structure_signed(mail = @mail, signed = @signed)
-		assert_equal 2, signed.parts.size
-		sign_part, orig_part = signed.parts	
+  def check_mime_structure_signed(mail = @mail, signed = @signed)
+    assert_equal 2, signed.parts.size
+    sign_part, orig_part = signed.parts
 
-		assert_equal 'application/pgp-signature; name=signature.asc', sign_part.content_type
-		assert_equal orig_part.content_type, @mail.content_type
-	end
+    assert_equal 'application/pgp-signature; name=signature.asc', sign_part.content_type
+    assert_equal orig_part.content_type, @mail.content_type
+  end
 
   def check_headers_signed(mail = @mail, signed = @signed)
     assert_equal mail.to, signed.to
@@ -57,33 +57,33 @@ class GpgTest < Test::Unit::TestCase
     end
   end
 
-	context "gpg signed" do
-		setup do
-			@mail = Mail.new do
-				to 'joe@foo.bar'
-				from 'jane@foo.bar'
-				subject 'test test'
-				body 'sign me!'
-			end
-		end
-
-		context 'simple mail' do
-			setup do
-				@signed = Mail::Gpg.sign(@mail, password: 'abc')
-			end
-
-			should 'have same recipients and subject' do
-				check_headers_signed
-			end
-
-			should 'have proper gpgmime structure' do
-				check_mime_structure_signed
-			end
-
-			should 'have correct signature' do
-				check_signature
-			end
-		end
+  context "gpg signed" do
+    setup do
+      @mail = Mail.new do
+        to 'joe@foo.bar'
+        from 'jane@foo.bar'
+        subject 'test test'
+        body 'sign me!'
+      end
+    end
+
+    context 'simple mail' do
+      setup do
+        @signed = Mail::Gpg.sign(@mail, password: 'abc')
+      end
+
+      should 'have same recipients and subject' do
+        check_headers_signed
+      end
+
+      should 'have proper gpgmime structure' do
+        check_mime_structure_signed
+      end
+
+      should 'have correct signature' do
+        check_signature
+      end
+    end
 
     context 'mail with custom header' do
       setup do
@@ -153,7 +153,7 @@ class GpgTest < Test::Unit::TestCase
         assert_match /Rakefile/, original_part.parts.last.content_disposition
       end
     end
-	end
+  end
 
   context "gpg encrypted" do
 
@@ -188,7 +188,7 @@ class GpgTest < Test::Unit::TestCase
         assert mail == @mail
       end
     end
-    
+
     context 'simple mail (signed)' do
       setup do
         @encrypted = Mail::Gpg.encrypt(@mail, { :sign => true, :password => 'abc' })
@@ -210,12 +210,13 @@ class GpgTest < Test::Unit::TestCase
         assert mail = Mail::Gpg.decrypt(@encrypted, { :verify => true, :password => 'abc' })
         assert mail == @mail
       end
-    end    
+    end
 
     context 'mail with custom header' do
       setup do
         @mail.header['X-Custom-Header'] = 'custom value'
         @encrypted = Mail::Gpg.encrypt(@mail)
+        @encrypted.header['X-Another-Header'] = 'another value'
       end
 
       should 'have same recipients and subject' do
@@ -233,11 +234,26 @@ class GpgTest < Test::Unit::TestCase
       should 'preserve customer header values' do
         assert_equal 'custom value', @encrypted.header['X-Custom-Header'].to_s
       end
-      
-      should 'decrypt' do
-        assert mail = Mail::Gpg.decrypt(@encrypted, { :password => 'abc' })
-        assert mail == @mail
+
+      context 'when decrypted' do
+        setup do
+          @decrypted_mail = Mail::Gpg.decrypt(@encrypted, { :password => 'abc' })
+        end
+
+        should 'have same subject and body as the original' do
+          assert_equal @mail.subject, @decrypted_mail.subject
+          assert_equal @mail.body.to_s, @decrypted_mail.body.to_s
+        end
+
+        should 'preserve custom header from encrypted inner mail' do
+          assert_equal 'custom value', @decrypted_mail.header['X-Custom-Header'].to_s
+        end
+
+        should 'preserve custom header from outer mail' do
+          assert_equal 'another value', @decrypted_mail.header['X-Another-Header'].to_s
+        end
       end
+
     end
 
     context 'mail with multiple recipients' do
@@ -295,7 +311,7 @@ class GpgTest < Test::Unit::TestCase
         assert_match /encrypt me/, m.parts.first.body.to_s
         assert_match /Rakefile/, m.parts.last.content_disposition
       end
-      
+
       should 'decrypt' do
         assert mail = Mail::Gpg.decrypt(@encrypted, { :password => 'abc' })
         assert mail == @mail

data/test/message_test.rb

@@ -37,10 +37,10 @@ class MessageTest < Test::Unit::TestCase
       end
     end
 
-		context "with gpg signing only" do
-			setup do
-				@mail.gpg sign: true, password: 'abc'
-			end
+    context "with gpg signing only" do
+      setup do
+        @mail.gpg sign: true, password: 'abc'
+      end
 
       context "" do
         setup do
@@ -56,12 +56,12 @@ class MessageTest < Test::Unit::TestCase
           assert sign_part = m.parts.last
           assert m = Mail::Message.new(m.parts.last)
           assert !m.multipart?
-					GPGME::Crypto.new.verify(sign_part.body.to_s, signed_text: @mail.encoded) do |sig| 
-						assert true == sig.valid?
-					end
+          GPGME::Crypto.new.verify(sign_part.body.to_s, signed_text: @mail.encoded) do |sig| 
+            assert true == sig.valid?
+          end
         end
       end
-		end
+    end
 
     context "with gpg turned on" do
       setup do
@@ -111,7 +111,9 @@ class MessageTest < Test::Unit::TestCase
           assert m.multipart?
           assert m.encrypted?
           assert decrypted = m.decrypt(:password => 'abc')
+          assert_equal 'test', decrypted.subject
           assert decrypted == @mail
+          assert_equal 'i am unencrypted', decrypted.body.to_s
         end
 
         should "raise bad passphrase on decrypt" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail