libsaml 2.6.9 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f3cf75b46d2b609833d25d95885729375da73aa
-  data.tar.gz: 5805bc07e25fb8adf789e01241a6f345d83f6255
+  metadata.gz: 15b1bc506c0d773071297dcf07db5790ae88f380
+  data.tar.gz: ec73cff60998ef1fbb56ff21997cd28765dfd818
 SHA512:
-  metadata.gz: 1d2956bfb640175f6130875d8c7a60066e073187c9d99472d982d26468ff65ad08edba8405393f31aaee6e64dfcdddfd30a65cd4c9d99d79a9343a36c28f5ac0
-  data.tar.gz: 84006915de32c6dbba5a8e6d184b165f49aa1548c819cbd2d4500d00afd78f7808e7eb5680e7d2ebe36163b83b818d5d87b3f2936ad3cb30667a36aef6920ba5
+  metadata.gz: 5774652f6ed9ad934b8bc619ec691cfe1bd90c423723f785ad5e5697a12973ef2ce182a76bd0f8973858efc20a42c4cc1eee77d0ff47a0dca9a40d314057d576
+  data.tar.gz: cc807e052949b5d7319e504329644e330fea0d9a32898a9333b8379c597914e521995b4e46d99fa0ffc9e713264be4d6bea9b35ac49cf376d510a5f11692af39

data/lib/saml/provider.rb

@@ -35,10 +35,14 @@ module Saml
     end
 
     def certificate(key_name = nil, use = "signing")
-      key_descriptor = descriptor.find_key_descriptor(key_name, use)
+      key_descriptor = find_key_descriptor(key_name, use)
       key_descriptor.certificate if key_descriptor
     end
 
+    def find_key_descriptor(key_name = nil, use = "signing")
+      descriptor.find_key_descriptor(key_name, use)
+    end
+
     def private_key
       @private_key
     end

data/lib/saml/util.rb

@@ -51,7 +51,18 @@ module Saml
         end
       end
 
-      def encrypt_assertion(assertion, certificate)
+      def encrypt_assertion(assertion, key_descriptor_or_certificate)
+        case key_descriptor_or_certificate
+        when OpenSSL::X509::Certificate
+          certificate = key_descriptor_or_certificate
+          key_name = nil
+        when Saml::Elements::KeyDescriptor
+          certificate = key_descriptor_or_certificate.certificate
+          key_name = key_descriptor_or_certificate.key_info.key_name
+        else
+          raise ArgumentError.new("Expecting Certificate or KeyDescriptor got: #{key_descriptor_or_certificate.class}")
+        end
+
         assertion = assertion.to_xml(nil, nil, false) if assertion.is_a?(Assertion) # create xml without instruct
 
         encrypted_data = Xmlenc::Builder::EncryptedData.new
@@ -60,6 +71,7 @@ module Saml
         encrypted_key = encrypted_data.encrypt(assertion.to_s)
         encrypted_key.set_encryption_method(algorithm:               'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p',
                                             digest_method_algorithm: 'http://www.w3.org/2000/09/xmldsig#sha1')
+        encrypted_key.set_key_name(key_name)
         encrypted_key.encrypt(certificate.public_key)
 
         Saml::Elements::EncryptedAssertion.new(encrypted_data: encrypted_data, encrypted_keys: encrypted_key)

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.6.9"
+  VERSION = "2.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.7.0
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement