mail-gpg 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b7a9e0a92468331734266a6593036b8541560b
-  data.tar.gz: d8f57974921bc967db1c74b137642261f74a36c0
+  metadata.gz: 078f6ded49865b4d9209f3287fc4a8847c93c440
+  data.tar.gz: 4933780b91d6e63c20f471f011dd27bdc8ad0552
 SHA512:
-  metadata.gz: 8578a1a0906b5fee56751fc4d74ae00e6312106134e567633f2a35504c7cb24b676fda6c851074bf33fff8a0161682cfeef35275b2c62133471c0d6c6a730b84
-  data.tar.gz: 56ee2a97e4bc93d1847273a659b928fd6a9c5a70d393d338b6e1e6a092d48d1da8682d2b52cdc7caf5b7581731fa94a049d9c3dac22fb4744f4507b87a7b785a
+  metadata.gz: 001a1eff43c868d332d3f88e880ffff134cc42dfe357e709172bc729049a3ca1e44037971781fc9a62480ca0deed913b842105ed22be78347060ffa8d05ffccd
+  data.tar.gz: c6da2c51dd13d9d119d8247a34876a30d0928f76f862cde51f93203872e20587f2bcf1df6480526aafb891767f6ca1ec4a6a394dddbe886b261ef77c00b511ec

data/.travis.yml

@@ -1,10 +1,18 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.1.3
-  - 2.0.0
-  - 1.9.3
+  - 2.3.1
+  - 2.2.5
+  - 2.1.9
 env:
-  - RAILS=3.2.21
-  - RAILS=4.1.10
-  - RAILS=4.2.1
+  - RAILS=3.2.22.1
+  - RAILS=4.1.14.1
+  - RAILS=4.2.5.1
+  - RAILS=5.0.0.1
+matrix:
+  exclude:
+    - rvm: 2.1.9
+      env: RAILS=5.0.0.1
+before_install:
+  - gem update bundler
+sudo: false
+cache: bundler

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.7 2016-09-28
+
+* fix replying to message objects #35
+* remove usage of deprecated alias_method_chain
+* fix tests with Rails >= 4
+* run tests with Rails 5, bump versions in travis config
+
 == 0.2.6 2015-10-20
 
 * fix handling of inline encrypted messages

data/README.md

@@ -184,6 +184,42 @@ hkp.fetch_and_import(id)
 The gpg option takes the same arguments as outlined above for the
 Mail::Message#gpg method.
 
+
+## Passwords and GnuPG versions >= 2.x
+
+GnuPG versions >= 2.x require the use of gpg-agent for key-handling. That's a problem for using password-protected keys non-interactively, because gpg-agent doesn't read from file-descriptors (which is the usual way to non-interactively provide passwords with GnuPG 1.x).
+
+With GnuPG 2.x you have two options to provide passwords to gpg-agent:
+
+1. Implement a pinentry-kind-of program that speaks the assuan-protocol and configure gpg-agent to use it.
+2. Run gpg-preset-passphrase and allow gpg-agent to read preset passwords.
+
+The second options is somewhat easier and is described below.
+
+Note: You *don't* need this if your key is *not* protected with a password.
+
+
+To feed a password into gpg-agent run this code early in your program:
+
+```ruby
+# The next two lines need adaption, obviously.
+fpr = fingerprint_of_key_to_unlock
+passphrase = gpg_passphrase_for_key
+# You may copy&paste the rest of this block unchanged. Maybe you want to change the error-handling, though.
+ENV['GPG_AGENT_INFO'] = `eval $(gpg-agent --allow-preset-passphrase --daemon) && echo $GPG_AGENT_INFO`
+`gpgconf --list-dir`.match(/libexecdir:(.*)/)
+gppbin = File.join($1, 'gpg-preset-passphrase')
+Open3.popen3(gppbin, '--preset', fpr) do |stdin, stdout, stderr|
+  stdin.puts passphrase
+  err = stderr.readlines
+  $stderr.puts err if ! err.to_s.empty?
+end
+# Hook to kill our gpg-agent when script finishes.
+Signal.trap(0, proc {  Process.kill('TERM', ENV['GPG_AGENT_INFO'].split(':')[1]) })
+
+```
+
+
 ## Running the tests
 
     bundle exec rake

data/lib/mail/gpg.rb

@@ -101,7 +101,7 @@ module Mail
     end
 
     STANDARD_HEADERS = %w(from to cc bcc reply_to subject in_reply_to return_path message_id)
-    MORE_HEADERS = %w(Auto-Submitted List-Id List-Unsubscribe References)
+    MORE_HEADERS = %w(Auto-Submitted OpenPGP References)
 
     private
 
@@ -117,7 +117,7 @@ module Mail
           header['Message-ID'] = cleartext_mail['Message-ID'].value
         end
         cleartext_mail.header.fields.each do |field|
-          if MORE_HEADERS.include?(field.name) or field.name =~ /^X-/
+          if MORE_HEADERS.include?(field.name) or field.name =~ /^(List|X)-/
             header[field.name] = field.value
           end
         end
@@ -151,14 +151,14 @@ module Mail
 
     # decrypts inline PGP encrypted mail
     def self.decrypt_pgp_inline(encrypted_mail, options)
-      InlineDecryptedMessage.new(encrypted_mail, options)
+      InlineDecryptedMessage.setup(encrypted_mail, options)
     end
 
     def self.verify(signed_mail, options = {})
       if signed_mime?(signed_mail)
-        Mail::Gpg::MimeSignedMessage.new signed_mail, options
+        Mail::Gpg::MimeSignedMessage.setup signed_mail, options
       elsif signed_inline?(signed_mail)
-        Mail::Gpg::InlineSignedMessage.new signed_mail, options
+        Mail::Gpg::InlineSignedMessage.setup signed_mail, options
       else
         signed_mail
       end

data/lib/mail/gpg/inline_decrypted_message.rb

@@ -12,9 +12,9 @@ module Mail
       # options are:
       #
       # :verify: decrypt and verify
-      def initialize(cipher_mail, options = {})
+      def self.setup(cipher_mail, options = {})
         if cipher_mail.multipart?
-          super() do
+          self.new do
             cipher_mail.header.fields.each do |field|
               header[field.name] = field.value
             end
@@ -48,7 +48,7 @@ module Mail
           end # of multipart
         else
           decrypted = cipher_mail.body.empty? ? '' : GpgmeHelper.decrypt(cipher_mail.body.decoded, options)
-          super() do
+          self.new do
             cipher_mail.header.fields.each do |field|
               header[field.name] = field.value
             end

data/lib/mail/gpg/inline_signed_message.rb

@@ -4,9 +4,9 @@ module Mail
   module Gpg
     class InlineSignedMessage < Mail::Message
 
-      def initialize(signed_mail, options = {})
+      def self.setup(signed_mail, options = {})
         if signed_mail.multipart?
-          super() do
+          self.new do
             global_verify_result = []
             signed_mail.header.fields.each do |field|
               header[field.name] = field.value
@@ -29,7 +29,7 @@ module Mail
             verify_result global_verify_result
           end # of multipart
         else
-          super() do
+          self.new do
             signed_mail.header.fields.each do |field|
               header[field.name] = field.value
             end

data/lib/mail/gpg/mime_signed_message.rb

@@ -4,10 +4,10 @@ module Mail
   module Gpg
     class MimeSignedMessage < Mail::Message
 
-      def initialize(signed_mail, options = {})
+      def self.setup(signed_mail, options = {})
         content_part, signature = signed_mail.parts
         success, vr = SignPart.verify_signature(content_part, signature, options)
-        super() do
+        self.new do
           verify_result vr
           signed_mail.header.fields.each do |field|
             header[field.name] = field.value

data/lib/mail/gpg/rails.rb

@@ -2,6 +2,8 @@ begin
   require 'action_mailer'
   require 'active_support'
   require 'mail/gpg/rails/action_mailer_base_patch'
+
+  Mail::Gpg::Rails::ActionMailerPatch.apply
 rescue LoadError
   # no actionmailer, do nothing
 end

data/lib/mail/gpg/rails/action_mailer_base_patch.rb

@@ -5,28 +5,29 @@ module Mail
     module Rails
 
       module ActionMailerPatch
-        extend ActiveSupport::Concern
 
-        included do
-          alias_method_chain :mail, :gpg
-          class << self
-            alias_method_chain :deliver_mail, :gpg
+        def self.apply
+          unless ActionMailer::Base < InstanceMethods
+            ActionMailer::Base.prepend InstanceMethods
+            ActionMailer::Base.singleton_class.prepend ClassMethods
           end
         end
 
-        def mail_with_gpg(headers = {}, &block)
-          headers = headers.dup
-          gpg_options = headers.delete :gpg
-          mail_without_gpg(headers, &block).tap do |m|
-            if gpg_options
-              m.gpg gpg_options
+        module InstanceMethods
+          def mail(headers = {}, &block)
+            headers = headers.dup
+            gpg_options = headers.delete :gpg
+            super(headers, &block).tap do |m|
+              if gpg_options
+                m.gpg gpg_options
+              end
             end
           end
         end
 
         module ClassMethods
-          def deliver_mail_with_gpg(mail, &block)
-            deliver_mail_without_gpg(mail) do
+          def deliver_mail(mail, &block)
+            super(mail) do
               Mail::Gpg::DeliveryHandler.deliver_mail mail, &block
             end
           end
@@ -34,10 +35,6 @@ module Mail
 
       end
 
-      unless ActionMailer::Base.included_modules.include?(ActionMailerPatch)
-        ActionMailer::Base.send :include, ActionMailerPatch
-      end
-
     end
   end
 end

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

data/test/gpg_test.rb

@@ -14,7 +14,7 @@ class GpgTest < Test::Unit::TestCase
     v_part, enc_part = encrypted.parts
 
     assert_match /Version: 1/, v_part.to_s
-    assert_equal 'application/pgp-encrypted; charset=UTF-8', v_part.content_type
+    assert_match /application\/pgp-encrypted(?:; charset=UTF-8)?/, v_part.content_type
 
     assert_equal 'application/octet-stream; name=encrypted.asc',
     enc_part.content_type

data/test/message_test.rb

@@ -74,13 +74,23 @@ class MessageTest < Test::Unit::TestCase
       context "" do
         setup do
           @mail.header['Auto-Submitted'] = 'foo'
+          @mail.header['List-Help'] = 'https://lists.example.org/help/'
+          @mail.header['List-Id'] = 'test.lists.example.org'
+          @mail.header['List-Owner'] = 'test-owner@lists.example.org'
+          @mail.header['List-Post'] = '<mailto:test@lists.example.org> (Subscribers only)'
           @mail.header['List-Unsubscribe'] = 'bar'
+          @mail.header['OpenPGP'] = 'id=0x0123456789abcdef0123456789abcdefdeadbeef (present on keyservers); (Only encrypted and signed emails are accepted)'
           @mail.deliver
         end
 
         should 'keep custom header value' do
           assert_equal 'foo', @mails.first.header['Auto-Submitted'].value
+          assert_equal 'https://lists.example.org/help/', @mails.first.header['List-Help'].value
+          assert_equal 'test.lists.example.org', @mails.first.header['List-Id'].value
+          assert_equal 'test-owner@lists.example.org', @mails.first.header['List-Owner'].value
+          assert_equal '<mailto:test@lists.example.org> (Subscribers only)', @mails.first.header['List-Post'].value
           assert_equal 'bar', @mails.first.header['List-Unsubscribe'].value
+          assert_equal 'id=0x0123456789abcdef0123456789abcdefdeadbeef (present on keyservers); (Only encrypted and signed emails are accepted)', @mails.first.header['OpenPGP'].value
         end
 
         should "deliver signed mail" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jens Kraemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -229,4 +229,3 @@ test_files:
 - test/sign_part_test.rb
 - test/test_helper.rb
 - test/version_part_test.rb
-has_rdoc: