r509-cert-validator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1727921e4d1ea7764cfd809a42478d3ec8cb4cf
-  data.tar.gz: ecca2f905cfe41c45a7130d3eeb095fecff9693a
+  metadata.gz: 3576b18ddf475a95078b2e2d8d87294f2232fab6
+  data.tar.gz: d68d96c2331becc79e802c3ed444656c54e8b9c9
 SHA512:
-  metadata.gz: 711bb8c8d34ffbbefcd0859f512cee2056696f2d047ff8c60ed6d629186122c0986501914db7397d726e997da1ec5bf26e3d4469e277750fd80962102298e4db
-  data.tar.gz: 5f4d58440734468761e8f8eb9363246f3cb12a05de8dd0aa27ab0e33fe15d933d38f62c3f37efc0e08b270f9e174907c089676b582ca4fea58ba1ef3d358c483
+  metadata.gz: 5f6b3ce2392c229a8fc3c5a4e91adb3d34a921fad7ac8ede5143931084d1f6c5adb4fdb185f45bd0d08c47322d6949d0afd8dff1354e07a0376766e9696427ea
+  data.tar.gz: 2a25a2dda3c8c3865191ff6407d8aa9fb0e22afed1a53152d8e402a89873adf47a6d81dc4ca6e663e69e5d3eeb968f1cd168c121bd4d0081255a98e29111b11b

data/lib/r509/cert/validator.rb

@@ -9,13 +9,13 @@ module R509
       # The certificate this Validator will validate
       attr_reader :cert
 
-      def initialize(cert, issuer = nil)
+      def initialize(cert, issuer = nil, options = {})
         if cert.is_a? OpenSSL::X509::Certificate
           cert = R509::Cert.new cert: cert
         end
         
         if issuer.is_a? OpenSSL::X509::Certificate
-          cert = R509::Cert.new cert: cert
+          issuer = R509::Cert.new cert: issuer
         end
 
         @cert = cert
@@ -31,12 +31,16 @@ module R509
           raise Error.new "Tried to validate OCSP but cert has no OCSP data" 
         end
 
-        if opts[:crl] && !@crl.available?
-          
+        crl_file = opts[:crl_file]
+
+        crl_available = @crl.available? || (crl_file && File.exist?(crl_file))
+
+        if opts[:crl] && !crl_available
+          raise Error.new "Tried to validate CRL but cert has no CRL data"
         end
 
         @ocsp.validate! if opts[:ocsp]
-        @crl.validate! if opts[:crl]
+        @crl.validate!(crl_file) if opts[:crl]
         true
       end
 

data/lib/r509/cert/validator/crl_validator.rb

@@ -8,15 +8,23 @@ module R509
           return true
         end
 
-        def validate!
-          unless available?
+        def validate!(crl_file = nil)
+          if !available? && crl_file.nil?
             raise Error.new "Tried to validate CRL but cert has no CRL data"
           end
 
-          body = R509::CRL::SignedList.new(get(uris.first))
+          crl = unless crl_file.nil?
+                  File.read crl_file
+                else
+                  get(uris.first)
+                end
 
-          unless body.verify @issuer.public_key
-            raise CrlError.new "CRL did not match certificate"
+          body = R509::CRL::SignedList.new(crl)
+
+          if @issuer
+            unless body.verify @issuer.public_key
+              raise CrlError.new "CRL did not match certificate"
+            end
           end
 
           if body.revoked? @cert.serial

data/lib/r509/cert/validator/version.rb

@@ -1,7 +1,7 @@
 module R509
   class Cert
     class Validator
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/spec/validator_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe R509::Cert::Validator do
   let(:issuer_cert){ cert('root.crt') }
+  let(:crl_path) do
+    File.expand_path(File.join(__dir__, 'support/ca/rcv_spec.crl')) 
+  end
 
   describe 'with a cert without CRL or OCSP data' do
     let(:no_validator_cert){ cert('empty.crt') }
@@ -15,6 +18,12 @@ describe R509::Cert::Validator do
       expect{ subject.validate crl: true }.to raise_error
       expect{ subject.validate ocsp: true }.to raise_error
     end
+
+    it 'should validate against a CRL file' do
+      expect do
+        subject.validate crl: true, ocsp: false, crl_file: crl_path 
+      end.to_not raise_error
+    end
   end
 
   describe 'with a cert with CRL and OCSP data' do
@@ -69,5 +78,12 @@ describe R509::Cert::Validator do
       expect(subject.validate crl: false, ocsp: true).to_not be
       expect{ subject.validate! crl: false, ocsp: true }.to raise_error /revoked/
     end
+
+    it 'should validate false against a CRL file' do
+      expect(subject.validate crl: true, ocsp: false, crl_file: crl_path).
+        to_not be
+      expect{ subject.validate! crl: true, ocsp: false, crl_file: crl_path}.
+        to raise_error /revoked/
+    end
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: r509-cert-validator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Bryce Kerley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: r509-ocsp-responder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: r509-validity-crl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: r509
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 description: Tool for validating x509 certificates against CRLs and OCSP.
@@ -129,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -168,17 +168,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An r509-based tool for validating x509 certificates against CRLs and OCSP.