sslcheck 0.9.4.1 → 0.9.5

data/lib/sslcheck.rb

@@ -6,6 +6,8 @@ module SSLCheck
   # Your code goes here...
 end
 
+SSL_CHECK_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
 require 'sslcheck/certificate'
 require 'sslcheck/validator'
 require 'sslcheck/certificate_client'

data/lib/sslcheck/validators/ca_bundle.rb

@@ -11,9 +11,20 @@ module SSLCheck
         return false if @ca_bundle.empty?
 
         store = OpenSSL::X509::Store.new
+        store.set_default_paths
+
+        begin
+          store.add_file File.join(SSL_CHECK_ROOT_DIR,'ca-bundle', 'ca-bundle.crt')
+        rescue OpenSSL::X509::StoreError
+          # If the certificate is already present,
+          # we don't really care
+        end
 
         @ca_bundle.each do |ca_cert|
-          store.add_cert ca_cert.to_x509
+          begin
+            store.add_cert ca_cert.to_x509
+          rescue OpenSSL::X509::StoreError
+          end
         end
 
         store.verify(@peer_cert.to_x509)

data/lib/sslcheck/version.rb

@@ -1,3 +1,3 @@
 module SSLCheck
-  VERSION = "0.9.4.1"
+  VERSION = "0.9.5"
 end

data/spec/ca_bundle_validator_spec.rb

@@ -15,7 +15,7 @@ module SSLCheck
     end
     context "when the certificate cannot be verified by the CA Bundle" do
       it 'should return errors' do
-        sut = Validators::CABundle.new("npboards.com", @cert, [Certificate.new(CA_PARENT)])
+        sut = Validators::CABundle.new("npboards.com", @cert, [Certificate.new(VALID_CERT)])
         result = sut.validate
         expect(result).to be_a SSLCheck::Errors::Validation::CABundleVerification
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sslcheck
 version: !ruby/object:Gem::Version
-  version: 0.9.4.1
+  version: 0.9.5
 platform: ruby
 authors:
 - Clayton Lengel-Zigich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,6 +112,7 @@ files:
 - acceptance/checking_certificates_spec.rb
 - acceptance/client_spec.rb
 - blinky_tests
+- ca-bundle/ca-bundle.crt
 - lib/sslcheck.rb
 - lib/sslcheck/certificate.rb
 - lib/sslcheck/certificate_client.rb