dkimverify 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e478a5441b933c84c1880587bca90d3433f5d1
-  data.tar.gz: c6ff69ed30db9e8d03fb21f5fcec8277f9c51bc4
+  metadata.gz: ac5d9f13f3025786b6a19e4bd8e6147ca6adbcd8
+  data.tar.gz: 461833996fc77a81882190b1011f1355764e5d5c
 SHA512:
-  metadata.gz: 8d239d98049d9868040fed1e6267c6568a30499df36eb48663ca7968123f0de021be46bb0ca7fed8c67430f999e085cd9af23e43532943c41b6a465d148fe6e7
-  data.tar.gz: 8f38905a1d21db655e524469eb37fe6726383aeebe68375fb3257648cb85996ef599ba8c067dac878317ae7b5905e8c9033a7ae16f352206d732e3275eb0a5a6
+  metadata.gz: 145a1d41927294da41a5d61ef1e8bdbb631f3fa4ef9e5860e49e1eabf060b66aa3e394c521c55939b79bbb7d2cf3396bbe81a9f88251d7fb3b14d436ecbe3dfa
+  data.tar.gz: a6822d5f82d8fb5e43ec6078db1d6d67ef05a4f83cc2c07dcc834afb7184456f25f2e34e51544d1e35fcc2bfdac65e490d21df20a61df9bfa334721c23c095c3

data/dkimverify.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "dkimverify"
-  gem.version       = '0.0.3'
+  gem.version       = '0.0.4'
   gem.authors       = ["Jeremy B. Merrill"]
   gem.license       = "MIT"
   gem.email         = ["jeremybmerrill@gmail.com"]

data/dkimverify.rb

@@ -4,7 +4,7 @@ require 'base64'
 require 'resolv'
 
 # TODO make this an option somehow
-$debuglog = STDERR # nil # alternatively, set this to `STDERR` to log to stdout.
+$debuglog = nil #STDERR # nil # alternatively, set this to `STDERR` to log to stdout.
 require 'mail'
 
 module Mail
@@ -128,8 +128,9 @@ module Dkim
             # s = dnstxt(sig['s']+"._domainkey."+sig['d']+".")
             # dkim_record_from_dns = DKIM::Query::Domain.query(@dkim_signature['d'], {:selectors => [@dkim_signature['s']]}).keys[@dkim_signature['s']]
             txt = Resolv::DNS.open{|dns| dns.getresources("#{@dkim_signature['s']}._domainkey.#{@dkim_signature['d']}", Resolv::DNS::Resource::IN::TXT).map(&:data) }
+            raise DkimTempFail.new("couldn't get public key from DNS system for #{@dkim_signature['s']}/#{@dkim_signature['d']}") if txt.first.nil?
             parsed_txt = Dkim.parse_header_kv(txt.first)
-            raise DkimTempFail.new("couldn't get public key from DNS system for #{@dkim_signature['s']}/#{@dkim_signature['d']}") if txt.first.nil? || !parsed_txt.keys.include?("p")
+            raise DkimTempFail.new("couldn't get public key from DNS system for #{@dkim_signature['s']}/#{@dkim_signature['d']}") if !parsed_txt.keys.include?("p")
             publickey_asn1 = OpenSSL::ASN1.decode(Base64.decode64(parsed_txt["p"]))
             publickey = publickey_asn1.value[1].value
         end
@@ -142,7 +143,7 @@ module Dkim
             canonicalized_headers = []
             header_fields_to_include_with_values = header_fields_to_include.map do |header_name|                                
                 puts @headers.first_field(header_name).inspect
-                [header_name, @headers.first_field(header_name).instance_variable_get("@raw_value").split(":")[1..-1].join(":") ] 
+                [header_name, (hstr = @headers.first_field(header_name).instance_variable_get("@raw_value")).nil? ? '' : hstr.split(":")[1..-1].join(":") ] 
                 # .value and .instance_eval { unfold(split(@raw_value)[1]) } return subtly different values
                 # if the value of the Date header is a date with a single-digit day.
                 # see https://github.com/mikel/mail/issues/1075
@@ -195,7 +196,11 @@ module Dkim
         end
 
         def decrypted_header_hash
-            decrypted_header_hash_bytes = OpenSSL::PKey::RSA.new(public_key).public_decrypt(Base64.decode64(@dkim_signature['b']))
+            begin
+                decrypted_header_hash_bytes = OpenSSL::PKey::RSA.new(public_key).public_decrypt(Base64.decode64(@dkim_signature['b']))
+            rescue OpenSSL::PKey::RSAError
+                raise DkimPermFail.new "couldn't decrypt header hash with public key"
+            end
             ret = Base64.encode64(decrypted_header_hash_bytes).gsub(/\s+/, '')
             $debuglog.puts "decrypted_header_hash: #{ret}" unless $debuglog.nil?
             ret

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dkimverify
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeremy B. Merrill