samlsso 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 80749d59ffd97e8c6cf31f5b61e0c4494d6c5dab
-  data.tar.gz: 51813c27700b32e9cabbb264502a194d4b032f6c
+SHA256:
+  metadata.gz: 4e498a0d35bed7c8d8c4f432b34fc9494067f202dbf852a99a88617bb9f83ab6
+  data.tar.gz: 9c6c0ed8bcb706dba9e41f756d9f4e7fc3e2029009f54d2647c55a11f6d0781c
 SHA512:
-  metadata.gz: cb3d581356857a23bfc764d5da9c501809fa13742edf3bdd07656e4738884a3dba4233bd60e38ef0c60e712b3ed2a61717f4c5a832265812b77908420e9b6308
-  data.tar.gz: 1afedcdd3e921dbe63d04bd6ebea1b5d6f4905193cdcf445c185a87257beeca0b6f45e27a17f140275abcc35ba80fd197b80c67fe1695be89a3b8b75c9c2eedb
+  metadata.gz: 23180bf12ae60f4457abc0219f78de41406d54e8a40cf49a373c175bf111acd5a50bae20252c7aca3bdaef74fe4fa9530bed2b3a6558415f8f7da9780f007cd5
+  data.tar.gz: 71718a357e8fa6576243dee0a2918ce21f49987ed182dca8462b7bb82449dbbeb6d51f051377f2bd7225a022304447a4660b70415f9c2ef6744c0973f6360632

data/lib/samlsso/saml_message.rb

@@ -63,13 +63,13 @@ module Samlsso
             validation_error("XML document seems to be malformed and does not have correct Nodes")
           else
             encrypted_assertion.remove
-            decrypted_doc.root.add_child(assertion.last)
+            decrypted_doc.root.add_child(assertion.last.clone)
             return decrypted_doc.to_xml.squish
           end
         end
         return decoded_saml
       end
-      
+
       def decode_raw_saml(saml)
         if saml =~ /^</
           return saml

data/lib/samlsso/version.rb

@@ -1,3 +1,3 @@
 module Samlsso
-  VERSION = "0.1.3"
+  VERSION = "0.1.8"
 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

@@ -29,16 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("uuid", ["~> 2.3"])
   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_development_dependency('timecop', '<= 0.6.0')
-  else
-    spec.add_runtime_dependency('nokogiri', '~> 1.6.0')
-    spec.add_development_dependency('timecop',  '~> 0.7.2')
-  end
-
+  spec.add_runtime_dependency('nokogiri', '~> 1.10.8')
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1.2"
+  spec.add_development_dependency "rake", "~> 12.3.3"
+  spec.add_development_dependency "nokogiri", ">= 1.10.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samlsso
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Siddhartha Mukherjee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -44,56 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 1.10.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 1.10.8
 description: SAML SSO for Ruby
 email:
 - mukherjee.siddhartha@gmail.com
@@ -139,6 +139,10 @@ 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.gemspec
 homepage: https://github.com/siddhartham/samlsso
 licenses:
@@ -160,8 +164,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