ssltool 0.0.6 → 0.0.7

data/bin/console

@@ -6,8 +6,10 @@ require "yaml"
 
 require_relative "../lib/ssltool/certificate_store"
 
-$all      = SSLTool::Certificate.scan(IO.read("var/all-the-certs.pem")) rescue []
-$store    = SSLTool::CertificateStore.new("file://#{File.dirname(__FILE__)}/../var/pools")
+include SSLTool
+
+$all      = Certificate.scan(IO.read("var/all-the-certs.pem")) rescue []
+$store    = CertificateStore.new("file://#{File.dirname(__FILE__)}/../var/pools")
 $trusted  = $store.trusted_pool
 $pool     = $store.intermediate_pool
 $excluded = $store.excluded_pool

data/bin/ssltool-filter-certs

@@ -6,7 +6,7 @@
 
 require_relative "../lib/ssltool/certificate"
 
-certs = SSLTool::PEMScanner.new(ARGF.read).cert_strings.uniq.map do |s|
+certs = SSLTool::PEMScanner.scan(ARGF.read).cert_strings.uniq.map do |s|
   begin
     SSLTool::Certificate.new(s)
   rescue => e

data/lib/ssltool/certificate.rb

@@ -22,7 +22,7 @@ module SSLTool
 
     # returns an array of Certificate objects created from cert strings found in s
     def self.scan(s)
-      PEMScanner.new(s).certificates.uniq
+      PEMScanner.certs_from(s).uniq
     end
 
     ### signing

data/lib/ssltool/chain_resolution.rb

@@ -17,9 +17,9 @@ module SSLTool
     end
 
     def initialize(original_chain, certificate_store)
-      @original_chain             = original_chain.dup.freeze
+      @original_chain             = original_chain.uniq.freeze
       @certificate_store          = certificate_store
-      @domain_certs, @other_certs = original_chain.partition(&:for_domain_name?)
+      @domain_certs, @other_certs = @original_chain.partition(&:for_domain_name?)
       @original_chain.empty? and raise ZeroCertsChainResolutionError
       case @domain_certs.length
       when 1; # pass

data/lib/ssltool/key_helper.rb

@@ -4,10 +4,21 @@ require_relative 'pem_scanner'
 
 module SSLTool
   module KeyHelper
+
+    class KeyNotPresentError < ArgumentError; end
+
+    class KeyNotFoundError < StandardError
+      attr_reader :cert, :keys
+      def initialize(cert, keys)
+        @cert, @keys = cert, keys
+        super("None of the given #{keys.length} keys match the certificate #{cert.subject}.")
+      end
+    end
+
     extend self
 
     def scan(s)
-      SSLTool::PEMScanner.new(s).keys
+      PEMScanner.keys_from(s)
     end
 
     def keys(*pems)
@@ -18,5 +29,12 @@ module SSLTool
       keys.find { |key| cert.check_private_key(key) }
     end
 
+    def find_private_key_for_certificate!(cert, keys)
+      raise KeyNotPresentError if keys.empty?
+      key = find_private_key_for_certificate(cert, keys)
+      return key if key
+      raise KeyNotFoundError.new(cert, keys)
+    end
+
   end
 end

data/lib/ssltool/pem_scanner.rb

@@ -10,6 +10,19 @@ module SSLTool
                      -----END.*?-----
                    )/x
 
+    class << self
+      alias_method :[], :new
+      alias_method :scan, :new
+
+      def keys_from(s)
+        scan(s).keys
+      end
+
+      def certs_from(s)
+        scan(s).certs
+      end
+    end
+
     def initialize(s)
       s                              = s.dup.force_encoding('BINARY').gsub(/\r\n?/, "\n").gsub(/\s+\n/, "\n")
       @pem_strings, @garbage_strings = s.split(RX_PEM_BLOCK).map(&:strip).reject(&:empty?).partition { |s| s =~ RX_PEM_BLOCK }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssltool
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: