Use new behaviour only providing a flag

SAML-Toolkits · Jul 3, 2018 · 11cecaa · 11cecaa
1 parent 4a4577d
commit 11cecaa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/lib/onelogin/ruby-saml/settings.rb b/lib/onelogin/ruby-saml/settings.rb
@@ -9,10 +9,15 @@ module RubySaml
     # SAML2 Toolkit Settings
     #
     class Settings
-      def initialize(overrides = {})
-        security_attributes = overrides.delete(:security) || {}
-        config = DEFAULTS.merge(overrides)
-        config[:security] = DEFAULTS[:security].merge(security_attributes)
+      def initialize(overrides = {}, keep_security_attributes = false)
+        if keep_security_attributes
+          security_attributes = overrides.delete(:security) || {}
+          config = DEFAULTS.merge(overrides)
+          config[:security] = DEFAULTS[:security].merge(security_attributes)
+        else
+          config = DEFAULTS.merge(overrides)
+        end
+
         config.each do |k,v|
           acc = "#{k.to_s}=".to_sym
           if respond_to? acc

diff --git a/test/settings_test.rb b/test/settings_test.rb
@@ -77,7 +77,7 @@ class SettingsTest < Minitest::Test
       assert_equal new_settings.security[:signature_method], XMLSecurity::Document::RSA_SHA1
     end
 
-    it "overrides only provided security attributes" do
+    it "overrides only provided security attributes passing a second parameter" do
       config = {
         :security => {
           :metadata_signed => true
@@ -86,7 +86,7 @@ class SettingsTest < Minitest::Test
 
       @default_attributes = OneLogin::RubySaml::Settings::DEFAULTS
 
-      @settings = OneLogin::RubySaml::Settings.new(config)
+      @settings = OneLogin::RubySaml::Settings.new(config, true)
       assert_equal @settings.security[:metadata_signed], true
       assert_equal @settings.security[:digest_method], @default_attributes[:security][:digest_method]
     end