samlr 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0852aa5599b1b20def86254089762f655d8c94f3
-  data.tar.gz: da955b9cbe77bf644dbfba9a55dc3b2e1404e570
+  metadata.gz: f7378eb46f0f0b532f4f2cfc95dc40ac6459080c
+  data.tar.gz: f465d9ec773cb4b65157d0fd01b99a1692759a92
 SHA512:
-  metadata.gz: 838a2bc524572107e674137f34fe76ed60133bab454f063e5b27459cb9379019e71ed539e7c4ca7421f03191c92ca3072e4e948fdbe369e184901cec55df3398
-  data.tar.gz: 401beca2ecbefa2b58db24fea53060065a946f8b17247c718859c04678238359b2f95ee6b71b569d500f807f2f537c9bafcd55821a20ad4cae85b5adc510525f
+  metadata.gz: eed88391d3b9fdddefc7b88203d237c458a252a3c2bdda8eb9b46471d933d4ca64578682d481d84a980e50034e726629f9c026817ad8c73a495577ae1e0afffb
+  data.tar.gz: 1c53f2ee25f0111a45b8eaba9acfb845b56dcc4f21be67fba23d860642ddda0af65453c117ce27cffb4e83bfa066d78244ed3e97f420328690422e5fd2ddf3bf

data/lib/samlr.rb

@@ -45,7 +45,8 @@ require "samlr/errors"
 require "samlr/tools"
 require "samlr/condition"
 require "samlr/assertion"
-require "samlr/fingerprint"
+require "samlr/fingerprint_sha1"
+require "samlr/fingerprint_sha256"
 require "samlr/signature"
 require "samlr/response"
 require "samlr/request"

data/lib/samlr/certificate.rb

@@ -1,7 +1,7 @@
 module Samlr
   class Certificate
     attr_reader :x509
-    
+
     def initialize(value)
       @x509 = if value.is_a?(OpenSSL::X509::Certificate)
         value
@@ -13,7 +13,7 @@ module Samlr
     end
 
     def fingerprint
-      @fingerprint ||= Fingerprint.new(@x509)
+      @fingerprint ||= FingerprintSHA256.new(@x509)
     end
 
     def ==(other)

data/lib/samlr/fingerprint.rb

@@ -4,9 +4,18 @@ module Samlr
 
     def initialize(value)
       if value.is_a?(OpenSSL::X509::Certificate)
-        @value = Fingerprint.x509(value)
+        @value = self.class.x509(value)
       else
-        @value = Fingerprint.normalize(value)
+        @value = self.class.normalize(value)
+      end
+    end
+
+    def self.from_string(string)
+      normalized = normalize(string)
+      if string.gsub(':', '').length == 64
+        FingerprintSHA256.new(normalized)
+      else
+        FingerprintSHA1.new(normalized)
       end
     end
 
@@ -23,6 +32,10 @@ module Samlr
       end
     end
 
+    def verify!(certificate)
+      compare!(self.class.new(self.class.x509(certificate.x509)))
+    end
+
     def valid?
       value =~ /([A-F0-9]:?)+/
     end
@@ -33,7 +46,7 @@ module Samlr
 
     # Extracts a fingerprint for an x509 certificate
     def self.x509(certificate)
-      normalize(OpenSSL::Digest::SHA1.new.hexdigest(certificate.to_der))
+      raise NotImplementedError, 'subclass must implement x509'
     end
 
     # Converts a string to fingerprint normal form
@@ -41,4 +54,4 @@ module Samlr
       value.to_s.upcase.gsub(/[^A-F0-9]/, "").scan(/../).join(":")
     end
   end
-end
+end

data/lib/samlr/fingerprint_sha1.rb

@@ -0,0 +1,10 @@
+require "samlr/fingerprint"
+
+module Samlr
+  class FingerprintSHA1 < Fingerprint
+    # Extracts a fingerprint for an x509 certificate
+    def self.x509(certificate)
+      normalize(OpenSSL::Digest::SHA1.new.hexdigest(certificate.to_der))
+    end
+  end
+end

data/lib/samlr/fingerprint_sha256.rb

@@ -0,0 +1,10 @@
+require "samlr/fingerprint"
+
+module Samlr
+  class FingerprintSHA256 < Fingerprint
+    # Extracts a fingerprint for an x509 certificate
+    def self.x509(certificate)
+      normalize(OpenSSL::Digest::SHA256.new.hexdigest(certificate.to_der))
+    end
+  end
+end

data/lib/samlr/signature.rb

@@ -21,7 +21,7 @@ module Samlr
       end
 
       @fingerprint = if options[:fingerprint]
-        Fingerprint.new(options[:fingerprint])
+        Fingerprint.from_string(options[:fingerprint])
       elsif options[:certificate]
         Certificate.new(options[:certificate]).fingerprint
       end
@@ -61,7 +61,7 @@ module Samlr
 
     # Establishes trust that the remote party is who you think
     def verify_fingerprint!
-      fingerprint.compare!(certificate!.fingerprint)
+      fingerprint.verify!(certificate!)
     end
 
     # Tests that the document content has not been edited

data/lib/samlr/version.rb

@@ -1,3 +1,3 @@
 module Samlr
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samlr
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -118,6 +118,8 @@ files:
 - lib/samlr/condition.rb
 - lib/samlr/errors.rb
 - lib/samlr/fingerprint.rb
+- lib/samlr/fingerprint_sha1.rb
+- lib/samlr/fingerprint_sha256.rb
 - lib/samlr/logout_request.rb
 - lib/samlr/reference.rb
 - lib/samlr/request.rb