libsaml 2.15.3 → 2.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2db62f5b3abb1ca37456aa12e69d363b23178cc
-  data.tar.gz: c0b5292becca288420deed6034eafa16f51750fb
+  metadata.gz: 4ff45f250b6c9660592b1bd45e38be03353e3477
+  data.tar.gz: 007f63e6a19af60dbb06b8a32aeaec058f97436c
 SHA512:
-  metadata.gz: 3c3754321105462f5f18780706d8c32ec63351ec6c793ef9d93df916768ff18809a036eab4abef1ea9b46df6a6c65c2184de40df68ff9ba801730a6ada0aa0f0
-  data.tar.gz: 09a682a5833c2766bdb0887ff9151d561cb9e8cc3cf0fc7429f666987996adacd313b9f3679765a8c36d9ad647be4bcc50ad17235bd38f534091588674ca0220
+  metadata.gz: 92bb5e00d9f0072b5a32721c548ac788280ce96e3f150343fd6fd4d26213d0b1fc35eeb60cb8fb3544a48356317092ab4f6814e503cc3fe239c52e0aef7cde69
+  data.tar.gz: a4324d76708a171c044c9cc4b4303a19c14b3952a081a6f2d525f97739e0d9d8e1a15aa4ce91b35d1e6eea79c6d6ebba0be4c84f5c7b1070eb9bc32659947c58

data/lib/saml/assertion.rb

@@ -3,6 +3,8 @@ module Saml
     include Saml::Base
     include Saml::XMLHelpers
 
+    attr_accessor :xml_value
+
     register_namespace 'samlp', Saml::SAMLP_NAMESPACE
     register_namespace 'saml', Saml::SAML_NAMESPACE
 

data/lib/saml/authn_request.rb

@@ -2,6 +2,8 @@ module Saml
   class AuthnRequest
     include Saml::ComplexTypes::RequestAbstractType
 
+    attr_accessor :xml_value
+
     tag 'AuthnRequest'
     attribute :force_authn, Boolean, :tag => "ForceAuthn"
     attribute :is_passive, Boolean, :tag => "IsPassive"

data/lib/saml/base.rb

@@ -8,8 +8,6 @@ module Saml
       include ::XmlMapper
       include ::ActiveModel::Validations
 
-      attr_accessor :xml_node
-
       def use_parsed
         @use_parsed = true
         self
@@ -35,6 +33,11 @@ module Saml
       def from_xml?
         @from_xml
       end
+
+      def use_original(object)
+        registered_namespaces.merge!(Saml::Util.collect_extra_namespaces(object.xml_value))
+        object.use_parsed
+      end
     end
 
     module XmlMapperClassMethods

data/lib/saml/response.rb

@@ -2,6 +2,8 @@ module Saml
   class Response
     include Saml::ComplexTypes::StatusResponseType
 
+    attr_accessor :xml_value
+
     tag "Response"
     has_many :assertions, Saml::Assertion, xpath: './'
     has_many :encrypted_assertions, Saml::Elements::EncryptedAssertion

data/lib/saml/util.rb

@@ -29,10 +29,10 @@ module Saml
           http.key  = OpenSSL::PKey::RSA.new(key)
         end
 
-        headers = { 
-          'Content-Type' => 'text/xml',
-          'Cache-Control' => 'no-cache, no-store',
-          'Pragma' => 'no-cache'
+        headers = {
+            'Content-Type'  => 'text/xml',
+            'Cache-Control' => 'no-cache, no-store',
+            'Pragma'        => 'no-cache'
         }
         headers.merge! additional_headers
 
@@ -57,14 +57,14 @@ module Saml
 
       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}")
+          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
@@ -100,7 +100,7 @@ module Saml
       end
 
       def decrypt_encrypted_id(encrypted_id, private_key)
-        encrypted_id_xml = encrypted_id.is_a?(Saml::Elements::EncryptedID) ?
+        encrypted_id_xml   = encrypted_id.is_a?(Saml::Elements::EncryptedID) ?
             encrypted_id.to_xml : encrypted_id.to_s
         encrypted_document = Xmlenc::EncryptedDocument.new(encrypted_id_xml)
         Saml::Elements::EncryptedID.parse(encrypted_document.decrypt(private_key))
@@ -120,6 +120,11 @@ module Saml
         message.class.parse(signed_node.to_xml, single: true)
       end
 
+      def collect_extra_namespaces(raw_xml)
+        doc = Nokogiri::XML(raw_xml, nil, nil, Nokogiri::XML::ParseOptions::STRICT)
+        doc.collect_namespaces.each_with_object({}) { |(prefix, path), hash| hash[prefix.gsub('xmlns:', '')] = path }
+      end
+
       def download_metadata_xml(location)
         uri = URI.parse(location)
 

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.15.3"
+  VERSION = "2.15.4"
 end

data/lib/saml/xml_helpers.rb

@@ -17,8 +17,8 @@ module Saml
       write_xml            = builder.nil? ? true : false
       builder              ||= Nokogiri::XML::Builder.new
       builder.doc.encoding = "UTF-8"
-      result = if xml_node && use_parsed?
-        builder.send(:insert, xml_node)
+      result = if use_parsed? && respond_to?(:xml_value)
+        builder << xml_value
         builder
       else
         super(builder, default_namespace)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.15.3
+  version: 2.15.4
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: xmldsig
   requirement: !ruby/object:Gem::Requirement