ssltool 0.0.8 → 0.0.9

data/README.md

@@ -1,3 +1,5 @@
+This readme is very outdated and incomplete now. Enjoy :P
+
 # ssltool-complete-chain
 
 Re-orders and completes a chain for a given certificate.

data/bin/bootstrap-detect-intermediates

@@ -6,7 +6,9 @@ require_relative "../lib/ssltool/certificate_store"
 
 (puts DATA.read.gsub("$0", File.basename($0)); exit 1) if ARGV.empty? && STDIN.tty?
 
-def notify_circular_chains_detected(circular_chains)
+store = SSLTool::CertificateStore.new("file://#{File.dirname(__FILE__)}/../var/pools")
+
+store.on_circular_chain_detection do |circular_chains|
   $stderr.puts "The following circular chains were detected:"
   $stderr.puts
   $stderr.puts "Resolve this manually and exclude the necessary certs to break the cycle by putting them your exclude pool; rerun this script."
@@ -30,10 +32,7 @@ def notify_circular_chains_detected(circular_chains)
     $stderr.puts cert.to_s
   end
 end
-public :notify_circular_chains_detected
 
-store = SSLTool::CertificateStore.new("file://#{File.dirname(__FILE__)}/../var/pools")
-store.register_for_circular_chain_detection_notification(self)
 store.detect_and_merge_intermediates!(SSLTool::Certificate.scan(ARGF.read), false)
 
 __END__

data/lib/ssltool/certificate_store.rb

@@ -12,7 +12,7 @@ module SSLTool
     end
 
     def initialize(store_url)
-      @circular_chain_notification_listeners = Set[]
+      @circular_chain_notification_callbacks = Set[]
       @adapter           = create_adapter(store_url)
       @trusted_pool      = @adapter.load_pool(:trusted)
       @intermediate_pool = @adapter.load_pool(:intermediate)
@@ -65,15 +65,13 @@ module SSLTool
         .each   { |chain| chain.shift until chain[1..-1].to_a.any? { |other_cert| chain.first.signs?(other_cert) } || chain.empty? }
         .reject { |chain| chain.length <= 1 }
         .map(&:to_set).uniq.map(&:to_a)
-      @circular_chain_notification_listeners.each { |listener| listener.notify_circular_chains_detected(circular_chains) } unless circular_chains.empty?
+      @circular_chain_notification_callbacks.each { |proc| proc.call(circular_chains) } unless circular_chains.empty?
       circular_chains
     end
 
-    def register_for_circular_chain_detection_notification(listener = nil, &listener_block)
-      listener      && listener_block      and raise ArgumentError, "Either pass a listener object or a block, never both."
-      listener.nil? && listener_block.nil? and raise ArgumentError, "A listener object or a block is required."
-      listener.nil? || listener.respond_to?(:notify_circular_chains_detected) or raise NoMethodError, "Listener does not define notify_circular_chains_detected(…)"
-      @circular_chain_notification_listeners << listener || listener_block
+    def on_circular_chain_detection(&block)
+      raise ArgumentError, "Missing block" unless block_given?
+      @circular_chain_notification_callbacks << block
     end
 
     ### chains

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssltool
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies: []
 description: Orders and completes SSL certificate trust chains, maintains an up-to-date
   pool of viable intermediates and trusted roots, and provides other tooling for dealing