mail-gpg 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 431a878dcca05522a519c9edca6a42e658c9b0c2
-  data.tar.gz: 18f9aeb942581062f8644e14391520d825829473
+  metadata.gz: 4dcf09f797ab779eb55e25010d36f0755f1e9faa
+  data.tar.gz: 9fc53e722aceea7fa514a08cd2978679106d44e3
 SHA512:
-  metadata.gz: baf5ef3a729d141a0d76d1fe1466a8cbbdc954e373af0c23e58020d64933af087cf3839a1ff6bdc9ccfebaa539aa2af5026b6c543848998912344361718a3163
-  data.tar.gz: 0052629db9f5c1a595c10d2dbf491be5f9544ae0fdb37b7541437bb2bf4866f559a9f7cd98d235d9cd414494e049905069c7dd730181d9fb749deec277943eaa
+  metadata.gz: 836562359cfe50d35a2e7950cdb32fbdbdca566bab08539dbd579b1acaa917d38ce60e5ed2c83820519b92e160a1327aa631143a571231573d417630046bfac9
+  data.tar.gz: a80337dde9e52d9a0e00e352f7e664ab3450aa48d5da3a0d2a25945bc9b7770b2a5d282eef1bd491d83b330138f0431c378cf315e43dd90bcc2e9b8011cfd5bd

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.2 2014-09-03
+
+* add option to import missing keys for signature verification
+* better Hkp error handling
+
 == 0.2.1 2014-07-23
 
 * keep original message id if set

data/lib/hkp.rb

@@ -3,8 +3,16 @@ require 'gpgme'
 
 # simple HKP client for public key retrieval
 class Hkp
-  def initialize(keyserver = nil)
-    @keyserver = keyserver || lookup_keyserver || 'http://pool.sks-keyservers.net:11371'
+  def initialize(options = {})
+    if String === options
+      options = { keyserver: options }
+    end
+    @keyserver = options.delete(:keyserver) || lookup_keyserver || 'http://pool.sks-keyservers.net:11371'
+    @options = { raise_errors: true }.merge options
+  end
+
+  def raise_errors?
+    !!@options[:raise_errors]
   end
 
   # hkp.search 'user@host.com'
@@ -32,6 +40,9 @@ class Hkp
     open("#{@keyserver}/pks/lookup?options=mr&op=get&search=0x#{URI.escape id}") do |f|
       return clean_key f.read
     end
+  rescue Exception
+    raise $! if raise_errors?
+    nil
   end
 
   # fetches key data by id and imports the found key(s) into GPG, returning the full hex fingerprints of the
@@ -41,6 +52,8 @@ class Hkp
     if key = fetch(id)
       GPGME::Key.import(key).imports.map(&:fpr)
     end
+  rescue Exception
+    raise $! if raise_errors?
   end
 
   private

data/lib/mail/gpg/message_patch.rb

@@ -1,3 +1,4 @@
+require 'hkp'
 require 'mail/gpg/delivery_handler'
 require 'mail/gpg/verify_result_attribute'
 
@@ -63,7 +64,13 @@ module Mail
       # pass verify: true to verify signatures as well. The gpgme verification
       # result will be available via decrypted_mail.verify_result
       def decrypt(options = {})
-        Mail::Gpg.decrypt(self, options)
+        import_missing_keys = options[:verify] && options.delete(:import_missing_keys)
+        Mail::Gpg.decrypt(self, options).tap do |decrypted|
+          if import_missing_keys && !decrypted.signature_valid?
+            import_keys_for_signatures! decrypted.signatures
+            return Mail::Gpg.decrypt(self, options)
+          end
+        end
       end
 
       # true if this mail is signed (but not encrypted)
@@ -77,8 +84,28 @@ module Mail
       # verified = signed_mail.verify()
       # verified.signature_valid?
       # signers = mail.signatures.map{|sig| sig.from}
+      #
+      # use import_missing_keys: true in order to try to fetch and import
+      # unknown keys for signature validation
       def verify(options = {})
-        Mail::Gpg.verify(self, options)
+        import_missing_keys = options.delete(:import_missing_keys)
+        Mail::Gpg.verify(self, options).tap do |verified|
+          if import_missing_keys && !verified.signature_valid?
+            import_keys_for_signatures! verified.signatures
+            return Mail::Gpg.verify(self, options)
+          end
+        end
+      end
+
+      def import_keys_for_signatures!(signatures = [])
+        hkp = Hkp.new raise_errors: false
+        signatures.each do |sig|
+          begin
+            sig.key
+          rescue EOFError # gpgme throws this for unknown keys :(
+            hkp.fetch_and_import sig.fingerprint
+          end
+        end
       end
 
 

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jens Kraemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail