libsaml 2.20.5 → 2.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b30e94ad7e7b8311c5b84c5edea49b20dae43a6
-  data.tar.gz: a9d74c63b1cbab83ea6e8af8661757893603cd34
+  metadata.gz: e7a5bc6d4b39b33a25b99f8de2b19c909fc900a6
+  data.tar.gz: 9b49196c7e2f24300c8e5674d242c7f5b39feac4
 SHA512:
-  metadata.gz: f8ff347da53be0f0d7851d6575697bdb0b77e03c8f96e337228e58b6284d8cf875d9883e71c11da58aa08aa1bb8d420a63bd01d25370331cb47ed6c265e1668a
-  data.tar.gz: 69346069b05a10f2e66dfd34d797395301f201d9c8a4f2784ed8ca44ada5174c9e413813b7b762dc58a3b8145b5bde253dcf9436a21f96aea0eab44d06a36ab0
+  metadata.gz: b892f8c29b90e96ec3b5c867c412ab86618fe070fef6a747bb40d212fd8516fb0f04b0d8df64cb75bec2aa809adca251574c7a8220506219e05790c88a8eecad
+  data.tar.gz: ce074d548cefdee9d0074e9cf3247ee297ebabe733a649fd72ffe64c0b511c7ed00bc3c3d4bd37bbde3716b11b5896b616dc5a13624b59efa1f234f1a02179a7

data/lib/saml/bindings/http_redirect.rb

@@ -75,7 +75,7 @@ module Saml
         end
 
         relay_state = params["RelayState"] ? "&RelayState=#{params['RelayState']}" : ""
-        "#{param_key}=#{params['SAMLRequest']}#{relay_state}&SigAlg=#{params['SigAlg']}"
+        "#{param_key}=#{params[param_key]}#{relay_state}&SigAlg=#{params['SigAlg']}"
       end
 
       def encoded_message

data/lib/saml/complex_types/role_descriptor_type.rb

@@ -27,9 +27,11 @@ module Saml
       end
 
       def find_key_descriptor(key_name, use)
+        return key_descriptors.first unless key_name_or_use_specified?
+
         key_descriptors_by_use = find_key_descriptors_by_use(use)
 
-        if key_name.present?
+        if key_name.present? && key_name_specified?
           key_descriptors_by_use.find { |key| key.key_info.key_name == key_name }
         else
           key_descriptors_by_use.first
@@ -41,6 +43,14 @@ module Saml
       def find_key_descriptors_by_use(use)
         key_descriptors.select { |key| key.use == use || key.use.blank? }
       end
+
+      def key_name_or_use_specified?
+        key_descriptors.any? { |key| key.use.present? || key.key_info.key_name.present? }
+      end
+
+      def key_name_specified?
+        key_descriptors.any? { |key| key.key_info.key_name.present? }
+      end
     end
   end
 end

data/lib/saml/config.rb

@@ -18,6 +18,9 @@ module Saml
     mattr_accessor :registered_stores
     @@registered_stores = {}
 
+    mattr_accessor :generate_key_name
+    @@generate_key_name = true
+
     mattr_accessor :default_store
 
     mattr_accessor :inclusive_namespaces_prefix_list

data/lib/saml/elements/key_info.rb

@@ -19,7 +19,7 @@ module Saml
         if cert
           self.x509Data = X509Data.new(cert)
         end
-        if self.x509Data && self.x509Data.x509certificate
+        if self.x509Data && self.x509Data.x509certificate && Saml::Config.generate_key_name
           self.key_name = Digest::SHA1.hexdigest(self.x509Data.x509certificate.to_der)
         end
       end

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = '2.20.5'
+  VERSION = '2.20.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.20.5
+  version: 2.20.6
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport