libsaml 2.12.1 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e61d591af0a0359bfeebe1d244073d64882d50c
-  data.tar.gz: a884a8d7a3f7fd48b28a7ed771ebb35344fd6c63
+  metadata.gz: 5359f70cb191c9ed46d66b875efca2c5a456eef1
+  data.tar.gz: 1c6d0fa41102a3c807c05fdf3d7d21f7b5e6a5ed
 SHA512:
-  metadata.gz: ea787ba8b41825c9f43426e96c00ab01bc6b962ab3344c2885ba131dd5976169db473eff36c48d4fa8ffb610ecf9dc031611883ac3f598cd9a73e55813f9e494
-  data.tar.gz: 437d89e72e92a29fb2f30174299ca7ded94c19654f8abfa96caf4f561f24099d34f3ba658ee37b3ce60a874aa5637e3a9261edc2356e090e479d6734a817d7ed
+  metadata.gz: 8379e0e7114a14b779325201a333226b803135d5ff417ad48e601e47d20f087bdce965a26cf29fab9adb48d81be00f6fe5d3bd86aac74e27c202a4c5306d9823
+  data.tar.gz: 6bce47311f98cdc0aba1ceaee744e76005c5465ef013a3e9410f72b170d21049ff52c898e5c32810f05d5de930b3258a366fe22a74d8fd7e9c7fedf73c739580

data/lib/saml/base.rb

@@ -8,6 +8,9 @@ module Saml
       include ::HappyMapper
       include ::ActiveModel::Validations
 
+      attr_accessor :xml_value
+      has_xml_content
+
       extend HappyMapperClassMethods
       include HappyMapperInstanceMethods
     end
@@ -19,9 +22,7 @@ module Saml
         end
       end
 
-      def from_xml=(bool)
-        @from_xml = bool
-      end
+      attr_writer :from_xml
 
       def from_xml?
         @from_xml

data/lib/saml/elements/signature.rb

@@ -23,9 +23,8 @@ module Saml
 
       def initialize(*args)
         super(*args)
-        options       = args.extract_options!
-        @signed_info  ||= SignedInfo.new(:uri => options.delete(:uri), :digest_value => options.delete(:digest_value))
-        @key_info     ||= KeyInfo.new
+        options      = args.extract_options!
+        @signed_info ||= SignedInfo.new(:uri => options.delete(:uri), :digest_value => options.delete(:digest_value))
       end
 
       def key_name

data/lib/saml/provider.rb

@@ -3,24 +3,25 @@ module Saml
     extend ActiveSupport::Concern
 
     def assertion_consumer_service_url(index = nil)
-      find_indexed_service_url(descriptor.assertion_consumer_services, index)
+      find_indexed_service_url(sp_descriptor.assertion_consumer_services, index)
     end
 
-    def artifact_resolution_service_url(index = nil)
-      find_indexed_service_url(descriptor.artifact_resolution_services, index)
+    # @param [Symbol] type (see #descriptor)
+    def artifact_resolution_service_url(index = nil, type = :descriptor)
+      find_indexed_service_url(descriptor(type).artifact_resolution_services, index)
     end
 
     def attribute_consuming_service(index = nil)
-      find_indexed_service(descriptor.attribute_consuming_services, index)
+      find_indexed_service(sp_descriptor.attribute_consuming_services, index)
     end
 
     def assertion_consumer_service(index = nil)
-      find_indexed_service(descriptor.assertion_consumer_services, index)
+      find_indexed_service(sp_descriptor.assertion_consumer_services, index)
     end
 
     def assertion_consumer_service_indices
-      if descriptor.assertion_consumer_services.present?
-        descriptor.assertion_consumer_services.map(&:index)
+      if sp_descriptor.assertion_consumer_services.present?
+        sp_descriptor.assertion_consumer_services.map(&:index)
       else
         []
       end
@@ -34,13 +35,15 @@ module Saml
       entity_descriptor.entity_id
     end
 
-    def certificate(key_name = nil, use = "signing")
-      key_descriptor = find_key_descriptor(key_name, use)
+    # @param [Symbol] type (see #descriptor)
+    def certificate(key_name = nil, use = "signing", type = :descriptor)
+      key_descriptor = find_key_descriptor(key_name, use, type)
       key_descriptor.certificate if key_descriptor
     end
 
-    def find_key_descriptor(key_name = nil, use = "signing")
-      descriptor.find_key_descriptor(key_name, use)
+    # @param [Symbol] type (see #descriptor)
+    def find_key_descriptor(key_name = nil, use = "signing", type = :descriptor)
+      descriptor(type).find_key_descriptor(key_name, use)
     end
 
     def private_key
@@ -52,19 +55,28 @@ module Saml
     end
 
     def single_sign_on_service_url(binding)
-      find_binding_service(descriptor.single_sign_on_services, binding)
+      find_binding_service(idp_descriptor.single_sign_on_services, binding)
     end
 
-    def single_logout_service_url(binding)
-      find_binding_service(descriptor.single_logout_services, binding)
+    # @param [Symbol] type (see #descriptor)
+    def single_logout_service_url(binding, type = :descriptor)
+      find_binding_service(descriptor(type).single_logout_services, binding)
     end
 
     def attribute_service_url(binding)
-      find_binding_service(entity_descriptor.attribute_authority_descriptor.attribute_service, binding)
+      find_binding_service(aa_descriptor.attribute_service, binding)
     end
 
     def type
-      descriptor.is_a?(Saml::Elements::SPSSODescriptor) ? "service_provider" : "identity_provider"
+      if idp_descriptor(false)
+        if sp_descriptor(false)
+          "identity_and_service_provider"
+        else
+          "identity_provider"
+        end
+      else
+        "service_provider"
+      end
     end
 
     def verify(signature_algorithm, signature, data, key_name = nil)
@@ -72,7 +84,7 @@ module Saml
     end
 
     def authn_requests_signed?
-      descriptor.authn_requests_signed
+      sp_descriptor.authn_requests_signed
     end
 
     private
@@ -87,11 +99,34 @@ module Saml
       end
     end
 
-    # @return [Saml::ComplexTypes::RoleDescriptorType]
-    def descriptor
+    # @param type [Symbol] Descriptor type, available types :sp_descriptor, :idp_descriptor, :aa_descriptor or :descriptor
+    # @return [Saml::ComplexTypes::SSODescriptorType]
+    def descriptor(type = :descriptor)
+      return sp_descriptor if :sp_descriptor == type
+      return idp_descriptor if :idp_descriptor == type
+      return aa_descriptor if :aa_descriptor == type
       entity_descriptor.sp_sso_descriptor || entity_descriptor.idp_sso_descriptor || entity_descriptor.attribute_authority_descriptor
     end
 
+    # @return [Saml::Elements::SPSSODescriptor]
+    def sp_descriptor(raise_error = true)
+      entity_descriptor.sp_sso_descriptor || raise_error &&
+          raise(Saml::Errors::InvalidProvider.new("Cannot find service provider with entity_id: #{entity_id}"))
+    end
+
+    # @return [Saml::Elements::IDPSSODescriptor]
+    def idp_descriptor(raise_error = true)
+      entity_descriptor.idp_sso_descriptor || raise_error &&
+          raise(Saml::Errors::InvalidProvider.new("Cannot find identity provider with entity_id: #{entity_id}"))
+    end
+
+    # Attribute authority descriptor
+    # @return [Saml::Elements::AttributeAuthorityDescriptor]
+    def aa_descriptor(raise_error = true)
+      entity_descriptor.attribute_authority_descriptor || raise_error &&
+          raise(Saml::Errors::InvalidProvider.new("Cannot find attribute authority provider with entity_id: #{entity_id}"))
+    end
+
     def find_indexed_service_url(service_list, index)
       service = find_indexed_service(service_list, index)
       service.location if service

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.12.1"
+  VERSION = "2.13.1"
 end

data/lib/saml/xml_helpers.rb

@@ -8,20 +8,24 @@ module Saml
       self.signature.key_info = Saml::Elements::KeyInfo.new(x509certificate.to_pem) if x509certificate
     end
 
-    def to_xml(builder = nil, default_namespace = nil, instruct = true)
+    def to_xml(*args)
+      options                              = args.extract_options!
+      builder, default_namespace, instruct = args
+      instruct                             = true if instruct.nil?
+
       write_xml            = builder.nil? ? true : false
       builder              ||= Nokogiri::XML::Builder.new
       builder.doc.encoding = "UTF-8"
       result               = super(builder, default_namespace)
+
       if write_xml
-        instruct ? result.to_xml : result.doc.root
+        instruct ? result.to_xml(nokogiri_options(options)) : result.doc.root
       else
         result
       end
-
     end
 
-    def to_soap
+    def to_soap(options = {})
       builder = Nokogiri::XML::Builder.new
       body    = self.to_xml(builder)
 
@@ -32,7 +36,17 @@ module Saml
           builder.parent.add_child body.doc.root
         end
       end
-      builder.to_xml
+      builder.to_xml(nokogiri_options(options))
+    end
+
+    private
+
+    def nokogiri_options(options)
+      nokogiri_options             = {
+          save_with: Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::FORMAT
+      }
+      nokogiri_options[:save_with] = Nokogiri::XML::Node::SaveOptions::AS_XML if options[:no_space]
+      nokogiri_options
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.13.1
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: xmlenc
   requirement: !ruby/object:Gem::Requirement