samlsso 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c4726e197c2a864889bce4358e93bdd5b7df30fb
-  data.tar.gz: 11171ba18c677689f9eb6a872c61a16760de99a4
+SHA256:
+  metadata.gz: 567792966ad8b41b2b5f1d29a33c63b2e005b42b31f3c270ebf443fe0b131ee6
+  data.tar.gz: 4973e6f287663dc65d8c48c1381ca1a6f524c3089b790ad3a52f8598266cf266
 SHA512:
-  metadata.gz: f9025569164d30991dbcc92a68b14ac1b3039a13f196947c4bb55b191a9a1480d6fbefe3bba859f2aa0fd3bd9df660111814da9d6c39cf3cb73deb0726e2e9ea
-  data.tar.gz: 506f296e5c1d651bec2ed9dcabad771ba231d27baea38700fd0873256ca537c365263fff569c6c81225dd3c3d7ed75ad65c29383e426f03775878189b27fffa6
+  metadata.gz: 60e7d2e2f9a5847d5b7d8427ad8f1246440b4bbb577f41f30fd05a0f62bc485519dab5da0646e2ea7799ac79e48594eafa331b38f30e6dd7b36324b052d37114
+  data.tar.gz: d2a1e81a0d4fc46ad53b8dc17516c1fa250942e46bebbac32f093aebffdfa3896c8f92091e868603f90bed19d6f2249057ba9c6833db9ad7013c51375d383ba7

data/lib/samlsso/version.rb

@@ -1,3 +1,3 @@
 module Samlsso
-  VERSION = "0.1.4"
+  VERSION = "0.1.9"
 end

data/lib/xml_security.rb

@@ -208,7 +208,8 @@ module XMLSecurity
       end
 
       # verify signature
-      signed_info_element     = REXML::XPath.first(@sig_element, "//ds:SignedInfo", {"ds"=>DSIG})
+      signed_info_element = REXML::XPath.first(@sig_element, "//ds:SignedInfo", {"ds"=>DSIG})
+      signed_info_element = REXML::XPath.first(@sig_element, "//ds:SignedInfo") unless signed_info_element
       noko_sig_element = document.at_xpath('//ds:Signature', 'ds' => DSIG)
       noko_signed_info_element = noko_sig_element.at_xpath('./ds:SignedInfo', 'ds' => DSIG)
       canon_algorithm = canon_algorithm REXML::XPath.first(@sig_element, '//ds:CanonicalizationMethod', 'ds' => DSIG)
@@ -216,33 +217,66 @@ module XMLSecurity
       noko_sig_element.remove
 
       # check digests
-      REXML::XPath.each(@sig_element, "//ds:Reference", {"ds"=>DSIG}) do |ref|
-        uri                           = ref.attributes.get_attribute("URI").value
+      if REXML::XPath.first(@sig_element, "//ds:Reference", {"ds"=>DSIG})
+        REXML::XPath.each(@sig_element, "//ds:Reference", {"ds"=>DSIG}) do |ref|
+          uri                           = ref.attributes.get_attribute("URI").value
 
-        hashed_element                = document.at_xpath("//*[@ID='#{uri[1..-1]}']")
-        canon_algorithm               = canon_algorithm REXML::XPath.first(ref, '//ds:CanonicalizationMethod', 'ds' => DSIG)
-        canon_hashed_element          = hashed_element.canonicalize(canon_algorithm, inclusive_namespaces)
+          hashed_element                = document.at_xpath("//*[@ID='#{uri[1..-1]}']")
+          canon_algorithm               = canon_algorithm REXML::XPath.first(ref, '//ds:CanonicalizationMethod', 'ds' => DSIG)
+          canon_hashed_element          = hashed_element.canonicalize(canon_algorithm, inclusive_namespaces)
 
-        digest_algorithm              = algorithm(REXML::XPath.first(ref, "//ds:DigestMethod", 'ds' => DSIG))
+          digest_algorithm_str          = REXML::XPath.first(ref, "//ds:DigestMethod", 'ds' => DSIG)
+          digest_algorithm_str          = REXML::XPath.first(ref, "//ds:DigestMethod") unless digest_algorithm_str
+          digest_algorithm              = algorithm(digest_algorithm_str)
 
-        hash                          = digest_algorithm.digest(canon_hashed_element)
-        digest_value                  = Base64.decode64(REXML::XPath.first(ref, "//ds:DigestValue", {"ds"=>DSIG}).text)
+          hash                          = digest_algorithm.digest(canon_hashed_element)
 
-        unless digests_match?(hash, digest_value)
-          @errors << "Digest mismatch"
-          return soft ? false : (raise Samlsso::ValidationError.new("Digest mismatch"))
+          base64_digest                 = REXML::XPath.first(ref, "//ds:DigestValue", {"ds"=>DSIG})
+          base64_digest                 = REXML::XPath.first(ref, "//ds:DigestValue") unless base64_digest
+          digest_value                  = Base64.decode64(base64_digest.text)
+
+          unless digests_match?(hash, digest_value)
+            @errors << "Digest mismatch"
+            return soft ? false : (raise Samlsso::ValidationError.new("Digest mismatch"))
+          end
+        end
+      else
+        REXML::XPath.each(@sig_element, "//ds:Reference") do |ref|
+          uri                           = ref.attributes.get_attribute("URI").value
+
+          hashed_element                = document.at_xpath("//*[@ID='#{uri[1..-1]}']")
+          canon_algorithm               = canon_algorithm REXML::XPath.first(ref, '//ds:CanonicalizationMethod', 'ds' => DSIG)
+          canon_hashed_element          = hashed_element.canonicalize(canon_algorithm, inclusive_namespaces)
+
+          digest_algorithm_str          = REXML::XPath.first(ref, "//ds:DigestMethod", 'ds' => DSIG)
+          digest_algorithm_str          = REXML::XPath.first(ref, "//ds:DigestMethod") unless digest_algorithm_str
+          digest_algorithm              = algorithm(digest_algorithm_str)
+
+          hash                          = digest_algorithm.digest(canon_hashed_element)
+
+          base64_digest                 = REXML::XPath.first(ref, "//ds:DigestValue", {"ds"=>DSIG})
+          base64_digest                 = REXML::XPath.first(ref, "//ds:DigestValue") unless base64_digest
+          digest_value                  = Base64.decode64(base64_digest.text)
+
+          unless digests_match?(hash, digest_value)
+            @errors << "Digest mismatch"
+            return soft ? false : (raise Samlsso::ValidationError.new("Digest mismatch"))
+          end
         end
       end
 
-      base64_signature        = REXML::XPath.first(@sig_element, "//ds:SignatureValue", {"ds"=>DSIG}).text
-      signature               = Base64.decode64(base64_signature)
+      base64_signature        = REXML::XPath.first(@sig_element, "//ds:SignatureValue", {"ds"=>DSIG})
+      base64_signature        = REXML::XPath.first(@sig_element, "//ds:SignatureValue") unless base64_signature
+      signature               = Base64.decode64(base64_signature.text)
 
       # get certificate object
       cert_text               = Base64.decode64(base64_cert)
       cert                    = OpenSSL::X509::Certificate.new(cert_text)
 
       # signature method
-      signature_algorithm     = algorithm(REXML::XPath.first(signed_info_element, "//ds:SignatureMethod", {"ds"=>DSIG}))
+      signature_method          = REXML::XPath.first(signed_info_element, "//ds:SignatureMethod", {"ds"=>DSIG})
+      signature_method          = REXML::XPath.first(signed_info_element, "//ds:SignatureMethod") unless signature_method
+      signature_algorithm       = algorithm(signature_method)
 
       unless cert.public_key.verify(signature_algorithm.new, signature, canon_string)
         @errors << "Key validation error"
@@ -273,4 +307,4 @@ module XMLSecurity
     end
 
   end
-end
+end

data/samlsso.gemspec

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("xmlenc", ["~> 0.6.4"])
   if RUBY_VERSION < '1.9'
     # 1.8.7
-    spec.add_runtime_dependency('nokogiri', '~> 1.6.0')
+    spec.add_runtime_dependency('nokogiri', '~> 1.8.5')
     spec.add_development_dependency('timecop', '<= 0.6.0')
   else
-    spec.add_runtime_dependency('nokogiri', '~> 1.6.0')
+    spec.add_runtime_dependency('nokogiri', '~> 1.8.5')
     spec.add_development_dependency('timecop',  '~> 0.7.2')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samlsso
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Siddhartha Mukherjee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,11 @@ files:
 - lib/schemas/xml.xsd
 - lib/schemas/xmldsig-core-schema.xsd
 - lib/xml_security.rb
+- samlsso-0.1.4.gem
+- samlsso-0.1.5.gem
+- samlsso-0.1.6.gem
+- samlsso-0.1.7.gem
+- samlsso-0.1.8.gem
 - samlsso.gemspec
 homepage: https://github.com/siddhartham/samlsso
 licenses:
@@ -160,8 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: SAML SSO for Ruby