libsaml 2.2.3 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d402f19158d3e53c1a8976385c19a8815ecb5c18
-  data.tar.gz: c8e633bf72f7ded9cb904240a4b9a0cdea55cf2b
+  metadata.gz: fc0c61acd404b9d659024b9b6d11afb2ac5fbeb5
+  data.tar.gz: a1d6cfaa1d4b9b800c5dc9eb31cb2e6e15ec8c47
 SHA512:
-  metadata.gz: cab305a1dfb5526398e43fedc38810cd5a4e8cb4c1dbcfa4046db94942c691f9c4a8eac5edff0cfdafb9895ffa8371879ecb52aff0fb9e8928033779125f7c97
-  data.tar.gz: 42b2b93102d444fdeafefcf71c1939fa3e5d0da48b3534eeb287978f99fea9aaabb7f6a9f61a58d01dc94040b5aa24751a7d03bd5e2e7e50c481a847167a189d
+  metadata.gz: a9a54851c001e6fb62e2a843670d62e00569800ccaa14289a6626ef153a4ceda795121011e7deaa9661f9015320fdd8bd0d749c5e3293d3300e8feb51249263c
+  data.tar.gz: 942e3254bd7280f6d6ad83eab64f9e5cd1f183cfa4e287791e178274ea8bfb265162881ec67128a99a92c75ebb965e7931fe0ca987b0fcc5766a3db8617f2ff4

data/lib/saml.rb

@@ -27,6 +27,8 @@ module Saml
     end
     class UnparseableMessage < SamlError
     end
+    class MetadataDownloadFailed < SamlError
+    end
     class InvalidStore < SamlError
       def initialize(store = '')
         @store = store
@@ -150,6 +152,7 @@ module Saml
 
   module ProviderStores
     require 'saml/provider_stores/file'
+    require 'saml/provider_stores/url'
   end
 
   module ProtocolBinding
@@ -190,7 +193,7 @@ module Saml
     if current_provider.entity_id == entity_id
       current_provider
     else
-      current_store.find_by_entity_id(entity_id) || raise(Saml::Errors::InvalidProvider.new)
+      current_store.find_by_entity_id(entity_id) || raise(Saml::Errors::InvalidProvider.new("Cannot find provider with entity_id: #{entity_id}"))
     end
   end
 

data/lib/saml/provider_stores/url.rb

@@ -0,0 +1,17 @@
+module Saml
+  module ProviderStores
+    class Url
+      attr_accessor :providers
+
+      def self.find_by_metadata_location(entity_id)
+        metadata          = Saml::Util.download_metadata_xml(entity_id)
+        entity_descriptor = Saml::Elements::EntityDescriptor.parse(metadata, single: true)
+        type              = entity_descriptor.sp_sso_descriptor.present? ? "service_provider" : "identity_provider"
+
+        BasicProvider.new(entity_descriptor, nil, type)
+      end
+
+      alias_method :find_by_entity_id, :find_by_metadata_location
+    end
+  end
+end

data/lib/saml/util.rb

@@ -22,17 +22,17 @@ module Saml
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
         if Saml::Config.ssl_certificate_file.present? && Saml::Config.ssl_private_key_file.present?
-          cert  = File.read(Saml::Config.ssl_certificate_file)
-          key   = File.read(Saml::Config.ssl_private_key_file)
+          cert = File.read(Saml::Config.ssl_certificate_file)
+          key  = File.read(Saml::Config.ssl_private_key_file)
 
-          http.cert        = OpenSSL::X509::Certificate.new(cert)
-          http.key         = OpenSSL::PKey::RSA.new(key)
+          http.cert = OpenSSL::X509::Certificate.new(cert)
+          http.key  = OpenSSL::PKey::RSA.new(key)
         end
 
         headers = { 'Content-Type' => 'text/xml' }
         headers.merge! additional_headers
 
-        request = Net::HTTP::Post.new(uri.request_uri, headers)
+        request      = Net::HTTP::Post.new(uri.request_uri, headers)
         request.body = message
 
         http.request(request)
@@ -68,7 +68,7 @@ module Saml
       def decrypt_assertion(encrypted_assertion, private_key)
         encrypted_assertion_xml = encrypted_assertion.is_a?(Saml::Elements::EncryptedAssertion) ?
             encrypted_assertion.to_xml : encrypted_assertion.to_s
-        encrypted_document = Xmlenc::EncryptedDocument.new(encrypted_assertion_xml)
+        encrypted_document      = Xmlenc::EncryptedDocument.new(encrypted_assertion_xml)
 
         Saml::Assertion.parse(encrypted_document.decrypt(private_key), single: true)
       end
@@ -86,6 +86,26 @@ module Saml
 
         message.class.parse(signed_node.to_xml, single: true)
       end
+
+      def download_metadata_xml(location)
+        uri = URI.parse(location)
+
+        http             = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl     = uri.scheme == 'https'
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+        request = Net::HTTP::Get.new(uri.request_uri)
+
+        response = http.request(request)
+        if response.code == '200'
+          response.body
+        else
+          raise Saml::Errors::MetadataDownloadFailed.new("Cannot download metadata for: #{location}: #{response.body}")
+        end
+      rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse,
+          Net::HTTPHeaderSyntaxError, Net::ProtocolError => error
+        raise Saml::Errors::MetadataDownloadFailed.new("Cannot download metadata for: #{location}: #{error.message}")
+      end
     end
   end
 end

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.2.3"
+  VERSION = "2.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.1
 platform: ruby
 authors:
 - Benoist Claassen
@@ -195,6 +195,7 @@ files:
 - lib/saml/null_provider.rb
 - lib/saml/provider.rb
 - lib/saml/provider_stores/file.rb
+- lib/saml/provider_stores/url.rb
 - lib/saml/rails/controller_helper.rb
 - lib/saml/response.rb
 - lib/saml/util.rb