mail-gpg 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48024e5411ba53abbdadf7a3cde7b6cbb86acaa3c81a44dacbf77cd6e5fb7021
-  data.tar.gz: 9dba324ef49fda99768f398ff9b4799c34c661f35bd1943eecc33f906479ac5e
+  metadata.gz: b7e6ef944bc641fa51f189b379859528044939a7eeca16d44cdeab8f46fdbc0c
+  data.tar.gz: aaa67237e62a803b4d369f81a70d71511e55b175c4ba95714137d6a0aa649cfe
 SHA512:
-  metadata.gz: db9a05bf279e61fc450b5b222ebf61a0e85797da432887ad6adda5e03e9d1cea1ccb73919ab2736df731a32a54559b2106eb651a982c4be438603c0f61602ebb
-  data.tar.gz: e39c89fa18eba088d462e7b79ab3c5168495520f9cc32ec580ceaa75ba440be720fe6abc7c713c18afa85858253d2024d5af577aa0ed5567fa61189689e681f8
+  metadata.gz: 3c5224711ba09fe1b59cfb6076fe4c8c09838e0915411411fe044b5b04d76949bb74eb81e8e9a0242c8996a5be6c380c43d2662942fe58714c1d838c71ecf756
+  data.tar.gz: 25e41d97a17fc966d4839f96b7c827432c1e7f60905d9675238633660efa5a930c4ff9028c91c84ab8db66f0884601fb0ff5fc8b760c194ceae37fab261f09e8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.4.2 2019-09-02
+
+* do not die on invalid content-transfer encodings when checking if a message
+  is inline-signed or encrypted
+
 == 0.4.1 2019-07-08
 
 * do not modify argument hash #61

data/lib/mail/gpg.rb

@@ -17,10 +17,13 @@ require 'mail/gpg/inline_signed_message'
 
 module Mail
   module Gpg
+    BEGIN_PGP_MESSAGE_MARKER = /^-----BEGIN PGP MESSAGE-----/
+    BEGIN_PGP_SIGNED_MESSAGE_MARKER = /^-----BEGIN PGP SIGNED MESSAGE-----/
+
     # options are:
     # :sign: sign message using the sender's private key
     # :sign_as: sign using this key (give the corresponding email address or key fingerprint)
-    # :passphrase: passphrase for the signing key
+    # :password: passphrase for the signing key
     # :keys: A hash mapping recipient email addresses to public keys or public
     # key ids. Imports any keys given here that are not already part of the
     # local keychain before sending the mail.
@@ -198,10 +201,10 @@ module Mail
     # check if inline PGP (i.e. if any parts of the mail includes
     # the PGP MESSAGE marker)
     def self.encrypted_inline?(mail)
-      return true if mail.body.include?('-----BEGIN PGP MESSAGE-----')
+      return true if mail.body.to_s =~ BEGIN_PGP_MESSAGE_MARKER rescue nil
       if mail.multipart?
         mail.parts.each do |part|
-          return true if part.body.include?('-----BEGIN PGP MESSAGE-----')
+          return true if part.body.to_s =~ BEGIN_PGP_MESSAGE_MARKER rescue nil
           return true if part.has_content_type? &&
             /application\/(?:octet-stream|pgp-encrypted)/ =~ part.mime_type &&
             /.*\.(?:pgp|gpg|asc)$/ =~ part.content_type_parameters[:name] &&
@@ -223,10 +226,10 @@ module Mail
     # check if inline PGP (i.e. if any parts of the mail includes
     # the PGP SIGNED marker)
     def self.signed_inline?(mail)
-      return true if mail.body.to_s =~ /^-----BEGIN PGP SIGNED MESSAGE-----/
+      return true if mail.body.to_s =~ BEGIN_PGP_SIGNED_MESSAGE_MARKER rescue nil
       if mail.multipart?
         mail.parts.each do |part|
-          return true if part.body.to_s =~ /^-----BEGIN PGP SIGNED MESSAGE-----/
+          return true if part.body.to_s =~ BEGIN_PGP_SIGNED_MESSAGE_MARKER rescue nil
         end
       end
       false

data/lib/mail/gpg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jens Kraemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail