mail-gpg 0.1.3 → 0.1.4

data/.gitignore

@@ -1,4 +1,5 @@
 .ruby-version
+.ruby-gemset
 *.gem
 *.rbc
 .bundle
@@ -17,3 +18,5 @@ test/tmp
 test/version_tmp
 test/gpghome/random_seed
 tmp
+*.swp
+tags

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
+  - 2.1.1
   - 2.0.0
   - 1.9.3
-gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
+env:
+  - RAILS=3.2.14
+  - RAILS=4.0.0

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mail-gpg.gemspec
 gemspec
+
+if ENV['RAILS']
+  gem 'actionmailer', "~> #{ENV['RAILS']}"
+  gem 'shoulda-context', '~> 1.1.5'
+end

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.4 2014-05-26
+
+* preserve return path headers and message id
+* fix signature verification
+
 == 0.1.3 2014-02-17
 
 * Signature checking implemented, thanks to Morten Andersen

data/lib/mail/gpg.rb

@@ -99,7 +99,7 @@ module Mail
     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|
+        %w(from to cc bcc subject reply_to in_reply_to return_path message_id).each do |field|
           send field, cleartext_mail.send(field)
         end
         cleartext_mail.header.fields.each do |field|

data/lib/mail/gpg/sign_part.rb

@@ -12,12 +12,25 @@ module Mail
         end
       end
 
-      def self.signature_valid?(plain, signature, options = {})
-        if !(signature.has_content_type? && ('application/pgp-signature' == signature.mime_type))
+      def self.signature_valid?(plain_part, signature_part, options = {})
+        if !(signature_part.has_content_type? &&
+             ('application/pgp-signature' == signature_part.mime_type))
           return false
         end
 
-        GpgmeHelper.sign_verify(plain.encoded, signature.body.encoded, options)
+        # Work around the problem that plain_part.raw_source prefixes an
+        # erronous 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)
       end
     end
   end

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/mail-gpg.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mail", "~> 2.5.3"
   spec.add_dependency "gpgme", "~> 2.0.2"
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "minitest", "~> 4.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "actionmailer", ">= 3.2.0"
   spec.add_development_dependency "pry-nav"

data/test/action_mailer_test.rb

@@ -3,68 +3,122 @@ require 'test_helper'
 class MyMailer < ActionMailer::Base
   default from: 'joe@foo.bar', to: 'jane@foo.bar'
 
-  def unencrypted
-    mail subject: 'unencrypted', body: 'unencrypted mail'
+  def unencrypted(bouncy=false)
+    mail subject: 'unencrypted', body: 'unencrypted mail', return_path: (bouncy && bounce_address)
   end
 
-  def encrypted
-    mail subject: 'encrypted', body: 'encrypted mail', gpg: {encrypt: true}
+  def encrypted(bouncy=false)
+    mail subject: 'encrypted', body: 'encrypted mail', return_path: (bouncy && bounce_address), gpg: {encrypt: true}
   end
 
-	def signed
-		mail	from: 'jane@foo.bar',
-					to: 'joe@foo.bar',
-					subject: 'signed', 
-					body: 'signed mail', 
-					gpg: {
-						sign: true,
-						password: 'abc'
-					}
-	end
+  def signed(bouncy=false)
+    mail  from: 'jane@foo.bar',
+          to: 'joe@foo.bar',
+          subject: 'signed',
+          body: 'signed mail',
+          return_path: (bouncy && bounce_address),
+          gpg: {
+            sign: true,
+            password: 'abc'
+          }
+  end
+
+  private
+
+  def bounce_address
+    SecureRandom.uuid + "@bounces.example.com"
+  end
 
 end
 
 class ActionMailerTest < Test::Unit::TestCase
-  context "with action mailer" do
+  context 'without return_path' do
     setup do
       (@emails = ActionMailer::Base.deliveries).clear
     end
 
-    should "send unencrypted mail" do
-      MyMailer.unencrypted.deliver
-      assert_equal 1, @emails.size
-      assert m = @emails.first
-      assert_equal 'unencrypted', m.subject
-    end
+    context "with action mailer" do
+      should "send unencrypted mail" do
+        MyMailer.unencrypted.deliver
+        assert_equal 1, @emails.size
+        assert m = @emails.first
+        assert_equal 'unencrypted', m.subject
+      end
+
 
+      should "send encrypted mail" do
+        assert m = MyMailer.encrypted
+        assert true == m.gpg[:encrypt]
+        m.deliver
+        assert_equal 1, @emails.size
+        assert m = @emails.first
+        assert_equal 'encrypted', m.subject
+        assert_equal 2, m.parts.size
+        assert encrypted = m.parts.detect{|p| p.content_type =~ /encrypted\.asc/}
+        assert clear = GPGME::Crypto.new.decrypt(encrypted.body.to_s, password: 'abc')
+        m = Mail.new clear
+        assert_equal 'encrypted mail', m.body.to_s
+      end
 
-    should "send encrypted mail" do
-      assert m = MyMailer.encrypted
-      assert true == m.gpg[:encrypt]
-      m.deliver
-      assert_equal 1, @emails.size
-      assert m = @emails.first
-      assert_equal 'encrypted', m.subject
-      assert_equal 2, m.parts.size
-      assert encrypted = m.parts.detect{|p| p.content_type =~ /encrypted\.asc/}
-      assert clear = GPGME::Crypto.new.decrypt(encrypted.body.to_s, password: 'abc')
-      m = Mail.new clear
-      assert_equal 'encrypted mail', m.body.to_s
+      should "send signed mail" do
+        assert m = MyMailer.signed
+        assert true == m.gpg[:sign]
+        m.deliver
+        assert_equal 1, @emails.size
+        assert delivered = @emails.first
+        assert_equal 'signed', delivered.subject
+        assert_equal 2, delivered.parts.size
+        assert sign_part = delivered.parts.detect{|p| p.content_type =~ /signature\.asc/}
+        GPGME::Crypto.new.verify(sign_part.body.to_s, signed_text: m.encoded) do |sig|
+          assert true == sig.valid?
+        end
+      end
     end
+  end
 
-		should "send signed mail" do
-			assert m = MyMailer.signed
-			assert true == m.gpg[:sign]
-			m.deliver
-			assert_equal 1, @emails.size
-			assert delivered = @emails.first
-			assert_equal 'signed', delivered.subject
-			assert_equal 2, delivered.parts.size
-			assert sign_part = delivered.parts.detect{|p| p.content_type =~ /signature\.asc/}
-			GPGME::Crypto.new.verify(sign_part.body.to_s, signed_text: m.encoded) do |sig| 
-				assert true == sig.valid?
-			end
-		end
+  context 'with return_path' do
+    setup do
+      (@emails = ActionMailer::Base.deliveries).clear
+    end
 
+    context "with action mailer" do
+      should "send unencrypted mail" do
+        MyMailer.unencrypted(true).deliver
+        assert_equal 1, @emails.size
+        assert m = @emails.first
+        assert_match /@bounces\.example\.com\z/, m.return_path
+        assert_equal 'unencrypted', m.subject
+      end
+
+      should "send encrypted mail" do
+        assert m = MyMailer.encrypted(true)
+        assert true == m.gpg[:encrypt]
+        m.deliver
+        assert_equal 1, @emails.size
+        assert m = @emails.first
+        assert_match /@bounces\.example\.com\z/, m.return_path
+        assert_equal 'encrypted', m.subject
+        assert_equal 2, m.parts.size
+        assert encrypted = m.parts.detect{|p| p.content_type =~ /encrypted\.asc/}
+        assert clear = GPGME::Crypto.new.decrypt(encrypted.body.to_s, password: 'abc')
+        m = Mail.new clear
+        assert_equal 'encrypted mail', m.body.to_s
+      end
+
+      should "send signed mail" do
+        assert m = MyMailer.signed(true)
+        assert true == m.gpg[:sign]
+        m.deliver
+        assert_equal 1, @emails.size
+        assert delivered = @emails.first
+        assert_match /@bounces\.example\.com\z/, delivered.return_path
+        assert_equal 'signed', delivered.subject
+        assert_equal 2, delivered.parts.size
+        assert sign_part = delivered.parts.detect{|p| p.content_type =~ /signature\.asc/}
+        GPGME::Crypto.new.verify(sign_part.body.to_s, signed_text: m.encoded) do |sig|
+          assert true == sig.valid?
+        end
+      end
+    end
   end
 end

data/test/gpg_test.rb

@@ -20,7 +20,6 @@ class GpgTest < Test::Unit::TestCase
     enc_part.content_type
   end
 
-
   def check_content(mail = @mail, encrypted = @encrypted)
     assert enc = encrypted.parts.last
     assert clear = GPGME::Crypto.new.decrypt(enc.to_s, password: 'abc').to_s
@@ -50,6 +49,7 @@ class GpgTest < Test::Unit::TestCase
     assert_equal mail.cc, signed.cc
     assert_equal mail.bcc, signed.bcc
     assert_equal mail.subject, signed.subject
+    assert_equal mail.return_path, signed.return_path
   end
 
   context "gpg installation" do
@@ -97,6 +97,7 @@ class GpgTest < Test::Unit::TestCase
     context 'mail with custom header' do
       setup do
         @mail.header['X-Custom-Header'] = 'custom value'
+        @mail.header['Return-Path'] = 'bounces@example.com'
         @signed = Mail::Gpg.sign(@mail, password: 'abc')
       end
 
@@ -114,6 +115,7 @@ class GpgTest < Test::Unit::TestCase
 
       should 'preserve customer header values' do
         assert_equal 'custom value', @signed.header['X-Custom-Header'].to_s
+        assert_equal 'bounces@example.com', @signed.return_path
       end
     end
 
@@ -224,6 +226,7 @@ class GpgTest < Test::Unit::TestCase
     context 'mail with custom header' do
       setup do
         @mail.header['X-Custom-Header'] = 'custom value'
+        @mail.header['Return-Path'] = 'bounces@example.com'
         @encrypted = Mail::Gpg.encrypt(@mail)
         @encrypted.header['X-Another-Header'] = 'another value'
       end
@@ -242,6 +245,7 @@ class GpgTest < Test::Unit::TestCase
 
       should 'preserve customer header values' do
         assert_equal 'custom value', @encrypted.header['X-Custom-Header'].to_s
+        assert_equal 'bounces@example.com', @encrypted.return_path
       end
 
       context 'when decrypted' do

data/test/sign_part_test.rb

@@ -2,19 +2,19 @@ require 'test_helper'
 require 'mail/gpg/sign_part'
 
 class SignPartTest < Test::Unit::TestCase
-	context 'SignPart' do
-		setup do
-			@mail = Mail.new do
-				to 'jane@foo.bar'
-				from 'joe@foo.bar'
-				subject 'test'
-				body 'i am unsigned'
-			end
-		end
+  context 'SignPart' do
+    setup do
+      @mail = Mail.new do
+        to 'jane@foo.bar'
+        from 'joe@foo.bar'
+        subject 'test'
+        body 'i am unsigned'
+      end
+    end
 
-		should 'roundtrip successfully' do
-			signature_part = Mail::Gpg::SignPart.new(@mail, password: 'abc')
-			assert Mail::Gpg::SignPart.signature_valid?(@mail, signature_part)
-		end
-	end
+    should 'roundtrip successfully' do
+      signature_part = Mail::Gpg::SignPart.new(@mail, password: 'abc')
+      assert Mail::Gpg::SignPart.signature_valid?(@mail, signature_part)
+    end
+  end
 end

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'test/unit'
 require 'shoulda/context'
 require 'mail-gpg'
 require 'action_mailer'
+require 'securerandom'
 
 begin
   require 'pry-nav'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,8 +156,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails3.gemfile
-- gemfiles/rails4.gemfile
 - lib/hkp.rb
 - lib/mail-gpg.rb
 - lib/mail/gpg.rb
@@ -193,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: GPG/MIME encryption plugin for the Ruby Mail Library

data/gemfiles/rails3.gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-
-gem 'mail', '~> 2.5.3'
-gem 'gpgme', '~> 2.0.2'
-gem 'actionmailer', '~> 3.2.14'
-
-gem 'shoulda-context', '~> 1.1.5'
-

data/gemfiles/rails4.gemfile

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-
-gem 'mail', '~> 2.5.3'
-gem 'gpgme', '~> 2.0.2'
-gem 'actionmailer', '~> 4.0.0'
-
-gem 'shoulda-context', '~> 1.1.5'
-
-