samlsso 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c479c3d00dab26b27abac39e977a53d0f00d94f
-  data.tar.gz: c7a702cbac650ccda58721c97d5ab74731b8bf49
+  metadata.gz: f77cfd3855990131639ddbb2c93737cfe8e5884d
+  data.tar.gz: a88195b337a64de1b2e237d92de9a8c82c3d4557
 SHA512:
-  metadata.gz: 0be017698f649229731f2787dfedfcfb0e8f0935096ffddf998d7920e51871158882acde73dcac1b4a575a3b3b61e06da6bd70fa42221fe4e0290048244bd328
-  data.tar.gz: 1b3308dac45366ede2aacafaea28ebc19ec17bd9c7ca0e1cecc9a2d3e958b73e5902669db5351383be6abae3bcbe6e8fe05e83affe48d30be0f2fc37169c11a7
+  metadata.gz: ea9a273fc674702a632a66b761deb62793f046addc303c7d767fe829781502164380917c29d44df39bf7ac9f0035e6333cb121e67e7554d77fc1d47af5c3b8fa
+  data.tar.gz: d83e3a13e682e1c241805af627d6fe341cc02eaf8a3f4392d78d4346ff54ae3425887fe8ab07e82ee68b70589e2650c33ad24b27353ce51c54d9b4ff969f8b86

data/lib/samlsso/version.rb

@@ -1,3 +1,3 @@
 module Samlsso
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/xml_security.rb

@@ -217,26 +217,47 @@ module XMLSecurity
       noko_sig_element.remove
 
       # check digests
-      tmp = REXML::XPath.each(@sig_element, "//ds:Reference", {"ds"=>DSIG})
-      tmp = REXML::XPath.each(@sig_element, "//ds:Reference") unless tmp.count > 0
-      tmp 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              = algorithm(REXML::XPath.first(ref, "//ds:DigestMethod", 'ds' => DSIG))
 
-        hash                          = digest_algorithm.digest(canon_hashed_element)
+          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)
+          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"))
+          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              = algorithm(REXML::XPath.first(ref, "//ds:DigestMethod", 'ds' => DSIG))
+
+          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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samlsso
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Siddhartha Mukherjee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -140,6 +140,7 @@ files:
 - lib/schemas/xmldsig-core-schema.xsd
 - lib/xml_security.rb
 - samlsso-0.1.4.gem
+- samlsso-0.1.5.gem
 - samlsso.gemspec
 homepage: https://github.com/siddhartham/samlsso
 licenses: