saml-kit 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125a2e6ca5411fe3311326b6b384b12ca154641189e8154671f99d7d773126a9
-  data.tar.gz: a6caa6b5c45cd823f8c2173c274a09cb4623d47056176c627e05641a99e42035
+  metadata.gz: 4b9090d1204b9122f05738060c8e5a386a698bbe9b842e9fee62f14904f40087
+  data.tar.gz: 90268d315dcb2bcef6a7b3d7d34654c7ea1ac315f621e996cea1f056d5f83a5d
 SHA512:
-  metadata.gz: 16bf24aa308395aed4f74ad9dda46802d8cdb5659448fca0fe2c258ba5973d784ac37338c238b16835d6a34bc15223b89b2216416b04d985223a279ead5c92f0
-  data.tar.gz: 39542cb68f6668d8fffbdabc5fcb975ca2a1d99d03001c647b36296e5b6699e28cf7f844ad2056fdc716b08d9eaa6864fdaefa13165737ab1b86e983ff49801d
+  metadata.gz: 69d80d1b61c14dbddc90f96816a1065329ae44896ee71ff6323a0279d35185253054af28ff5cfd3566e349a1346e71e2c4c7c05e48f424bfe95d3b3cdc5d6887
+  data.tar.gz: f80bef1f575ce62f8e0c084ff7ed8f0ff10f91802840384637ccd9e868fe1294b554440a1901ac9494be423301d6486f4d19ce3a3b9419e44b99954f17fad230

data/lib/saml/kit.rb

@@ -11,7 +11,7 @@ require 'active_support/deprecation'
 require 'active_support/duration'
 require 'forwardable'
 require 'logger'
-require 'net/http'
+require 'net/hippie'
 require 'nokogiri'
 require 'securerandom'
 require 'uri'

data/lib/saml/kit/builders/assertion.rb

@@ -52,7 +52,6 @@ module Saml
         def subject_confirmation_data_options
           options = {}
           options[:InResponseTo] = request.id if request.present?
-          options[:NotOnOrAfter] = (not_on_or_after - 1.second).iso8601
           options[:Recipient] = destination if destination.present?
           options
         end

data/lib/saml/kit/default_registry.rb

@@ -55,8 +55,10 @@ module Saml
       # @param url [String] the url to download the metadata from.
       # @param verify_ssl [Boolean] enable/disable SSL peer verification.
       def register_url(url, verify_ssl: true)
-        content = HttpApi.new(url, verify_ssl: verify_ssl).get
-        register(Saml::Kit::Metadata.from(content))
+        headers = { 'User-Agent' => "saml/kit #{Saml::Kit::VERSION}" }
+        verify_mode = verify_ssl ? nil : OpenSSL::SSL::VERIFY_NONE
+        client = Net::Hippie::Client.new(headers: headers, verify_mode: verify_mode)
+        register(Saml::Kit::Metadata.from(client.get(url).body))
       end
 
       # Returns the metadata document associated with an issuer or entityID.
@@ -74,7 +76,7 @@ module Saml
         end
       end
 
-      private
+      protected
 
       def ensure_valid_metadata(metadata)
         error = ArgumentError.new('Cannot register invalid metadata')
@@ -83,37 +85,6 @@ module Saml
           !metadata.respond_to?(:entity_id) ||
           metadata.invalid?
       end
-
-      # This class is responsible for
-      # making HTTP requests to fetch metadata
-      # from remote locations.
-      class HttpApi # :nodoc:
-        def initialize(url, verify_ssl: true)
-          @uri = URI.parse(url)
-          @verify_ssl = verify_ssl
-        end
-
-        def get
-          execute(Net::HTTP::Get.new(uri.request_uri)).body
-        end
-
-        def execute(request)
-          http.request(request)
-        end
-
-        private
-
-        attr_reader :uri, :verify_ssl
-
-        def http
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.read_timeout = 30
-          http.use_ssl = uri.is_a?(URI::HTTPS)
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless verify_ssl
-          http.set_debug_output(Saml::Kit.logger)
-          http
-        end
-      end
     end
   end
 end

data/lib/saml/kit/version.rb

@@ -2,6 +2,6 @@
 
 module Saml
   module Kit
-    VERSION = '1.0.20'.freeze
+    VERSION = '1.0.21'.freeze
   end
 end

data/saml-kit.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activemodel', '>= 4.2.0'
+  spec.add_dependency 'net-hippie', '~> 0.1.8'
   spec.add_dependency 'xml-kit', '>= 0.1.13', '<= 1.0.0'
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'bundler-audit', '~> 0.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saml-kit
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - mo khan
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: net-hippie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: xml-kit
   requirement: !ruby/object:Gem::Requirement