dkimverify 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab8514ab9b191b18c0d9eab8d3f37b246555f4fd
-  data.tar.gz: 0d6203cb46b3f520f63f8b301da4c586208076ac
+  metadata.gz: a8e478a5441b933c84c1880587bca90d3433f5d1
+  data.tar.gz: c6ff69ed30db9e8d03fb21f5fcec8277f9c51bc4
 SHA512:
-  metadata.gz: b7eb314c2b983b38c2cdf98acb94c5197c3c122559e1eb0dc613dea75fec14ea3fa2da7aff2025ee20767a1e1962ba51dafb29935df0b2b8ae3fe51e1299a5b2
-  data.tar.gz: 5c0c5ce840fa47bf365f6bb2822af363fe720a980f7e0203bef47b3675e7a98a463adae22d973bb8e7b58590b97607c03360d786775d36d32bc1d7f444701d3a
+  metadata.gz: 8d239d98049d9868040fed1e6267c6568a30499df36eb48663ca7968123f0de021be46bb0ca7fed8c67430f999e085cd9af23e43532943c41b6a465d148fe6e7
+  data.tar.gz: 8f38905a1d21db655e524469eb37fe6726383aeebe68375fb3257648cb85996ef599ba8c067dac878317ae7b5905e8c9033a7ae16f352206d732e3275eb0a5a6

data/README.md

@@ -5,6 +5,8 @@ a gem for verifying DKIM signatures in Ruby
 
 this gem does not sign mail messages (but a PR to enable it would likely be accepted, I just have no use for it.)
 
+**this gem doesn't work right yet!!!**
+
 how to use
 -----------
 ````Dkim::Verifier.new(eml_filepath).verify!````
@@ -24,7 +26,6 @@ with a debt of gratitude to:
 ----------------------------
 
   - [pydkim](https://github.com/ghewgill/pydkim) by @ghewgill which I used as a reference implementation
-  - [dkim-query](https://github.com/trailofbits/dkim-query) by @trailofbits (and included here in slightly-modified form)
   - [mail](https://github.com/mikel/mail) by @mikel
   - [carsonreinke's fork of the jhawthorne's dkim gem](https://github.com/carsonreinke/dkim/tree/feature_verification) which I wish I had found before I started this.
   - [rfc6376 authors](https://tools.ietf.org/html/rfc6376)
@@ -35,6 +36,7 @@ checking expiration dates (x=, t=)
 accounting for length limits (l= tag)
 tests (which I really ought to add)
 checking multiple dkim signature header lines (probably easy)
+dealing with the "simple" canonicalization method (because I need to strip out the `mail` gem and instead write my own RFC822 parser that is better for maintaining the exact original string)
 
 by
 --

data/dkimverify.gemspec

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

data/dkimverify.rb

@@ -1,11 +1,10 @@
 require 'digest'
 require 'openssl'
 require 'base64'
-require_relative './dkim-query/lib/dkim/query'
-
+require 'resolv'
 
 # TODO make this an option somehow
-$debuglog = nil # alternatively, set this to `STDERR` to log to stdout.
+$debuglog = STDERR # nil # alternatively, set this to `STDERR` to log to stdout.
 require 'mail'
 
 module Mail
@@ -33,6 +32,17 @@ module Dkim
     class InvalidDkimSignature < DkimPermFail; end
     class DkimVerificationFailure < DkimPermFail; end
 
+    #TODO: what is this kind of key-value string even called?
+    def self.parse_header_kv(input_str)
+        parsed = {}
+        input_str.split(/\s*;\s*/).each do |key_val| 
+            if m = key_val.match(/(\w+)\s*=\s*(.*)/)
+                parsed[m[1]] = m[2]
+            end
+        end
+        parsed
+    end
+
     class Verifier
         def initialize(email_filename)
             mail = Mail.read(email_filename) # TODO make this `mail` not `@mail`
@@ -45,12 +55,7 @@ module Dkim
             return false if @headers["DKIM-Signature"].nil?
 
             dkim_signature_str = @headers.first_field("DKIM-Signature").value.to_s
-            @dkim_signature = {}
-            dkim_signature_str.split(/\s*;\s*/).each do |key_val| 
-                if m = key_val.match(/(\w+)\s*=\s*(.*)/)
-                    @dkim_signature[m[1]] = m[2]
-                end
-            end
+            @dkim_signature = Dkim.parse_header_kv(dkim_signature_str)
             validate_signature! # just checking to make sure we have all the ingredients we need to actually verify the signature
 
             figure_out_canonicalization_methods!
@@ -121,10 +126,12 @@ module Dkim
         def public_key
             # here we're getting the website's actual public key from the DNS system
             # 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']]
-            raise DkimTempFail.new("couldn't get public key from DNS system for #{@dkim_signature['s']}/#{@dkim_signature['d']}") if dkim_record_from_dns.nil? || dkim_record_from_dns.class == DKIM::Query::MalformedKey
-            x = OpenSSL::ASN1.decode(Base64.decode64(dkim_record_from_dns.public_key.to_s))
-            publickey = x.value[1].value
+            # 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) }
+            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")
+            publickey_asn1 = OpenSSL::ASN1.decode(Base64.decode64(parsed_txt["p"]))
+            publickey = publickey_asn1.value[1].value
         end
 
         def headers_to_sign
@@ -134,13 +141,15 @@ module Dkim
             $debuglog.puts "header_fields_to_include: #{header_fields_to_include}" unless $debuglog.nil?
             canonicalized_headers = []
             header_fields_to_include_with_values = header_fields_to_include.map do |header_name|                                
-                [header_name, @headers.first_field(header_name).instance_eval { unfold(split(@raw_value)[1]) } ] 
+                puts @headers.first_field(header_name).inspect
+                [header_name, @headers.first_field(header_name).instance_variable_get("@raw_value").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
                 # incidentally, .instance_variable_get("@value") gives a third subtly different value in a way that I don't understand.
             end
             canonicalized_headers = Dkim.canonicalize_headers(header_fields_to_include_with_values, @how_to_canonicalize_headers)
+            puts @headers.first_field("DKIM-Signature").inspect
 
             canonicalized_headers += Dkim.canonicalize_headers([
                 [
@@ -180,7 +189,6 @@ module Dkim
                         ]),
                         OpenSSL::ASN1::OctetString.new(headers_digest),
                 ])
-            $debuglog.puts "dinfo: #{ dinfo.to_der  }" unless $debuglog.nil?
             headers_der = Base64.encode64(dinfo.to_der).gsub(/\s+/, '')
             $debuglog.puts "headers_hash: #{headers_der}" unless $debuglog.nil?
             headers_der
@@ -195,34 +203,34 @@ module Dkim
 
         def validate_signature!
             # version: only version 1 is defined
-            raise InvalidDkimSignature("DKIM signature is missing required tag v=") unless @dkim_signature.include?('v')
-            raise InvalidDkimSignature("DKIM signature v= value is invalid (got \"#{@dkim_signature['v']}\"; expected \"1\")") unless @dkim_signature['v'] == "1"
+            raise InvalidDkimSignature.new("DKIM signature is missing required tag v=") unless @dkim_signature.include?('v')
+            raise InvalidDkimSignature.new("DKIM signature v= value is invalid (got \"#{@dkim_signature['v']}\"; expected \"1\")") unless @dkim_signature['v'] == "1"
             
             # encryption algorithm
-            raise InvalidDkimSignature("DKIM signature is missing required tag a=") unless @dkim_signature.include?('a')
+            raise InvalidDkimSignature.new("DKIM signature is missing required tag a=") unless @dkim_signature.include?('a')
             
             # header hash
-            raise InvalidDkimSignature("DKIM signature is missing required tag b=") unless @dkim_signature.include?('b')
-            raise InvalidDkimSignature("DKIM signature b= value is not valid base64") unless @dkim_signature['b'].match(/[\s0-9A-Za-z+\/]+=*$/)
-            raise InvalidDkimSignature("DKIM signature is missing required tag h=") unless @dkim_signature.include?('h')
+            raise InvalidDkimSignature.new("DKIM signature is missing required tag b=") unless @dkim_signature.include?('b')
+            raise InvalidDkimSignature.new("DKIM signature b= value is not valid base64") unless @dkim_signature['b'].match(/[\s0-9A-Za-z+\/]+=*$/)
+            raise InvalidDkimSignature.new("DKIM signature is missing required tag h=") unless @dkim_signature.include?('h')
             
             # body hash (not directly encrypted)
-            raise InvalidDkimSignature("DKIM signature is missing required tag bh=") unless @dkim_signature.include?('bh')
-            raise InvalidDkimSignature("DKIM signature bh= value is not valid base64") unless @dkim_signature['bh'].match(/[\s0-9A-Za-z+\/]+=*$/)
+            raise InvalidDkimSignature.new("DKIM signature is missing required tag bh=") unless @dkim_signature.include?('bh')
+            raise InvalidDkimSignature.new("DKIM signature bh= value is not valid base64") unless @dkim_signature['bh'].match(/[\s0-9A-Za-z+\/]+=*$/)
             
             # domain selector
-            raise InvalidDkimSignature("DKIM signature is missing required tag d=") unless @dkim_signature.include?('d')
-            raise InvalidDkimSignature("DKIM signature is missing required tag s=") unless @dkim_signature.include?('s')
+            raise InvalidDkimSignature.new("DKIM signature is missing required tag d=") unless @dkim_signature.include?('d')
+            raise InvalidDkimSignature.new("DKIM signature is missing required tag s=") unless @dkim_signature.include?('s')
             
             # these are expiration dates, which are not checked above.
-            raise InvalidDkimSignature("DKIM signature t= value is not a valid decimal integer") unless @dkim_signature['t'].nil? || @dkim_signature['t'].match(/\d+$/)
-            raise InvalidDkimSignature("DKIM signature x= value is not a valid decimal integer") unless @dkim_signature['x'].nil? || @dkim_signature['x'].match(/\d+$/)
-            raise InvalidDkimSignature("DKIM signature x= value is less than t= (and must be greater than or equal to t=). (x=#{@dkim_signature['x']}, t=#{@dkim_signature['t']}) ") unless @dkim_signature['x'].nil? || @dkim_signature['x'].to_i >= @dkim_signature['t'].to_i
+            raise InvalidDkimSignature.new("DKIM signature t= value is not a valid decimal integer") unless @dkim_signature['t'].nil? || @dkim_signature['t'].match(/\d+$/)
+            raise InvalidDkimSignature.new("DKIM signature x= value is not a valid decimal integer") unless @dkim_signature['x'].nil? || @dkim_signature['x'].match(/\d+$/)
+            raise InvalidDkimSignature.new("DKIM signature x= value is less than t= (and must be greater than or equal to t=). (x=#{@dkim_signature['x']}, t=#{@dkim_signature['t']}) ") unless @dkim_signature['x'].nil? || @dkim_signature['x'].to_i >= @dkim_signature['t'].to_i
 
             # other unimplemented stuff
-            raise InvalidDkimSignature("DKIM signature i= domain is not a subdomain of d= (i=#{@dkim_signature[i]} d=#{@dkim_signature[d]})") if @dkim_signature['i'] && !(@dkim_signature['i'].end_with?(@dkim_signature['d']) || ["@", ".", "@."].include?(@dkim_signature['i'][-@dkim_signature['d'].size-1]))
-            raise InvalidDkimSignature("DKIM signature l= value is invalid") if @dkim_signature['l'] && !@dkim_signature['l'].match(/\d{,76}$/)
-            raise InvalidDkimSignature("DKIM signature q= value is invalid (got \"#{@dkim_signature['q']}\"; expected \"dns/txt\")") if @dkim_signature['q'] && @dkim_signature['q'] != "dns/txt"
+            raise InvalidDkimSignature.new("DKIM signature i= domain is not a subdomain of d= (i=#{@dkim_signature[i]} d=#{@dkim_signature[d]})") if @dkim_signature['i'] && !(@dkim_signature['i'].end_with?(@dkim_signature['d']) || ["@", ".", "@."].include?(@dkim_signature['i'][-@dkim_signature['d'].size-1]))
+            raise InvalidDkimSignature.new("DKIM signature l= value is invalid") if @dkim_signature['l'] && !@dkim_signature['l'].match(/\d{,76}$/)
+            raise InvalidDkimSignature.new("DKIM signature q= value is invalid (got \"#{@dkim_signature['q']}\"; expected \"dns/txt\")") if @dkim_signature['q'] && @dkim_signature['q'] != "dns/txt"
         end
     end
 
@@ -245,7 +253,7 @@ module Dkim
       if how == "simple"  
         $debuglog.puts "canonicalizing body with 'simple'" unless $debuglog.nil?
         # Ignore all empty lines at the end of the message body.
-        body.gsub(/(\r\n)*$/, "\r\n")
+        body.gsub(/(\r\n)+\Z/, "\r\n")
       elsif how == "relaxed"
         $debuglog.puts "canonicalizing body with 'relaxed'" unless $debuglog.nil?
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dkimverify
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeremy B. Merrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -49,32 +49,6 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
-- dkim-query/.gitignore
-- dkim-query/.rspec
-- dkim-query/.travis.yml
-- dkim-query/.yardopts
-- dkim-query/ChangeLog.md
-- dkim-query/Gemfile
-- dkim-query/LICENSE.txt
-- dkim-query/README.md
-- dkim-query/Rakefile
-- dkim-query/bin/dkim-query
-- dkim-query/dkim-query.gemspec
-- dkim-query/lib/dkim/query.rb
-- dkim-query/lib/dkim/query/domain.rb
-- dkim-query/lib/dkim/query/exceptions.rb
-- dkim-query/lib/dkim/query/key.rb
-- dkim-query/lib/dkim/query/malformed_key.rb
-- dkim-query/lib/dkim/query/parser.rb
-- dkim-query/lib/dkim/query/query.rb
-- dkim-query/lib/dkim/query/version.rb
-- dkim-query/spec/domain_spec.rb
-- dkim-query/spec/key_spec.rb
-- dkim-query/spec/malformed_key.rb
-- dkim-query/spec/parser_spec.rb
-- dkim-query/spec/query_spec.rb
-- dkim-query/spec/spec_helper.rb
-- dkim-query/tasks/alexa.rb
 - dkimverify.gemspec
 - dkimverify.rb
 homepage: https://github.com/jeremybmerrill/dkimverify

data/dkim-query/.gitignore

@@ -1,51 +0,0 @@
-<<<<<<< HEAD
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-=======
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalisation:
-/.bundle/
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
->>>>>>> 62c17ee30b1a7d25ef12fab39fd6c2de0bcbadbc

data/dkim-query/.rspec

@@ -1 +0,0 @@
---colour --format documentation

data/dkim-query/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-- 2.1.8
-- 2.2.4
-- 2.3.0
-- jruby
-- rbx-2
-matrix:
-  allow_failures:
-  - rvm: rbx-2
-addons:
-  code_climate:
-    repo_token: 151a667c2c51ff76ac825c07c33e8e63c1ae9956a73f4d0ec7a043d877d05c95
-notifications:
-  slack:
-    secure: Ykcz/gLRZcXhyOGedVgj1u3CDUbZS4y/nL1dREBE0Ar73Vrz+ulcMhri3VzfVBQGkWw06EjqHcIwsIomEInLJKxk3RTfpcYQAdYN+5iEDNOri9a5NK618WdrCuaCS3sKqYbJ/KB0slJDcJ1W+EXkr4GRqZTr5rPdmllUnoaqDCQ=

data/dkim-query/.yardopts

@@ -1 +0,0 @@
---markup markdown --title "DKIM::Query Documentation" --protected

data/dkim-query/ChangeLog.md

@@ -1,25 +0,0 @@
-### 0.2.6 / 2016-08-3
-
-* Fixed a typo in the parser rules.
-
-### 0.2.5 / 2016-06-17
-
-* Added `mandrill` and `google` to the list of default DKIM selectors.
-
-### 0.2.4 / 2015-08-13
-
-* Fixed a bug where the queried host has no TLD (ex: `test`).
-
-### 0.2.3 / 2015-07-22
-
-* Fixed a typo in the `dkim-query` util.
-* Convert all text into Strings.
-* Convert `t=y` or `t=s` values to Symbols.
-
-### 0.2.2 / 2015-07-04
-
-* Fixed {DKIM::Query::MalformedKey#to_s}.
-
-### 0.2.1 / 2015-07-01
-
-* Initial release.

data/dkim-query/Gemfile

@@ -1,19 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in dkim-query.gemspec
-gemspec
-
-group :development do
-  gem 'rake'
-  gem 'rubygems-tasks', '~> 0.2'
-
-  gem 'rspec', '~> 3.0'
-
-  gem 'kramdown'
-  gem 'yard', '~> 0.8'
-end
-
-group :test do
-  gem 'json'
-  gem 'codeclimate-test-reporter', require: nil
-end

data/dkim-query/LICENSE.txt

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Trail of Bits
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/dkim-query/README.md

@@ -1,105 +0,0 @@
-# dkim-query
-
-[![Code Climate](https://codeclimate.com/github/trailofbits/dkim-query/badges/gpa.svg)](https://codeclimate.com/github/trailofbits/dkim-query)
-[![Test Coverage](https://codeclimate.com/github/trailofbits/dkim-query/badges/coverage.svg)](https://codeclimate.com/github/trailofbits/dkim-query)
-[![Build Status](https://travis-ci.org/trailofbits/dkim-query.svg)](https://travis-ci.org/trailofbits/dkim-query)
-
-The `dkim-query` library searches the [DKIM] records for a host. We assume the
-host uses standard dkim 'selectors', and also check if they use their own
-'selector'.
-
-## Examples
-
-Parse a DKIM record:
-
-    require 'dkim/query'
-
-    key = DKIM::Query::Key.parse("k=rsa;  p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrEee0Ri4Juz+QfiWYui/E9UGSXau/2P8LjnTD8V4Unn+2FAZVGE3kL23bzeoULYv4PeleB3gfmJiDJOKU3Ns5L4KJAUUHjFwDebt0NP+sBK0VKeTATL2Yr/S3bT/xhy+1xtj4RkdV7fVxTn56Lb4udUnwuxK4V5b5PdOKj/+XcwIDAQAB; n=A 1024 bit key")
-    
-    key.v
-    # => nil
-
-    key.g
-    # => nil
-
-    key.h
-    # => nil
-
-    key.k
-    # => :rsa
-
-    key.n
-    # => "A 1024 bit key"
-
-    key.p
-    # => "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrEee0Ri4Juz+QfiWYui/E9UGSXau/2P8LjnTD8V4Unn+2FAZVGE3kL23bzeoULYv4PeleB3gfmJiDJOKU3Ns5L4KJAUUHjFwDebt0NP+sBK0VKeTATL2Yr/S3bT/xhy+1xtj4RkdV7fVxTn56Lb4udUnwuxK4V5b5PdOKj/+XcwIDAQAB"
-
-    key.s
-    # => nil
-
-    key.t
-    # => nil
-
-Query all keys for a domain:
-
-    domain = DKIM::Query::Domain.query('yahoo.com')
-    # => #<DKIM::Query::Domain:0x0000000315c950 @name="yahoo.com", @keys={"s1024"=>#<DKIM::Query::Key:0x0000000315c9f0 @v=nil, @g=nil, @h=nil, @k=:rsa, @n="A 1024 bit key;", @p="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrEee0Ri4Juz+QfiWYui/E9UGSXau/2P8LjnTD8V4Unn+2FAZVGE3kL23bzeoULYv4PeleB3gfmJiDJOKU3Ns5L4KJAUUHjFwDebt0NP+sBK0VKeTATL2Yr/S3bT/xhy+1xtj4RkdV7fVxTn56Lb4udUnwuxK4V5b5PdOKj/+XcwIDAQAB", @s=nil, @t=nil>}>
-
-    domain['s1024']
-    # => #<DKIM::Query::Key:0x0000000315c9f0 @v=nil, @g=nil, @h=nil, @k=:rsa, @n="A 1024 bit key;", @p="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrEee0Ri4Juz+QfiWYui/E9UGSXau/2P8LjnTD8V4Unn+2FAZVGE3kL23bzeoULYv4PeleB3gfmJiDJOKU3Ns5L4KJAUUHjFwDebt0NP+sBK0VKeTATL2Yr/S3bT/xhy+1xtj4RkdV7fVxTn56Lb4udUnwuxK4V5b5PdOKj/+XcwIDAQAB", @s=nil, @t=nil>
-
-    domain.each do |key|
-      # ...
-    end
-
-## Synopsis
-
-Query a domain:
-
-    dkim-query google.com
-    ____________________________
-    DKIM record search for google.com
-      - using selectors: ["default", "dkim", "google"]
-      - no DKIM record found for google.com
-    ____________________________
-
-
-Query multiple domains:
-
-    dkim-query trailofbits.com facebook.com yahoo.com
-    ____________________________
-    DKIM record search for trailofbits.com
-      - using selectors: ["default", "dkim", "google", "trailofbits"]
-      - found DKIM record for trailofbits.com at trailofbits._domainkey.trailofbits.com:
-      v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwe04g1hSR55ACcRiLAg0MoEiY5BBviJHJHq/d9r6o+F50fa1TrNNulwKXaST+WCEcW6D2KZ+dt9JvgB9ApIEAFCzHRXhawga0GsfDkOllvpXgT95IPcnYrSkM+rJSbaqHh+YI5sV9sKnvzZDVmB7l5gU3yD74aDmjs9wSg8RC5wIDAQAB
-    ____________________________
-    
-    ____________________________
-    DKIM record search for facebook.com
-      - using selectors: ["default", "dkim", "google", "facebook"]
-      - found DKIM record for facebook.com at default._domainkey.facebook.com:
-      t=y; k=rsa; p=MHwwDQYJKoZIhvcNAQEBBQADawAwaAJhALkZ4wTn2SQ3EW0vVBExi8izmZZnjZH8JIY5Y964jzDORZku43o6ooFq6HLMjBxmcDYOrJFRdcsKDWtI0Be/uLfc/rClXuyEbcENXfadg77HHv35BI85RNy4TKeai3hxoQIDAQAB;
-    ____________________________
-    
-    ____________________________
-    DKIM record search for yahoo.com
-      - using selectors: ["default", "dkim", "google", "yahoo"]
-      - no DKIM record found for yahoo.com
-    ____________________________
-
-## Requirements
-
-* [ruby] >= 1.9.1
-* [parslet] ~> 1.6
-
-## Install
-
-    $ gem install dkim-query
-
-## License
-
-See the {file:LICENSE.txt} file.
-
-[DKIM]: https://tools.ietf.org/html/rfc6376
-[ruby]: https://www.ruby-lang.org/
-[parslet]: http://kschiess.github.io/parslet/

data/dkim-query/Rakefile

@@ -1,24 +0,0 @@
-# encoding: utf-8
-require 'rubygems'
-
-begin
-  require 'bundler/setup'
-rescue LoadError => e
-  warn e.message
-  warn "Run `gem install bundler` to install Bundler."
-  exit -1
-end
-
-require 'rake'
-require 'rubygems/tasks'
-Gem::Tasks.new
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-
-task :test    => :spec
-task :default => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new  
-task :doc => :yard

data/dkim-query/bin/dkim-query

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-
-lib_dir = File.expand_path('../../lib',__FILE__)
-$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
-
-require 'dkim/query'
-
-unless ARGV[0]
-  warn "Please supply at least one host name"
-  exit
-end
-
-ARGV.each do |arg|
-  puts "____________________________\n"
-  puts "DKIM record search for #{arg}"
-
-  domain = DKIM::Query::Domain.query(arg)
-
-  unless domain.keys.empty?
-    puts "- found DKIM record for #{arg}"
-
-    domain.keys.each do |selector,key|
-      puts "  #{selector}:"
-
-      [:v, :g, :h, :k, :n, :p, :s, :t].each do |field|
-        value = key.send(field)
-        puts "    #{field}: #{value}" if value
-      end
-    end
-  else
-    puts "- no DKIM record found for #{arg}"
-  end
-  puts "____________________________\n\n"
-end

data/dkim-query/dkim-query.gemspec

@@ -1,26 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dkim/query/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "dkim-query"
-  gem.version       = DKIM::Query::VERSION
-  gem.authors       = ["nicktitle"]
-  gem.email         = ["nick.esposito@trailofbits.com"]
-  gem.summary       = %q{DKIM Retriever and Parser}
-  gem.description   = %q{Search and retrieve DKIM records for any number of hosts}
-  gem.homepage      = "https://github.com/trailofbits/dkim-query#readme"
-  gem.license       = "MIT"
-
-  gem.files         = `git ls-files -z`.split("\x0")
-  gem.executables   = ['dkim-query']
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  gem.required_ruby_version = '>= 1.9.1'
-
-  gem.add_dependency "parslet", "~> 1.6"
-
-  gem.add_development_dependency "bundler", "~> 1.6"
-  gem.add_development_dependency "rake", "~> 10.0"
-end