Merge remote-tracking branch 'remotes/johnnyshields/signed-doc-refactor-final' into v2.x-nokogiri-parrtial-upgrade-phase-3

Author: johnnyshields

lib/ruby_saml/idp_metadata_parser.rb

@@ -306,11 +306,10 @@ def single_signon_service_url(binding_priority = nil)
         binding = single_signon_service_binding(binding_priority)
         return if binding.nil?
 
-        node = @idpsso_descriptor.at_xpath(
+        @idpsso_descriptor.at_xpath(
           "md:SingleSignOnService[@Binding=\"#{binding}\"]/@Location",
           SamlMetadata::NAMESPACE
-        )
-        node&.value
+        )&.value
       end
 
       # @param binding_priority [String|Array<String>] The prioritized list of Binding values to select. Will select first value if nil.
@@ -320,11 +319,10 @@ def single_logout_service_url(binding_priority = nil)
         binding = single_logout_service_binding(binding_priority)
         return if binding.nil?
 
-        node = @idpsso_descriptor.at_xpath(
+        @idpsso_descriptor.at_xpath(
           "md:SingleLogoutService[@Binding=\"#{binding}\"]/@Location",
           SamlMetadata::NAMESPACE
-        )
-        node&.value
+        )&.value
       end
 
       # @param binding_priority [String|Array<String>] The prioritized list of Binding values to select. Will select first value if nil.

lib/ruby_saml/logoutresponse.rb

@@ -4,8 +4,11 @@
 require "ruby_saml/saml_message"
 require "time"
 
+# Only supports SAML 2.0
 module RubySaml
+
   # SAML2 Logout Response (SLO IdP initiated, Parser)
+  #
   class Logoutresponse < SamlMessage
     include ErrorHandling
 
@@ -41,7 +44,7 @@ def initialize(response, settings = nil, options = {})
 
       @options = options
       @response = decode_raw_saml(response, settings)
-      @document = RubySaml::XML::SignedDocument.new(@response)
+      @document = Nokogiri::XML(@response)
       super()
     end
 
@@ -61,45 +64,41 @@ def success?
     #
     def in_response_to
       @in_response_to ||= begin
-        node = REXML::XPath.first(
-          document,
+        node = document.at_xpath(
           "/p:LogoutResponse",
           { "p" => PROTOCOL }
         )
-        node.nil? ? nil : node.attributes['InResponseTo']
+        node.nil? ? nil : node['InResponseTo']
       end
     end
 
     # @return [String] Gets the Issuer from the Logout Response.
     #
     def issuer
       @issuer ||= begin
-        node = REXML::XPath.first(
-          document,
+        document.at_xpath(
           "/p:LogoutResponse/a:Issuer",
           { "p" => PROTOCOL, "a" => ASSERTION }
-        )
-        Utils.element_text(node)
+        )&.content
       end
     end
 
     # @return [String] Gets the StatusCode from a Logout Response.
     #
     def status_code
       @status_code ||= begin
-        node = REXML::XPath.first(document, "/p:LogoutResponse/p:Status/p:StatusCode", { "p" => PROTOCOL })
-        node.nil? ? nil : node.attributes["Value"]
+        node = document.at_xpath("/p:LogoutResponse/p:Status/p:StatusCode", { "p" => PROTOCOL })
+        node.nil? ? nil : node['Value']
       end
     end
 
     def status_message
       @status_message ||= begin
-        node = REXML::XPath.first(
-          document,
+        node = document.at_xpath(
           "/p:LogoutResponse/p:Status/p:StatusMessage",
           { "p" => PROTOCOL }
         )
-        Utils.element_text(node)
+        node&.content
       end
     end
 
@@ -148,8 +147,7 @@ def validate_success_status
     # @raise [ValidationError] if soft == false and validation fails
     #
     def validate_structure
-      check_malformed_doc = check_malformed_doc?(settings)
-      unless valid_saml?(document, soft, check_malformed_doc: check_malformed_doc)
+      unless valid_saml?(document, soft)
         return append_error("Invalid SAML Logout Response. Not match the saml-schema-protocol-2.0.xsd")
       end
 
@@ -271,4 +269,4 @@ def validate_signature
       true
     end
   end
-end
+end