libsaml 2.24.3 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d01e5b55b99fde2637019daaa318dfed1663799
-  data.tar.gz: 24260073d73b70481f4c402cd0463a2e05a0316b
+  metadata.gz: 8358775136d7df4adcd2cdb766fffefdc6a88352
+  data.tar.gz: aabc8811b6d09cc43cc4e22237df01582cbaeae6
 SHA512:
-  metadata.gz: a6569d32755654648be83347ea24537d488c5bc36c1aac6d7477a70b771a05b95131e856684b550fec957704024adde698378820787a94fa2fb426ead69895a8
-  data.tar.gz: 1deee01093f54043216583e616fcf68452e72aa4c08cd9c200b64e90c7ddccd0a1fc14bbf7363781f6bcfbc76b560c7793d57ece396f6e62d4f81d1cde787bc3
+  metadata.gz: c39601b63f721decde696d6b8e960a0b8bf2d1b98a8b49c9141271cc2f11cf2fdbbf4cebddce4df94916fc8994780712dd74eda18a2cd183854954546321b3c4
+  data.tar.gz: 58f15e65b6eff45522b193099164946bd3b9de48e439f3d66c7c4d721a6eeacf74ed72ad9c547b73ee1a6b6014da18c3182c4ad66d0a3c12bb7ae8ee0265611e

data/lib/saml/complex_types/attribute_type.rb

@@ -26,11 +26,6 @@ module Saml
         super(*(args << options))
       end
 
-      def attribute_value
-        warn '[DEPRECATED] `attribute_value` please use #attribute_values'
-        attribute_values.first.try(:content)
-      end
-
       def attribute_value=(value)
         attribute_value = if value.is_a? String
           Saml::Elements::AttributeValue.new(content: value)

data/lib/saml/complex_types/role_descriptor_type.rb

@@ -29,7 +29,7 @@ module Saml
       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)
+        key_descriptors_by_use = find_key_descriptors_by_use_or_without(use)
 
         if key_name.present? && key_name_specified?
           key_descriptors_by_use.find { |key| key.key_info.key_name == key_name }
@@ -38,9 +38,13 @@ module Saml
         end
       end
 
+      def find_key_descriptors_by_use(use)
+        key_descriptors.select { |key| key.use == use }
+      end
+
       private
 
-      def find_key_descriptors_by_use(use)
+      def find_key_descriptors_by_use_or_without(use)
         key_descriptors.select { |key| key.use == use || key.use.blank? }
       end
 

data/lib/saml/elements/attribute_statement.rb

@@ -10,16 +10,6 @@ module Saml
 
       has_many :attributes, Saml::Elements::Attribute
       has_many :encrypted_attributes, Saml::Elements::EncryptedAttribute
-
-      def attribute
-        warn '[DEPRECATED] `attribute` please use #attributes'
-        attributes
-      end
-
-      def attribute=(attributes)
-        warn '[DEPRECATED] `attribute=` please use #attributes='
-        self.attributes = attributes
-      end
     end
   end
 end

data/lib/saml/elements/encrypted_id.rb

@@ -23,9 +23,9 @@ module Saml
         super(*(args << options))
       end
 
-      def encrypt(key_descriptor, key_options = {})
-        certificate = key_descriptor.certificate
-        key_name = key_descriptor.key_info.key_name
+      def encrypt(key_descriptors, key_options = {})
+        key_descriptors = Array(key_descriptors)
+        encrypted_keys = []
 
         self.encrypted_data = Xmlenc::Builder::EncryptedData.new
         self.encrypted_data.set_key_retrieval_method Xmlenc::Builder::RetrievalMethod.new(
@@ -34,14 +34,21 @@ module Saml
         self.encrypted_data.set_encryption_method(
           algorithm: 'http://www.w3.org/2001/04/xmlenc#aes256-cbc'
         )
-        encrypted_key = self.encrypted_data.encrypt(name_id_xml, key_options)
-        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
-        self.encrypted_keys = [encrypted_key]
+
+        key_descriptors.each do |key_descriptor|
+          encrypted_key = self.encrypted_data.encrypt(name_id_xml, key_options)
+          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_descriptor.key_info.key_name)
+          encrypted_key.encrypt(key_descriptor.certificate.public_key)
+
+          encrypted_keys << encrypted_key
+        end
+
+        self.encrypted_keys = encrypted_keys
         self.name_id = nil
       end
 

data/lib/saml/notification.rb

@@ -12,7 +12,9 @@ module Saml
           define_method "#{method}_with_notification" do |*args|
             notify "#{method}", send("#{method}_without_notification", *args)
           end
-          alias_method_chain :#{method}, :notification
+
+          alias_method "#{method}_without_notification", :#{method}
+          alias_method :#{method}, "#{method}_with_notification"
         RUBY
 
         if instance_method

data/lib/saml/provider.rb

@@ -46,9 +46,8 @@ module Saml
       descriptor(type).find_key_descriptor(key_name, use)
     end
 
-    def private_key
-      warn '[DEPRECATED] `private_key` please use signing_key or encryption_key'
-      encryption_key
+    def find_key_descriptors_by_use(use, type = :descriptor)
+      descriptor(type).find_key_descriptors_by_use(use)
     end
 
     def signing_key

data/lib/saml/rails/controller_helper.rb

@@ -3,24 +3,24 @@ module Saml
     module ControllerHelper
       def self.included(base)
         base.extend self
-        base.before_filter :set_response_headers
+        base.before_action :set_response_headers
       end
 
       def current_provider(entity_id_or_method = nil, &block)
         if block_given?
-          before_filter &block
+          before_action &block
         else
           case entity_id_or_method
             when Symbol
-              before_filter { Saml.current_provider = send(entity_id_or_method) }
+              before_action { Saml.current_provider = send(entity_id_or_method) }
             else
-              before_filter { Saml.current_provider = Saml.provider("#{entity_id_or_method}") }
+              before_action { Saml.current_provider = Saml.provider("#{entity_id_or_method}") }
           end
         end
       end
 
       def current_store(store)
-        before_filter { Saml.current_store = store }
+        before_action { Saml.current_store = store }
       end
 
       def set_response_headers

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = '2.24.3'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.24.3
+  version: 3.0.1
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: xmlmapper
   requirement: !ruby/object:Gem::Requirement
@@ -76,22 +76,16 @@ dependencies:
   name: xmldsig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: xmlenc
   requirement: !ruby/object:Gem::Requirement