libsaml 2.19.10 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 464de8f091ef60bdfaf6423482db3000e7966679
-  data.tar.gz: ff6f2502ce820321ee42528735eb25b78764aebf
+  metadata.gz: 03f151738b652768bfa0a378d0e3f8b2a346b542
+  data.tar.gz: be0de973fd8ee3c11d37261a09b973e57cf2621d
 SHA512:
-  metadata.gz: 229705c6269fb63d9cd97721f92eec2997ef9fd0e43b83d9918736eda6cfddc54046e0ef9ae4e3c0db1ae95d66f851ecb4d66bd1dcc791562e0b0767a2220206
-  data.tar.gz: 4ff6cd8a271ac3444f02fa9c9c881aee77c548ded64d7499fdf1bccccc1dca423a7bd42583e799c60e53781156899677f98229a5b17fa9d41a96d1838ad0fd1e
+  metadata.gz: 0a91727caf2cbdc4daaed5502f0946a691d3a2569b1bf3281e19b1b619132cbb53521d943b6a8ac3cd05f9f0d340651d04e5c08fa1646c259f4e3ab62a86eff7
+  data.tar.gz: 08f0988500ce8071e51470212f548bb86cc38ea54ea2c501dc3dbb58f2449b457e786e55ad725c0e2580cc60b89aaa9f60f8dcada8e48430797b7a90e2205884

data/lib/saml/basic_provider.rb

@@ -1,12 +1,13 @@
 module Saml
   class BasicProvider
     include Provider
-    attr_accessor :entity_descriptor, :private_key, :type
+    attr_accessor :entity_descriptor, :encryption_key, :type
 
-    def initialize(entity_descriptor, private_key, type)
+    def initialize(entity_descriptor, encryption_key, type, signing_key)
       @entity_descriptor = entity_descriptor
-      @private_key       = private_key
+      @encryption_key    = encryption_key
       @type              = type
+      @signing_key       = signing_key
     end
   end
 end

data/lib/saml/bindings/http_artifact.rb

@@ -30,11 +30,12 @@ module Saml
           Saml::Util.verify_xml(artifact_resolve, raw_xml)
         end
 
-        def resolve(request, location)
+        def resolve(request, location, additional_headers = {}, proxy = {})
           artifact         = request.params["SAMLart"]
           artifact_resolve = Saml::ArtifactResolve.new(artifact: artifact, destination: location)
 
-          response = Saml::Util.post(location, notify('create_post', Saml::Util.sign_xml(artifact_resolve, :soap)))
+          message = notify('create_post', Saml::Util.sign_xml(artifact_resolve, :soap))
+          response = Saml::Util.post(location, message, additional_headers, proxy)
 
           if response.code == "200"
             notify('receive_response', response.body)

data/lib/saml/provider.rb

@@ -47,11 +47,20 @@ module Saml
     end
 
     def private_key
-      @private_key
+      warn '[DEPRECATED] `private_key` please use signing_key or encryption_key'
+      encryption_key
+    end
+
+    def signing_key
+      @signing_key || encryption_key
+    end
+
+    def encryption_key
+      @encryption_key || private_key
     end
 
     def sign(signature_algorithm, data)
-      private_key.sign(digest_method(signature_algorithm).new, data)
+      signing_key.sign(digest_method(signature_algorithm).new, data)
     end
 
     def single_sign_on_service_url(binding)

data/lib/saml/provider_stores/file.rb

@@ -3,11 +3,13 @@ module Saml
     class File
       attr_accessor :providers
 
-      def initialize(metadata_dir = "config/metadata", key_file = "config/ssl/key.pem", key_password = nil)
+      def initialize(metadata_dir = "config/metadata",
+                     encryption_key_file = "config/ssl/key.pem", encryption_key_password = nil,
+                     signing_key_file = nil, signing_key_password = nil)
         @mutex         = Mutex.new
         self.providers = {}
 
-        load_files(metadata_dir, key_file, key_password)
+        load_files(metadata_dir, encryption_key_file, encryption_key_password, signing_key_file, signing_key_password)
       end
 
       def find_by_entity_id(entity_id)
@@ -21,16 +23,18 @@ module Saml
         end.to_a[1]
       end
 
-      def load_files(metadata_dir, key_file, key_password = nil)
+      def load_files(metadata_dir, encryption_key_file, encryption_key_password = nil,
+                     sign_key_file = nil, sign_key_password = nil)
         Dir[::File.join(metadata_dir, '*.xml')].each do |file|
-          add_metadata(::File.read(file), get_private_key(key_file, key_password))
+          add_metadata(::File.read(file), get_private_key(encryption_key_file, encryption_key_password),
+                       sign_key_file.present? ? get_private_key(sign_key_file, sign_key_password) : nil)
         end
       end
 
-      def add_metadata(metadata_xml, private_key = nil)
+      def add_metadata(metadata_xml, encryption_key = nil, signing_key = nil)
         entity_descriptor = Saml::Elements::EntityDescriptor.parse(metadata_xml, single: true)
         type              = entity_descriptor.sp_sso_descriptor.present? ? 'service_provider' : 'identity_provider'
-        provider          = BasicProvider.new(entity_descriptor, private_key, type)
+        provider          = BasicProvider.new(entity_descriptor, encryption_key, type, signing_key)
 
         @mutex.synchronize do
           providers[provider.entity_id] = provider

data/lib/saml/provider_stores/url.rb

@@ -8,7 +8,7 @@ module Saml
           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)
+          BasicProvider.new(entity_descriptor, nil, type, nil)
         end
 
         alias_method :find_by_entity_id, :find_by_metadata_location

data/lib/saml/util.rb

@@ -14,10 +14,12 @@ module Saml
         params
       end
 
-      def post(location, message, additional_headers = {})
+      def post(location, message, additional_headers = {}, proxy = {})
         uri = URI.parse(location)
+        default_proxy_settings = { addr: :ENV, port: nil, user: nil, pass: nil }
+        proxy = default_proxy_settings.merge(proxy)
 
-        http             = Net::HTTP.new(uri.host, uri.port)
+        http             = Net::HTTP.new(uri.host, uri.port, proxy[:addr], proxy[:port], proxy[:user], proxy[:pass])
         http.use_ssl     = uri.scheme == 'https'
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.19.10"
+  VERSION = "2.20.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.19.10
+  version: 2.20.0
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport