Merge pull request #402 from graaff/idp_cert_multi-response-check

Allow responses to work with only an idp_cert_multi setting
SAML-Toolkits · Jul 4, 2017 · 6ca9a93 · 6ca9a93
2 parents 5247202 + ed8bd53
commit 6ca9a93
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/lib/onelogin/ruby-saml/logoutresponse.rb b/lib/onelogin/ruby-saml/logoutresponse.rb
@@ -168,7 +168,7 @@ def valid_state?
 
         return append_error("No issuer in settings of the logout response") if settings.issuer.nil?
 
-        if settings.idp_cert_fingerprint.nil? && settings.idp_cert.nil?
+        if settings.idp_cert_fingerprint.nil? && settings.idp_cert.nil? && settings.idp_cert_multi.nil?
           return append_error("No fingerprint or certificate on settings of the logout response")
         end
 

diff --git a/lib/onelogin/ruby-saml/response.rb b/lib/onelogin/ruby-saml/response.rb
@@ -412,7 +412,7 @@ def validate_response_state
 
         return append_error("No settings on response") if settings.nil?
 
-        if settings.idp_cert_fingerprint.nil? && settings.idp_cert.nil?
+        if settings.idp_cert_fingerprint.nil? && settings.idp_cert.nil? && settings.idp_cert_multi.nil?
           return append_error("No fingerprint or certificate on settings")
         end
 

diff --git a/test/logoutresponse_test.rb b/test/logoutresponse_test.rb
@@ -90,6 +90,7 @@ class RubySamlTest < Minitest::Test
         it "invalidate logout response when initiated with no idp cert or fingerprint" do
           settings.idp_cert_fingerprint = nil
           settings.idp_cert = nil
+          settings.idp_cert_multi = nil
           logoutresponse = OneLogin::RubySaml::Logoutresponse.new(valid_logout_response_document, settings)
           assert !logoutresponse.validate
           assert_includes logoutresponse.errors, "No fingerprint or certificate on settings of the logout response"

diff --git a/test/response_test.rb b/test/response_test.rb
@@ -138,6 +138,7 @@ class RubySamlTest < Minitest::Test
         it "raise when No fingerprint or certificate on settings" do
           settings.idp_cert_fingerprint = nil
           settings.idp_cert = nil
+          settings.idp_cert_multi = nil
           response.settings = settings
           error_msg = "No fingerprint or certificate on settings"
           assert_raises(OneLogin::RubySaml::ValidationError, error_msg) do