cf-uaa-lib 3.13.0 → 3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3d4edc855be886efe312cfb0665894dffaf332
-  data.tar.gz: 6d07a2957fc5efbfa31f810a1b693dca77abf871
+  metadata.gz: 46d432989d2af2fe4fa1a5317daffba25c752728
+  data.tar.gz: 4daf1389ceb41788db00d04324a778b688c7397c
 SHA512:
-  metadata.gz: 546a2c90f033dd94bee5dd3fd8fa0db9d6877bc32e6e3eed25f967a0d8dafa80f27ac4ff9008a6cbd90bfb62c1e3df15cf4e9a90c5329da830ca379fb06436c0
-  data.tar.gz: e172dbce6c01966def32c6a2cf8cad737a43b61a94b97abfbc500ee38859689a02fec76f8d8ec4ada5c001ff11d40c2d32476e3ee72725633cad701427211693
+  metadata.gz: 57c54fd8ee9caddf71d4580bd909a52e4bad75a6815cb0a595b05e43536aa2a1774a2eddf5d747f9d2feca37e295d50f0a7966ccaf34b4b6e188e19f58083445
+  data.tar.gz: 41b36b3d6df7b9b2d5a55d65b0afadc62ac73837823bca76e3cfc4820fd6f3d0c17f57e9731ce1378a3e02fa272b08262712f5deb8895429eb72785911d0c455

data/lib/uaa/http.rb

@@ -48,10 +48,17 @@ module Http
 
   def self.included(base)
     base.class_eval do
-      attr_accessor :skip_ssl_validation, :ssl_ca_file, :ssl_cert_store, :zone
+      attr_reader :skip_ssl_validation, :ssl_ca_file, :ssl_cert_store, :http_timeout
     end
   end
 
+  def initialize_http_options(options)
+    @skip_ssl_validation = options[:skip_ssl_validation]
+    @ssl_ca_file = options[:ssl_ca_file]
+    @ssl_cert_store = options[:ssl_cert_store]
+    @http_timeout = options[:http_timeout]
+  end
+
   # Sets the current logger instance to recieve error messages.
   # @param [Logger] logr
   # @return [Logger]
@@ -201,6 +208,12 @@ module Http
       http = HTTPClient.new
     end
 
+    if http_timeout
+      http.connect_timeout = http_timeout
+      http.send_timeout = http_timeout
+      http.receive_timeout = http_timeout
+    end
+
     @http_cache[cache_key] = http
   end
 

data/lib/uaa/info.rb

@@ -31,10 +31,8 @@ class Info
   #     string keys are returned.
   def initialize(target, options = {})
     self.target = target
-    self.skip_ssl_validation = options[:skip_ssl_validation]
-    self.ssl_ca_file = options[:ssl_ca_file]
-    self.ssl_cert_store = options[:ssl_cert_store]
     self.symbolize_keys = options[:symbolize_keys]
+    initialize_http_options(options)
   end
 
   # sets whether the keys in returned hashes should be symbols.

data/lib/uaa/scim.rb

@@ -149,10 +149,8 @@ class Scim
   def initialize(target, auth_header, options = {})
     @target, @auth_header = target, auth_header
     @key_style = options[:symbolize_keys] ? :downsym : :down
-    self.skip_ssl_validation = options[:skip_ssl_validation]
-    self.ssl_ca_file = options[:ssl_ca_file]
-    self.ssl_cert_store = options[:ssl_cert_store]
     @zone = options[:zone]
+    initialize_http_options(options)
   end
 
   # Convenience method to get the naming attribute, e.g. userName for user,

data/lib/uaa/token_issuer.rb

@@ -109,9 +109,7 @@ class TokenIssuer
     @target, @client_id, @client_secret = target, client_id, client_secret
     @token_target = options[:token_target] || target
     @key_style = options[:symbolize_keys] ? :sym : nil
-    self.skip_ssl_validation = options[:skip_ssl_validation]
-    self.ssl_ca_file = options[:ssl_ca_file]
-    self.ssl_cert_store = options[:ssl_cert_store]
+    initialize_http_options(options)
   end
 
   # Allows an app to discover what credentials are required for

data/lib/uaa/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    VERSION = '3.13.0'
+    VERSION = '3.14.1'
   end
 end

data/spec/http_spec.rb

@@ -69,7 +69,7 @@ describe CF::UAA::Http do
       let(:ssl_config) { double('ssl_config') }
 
       it 'sets verify mode to VERIFY_NONE' do
-        http_instance.skip_ssl_validation = true
+        http_instance.initialize_http_options({skip_ssl_validation: true})
 
         expect(http_double).to receive(:ssl_config).and_return(ssl_config)
         expect(ssl_config).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
@@ -91,7 +91,7 @@ describe CF::UAA::Http do
       let(:ssl_config) { double('ssl_config') }
 
       it 'passes it' do
-        http_instance.ssl_ca_file = '/fake-ca-file'
+        http_instance.initialize_http_options({ssl_ca_file: '/fake-ca-file'})
 
         expect(http_double).to receive(:ssl_config).and_return(ssl_config).twice
         expect(ssl_config).to receive(:set_trust_ca).with('/fake-ca-file')
@@ -105,7 +105,7 @@ describe CF::UAA::Http do
       let(:ssl_config) { double('ssl_config') }
 
       it 'passes it' do
-        http_instance.ssl_cert_store = cert_store
+        http_instance.initialize_http_options({ssl_cert_store: cert_store})
 
         expect(http_double).to receive(:ssl_config).and_return(ssl_config).twice
         expect(ssl_config).to receive(:cert_store=).with(cert_store)
@@ -114,5 +114,29 @@ describe CF::UAA::Http do
         http_instance.http_get('https://uncached.example.com')
       end
     end
+
+    context 'when an http request timeout is provided' do
+      it 'sets all timeouts on the http clien to the http_timeout' do
+        http_instance.initialize_http_options({http_timeout: 10})
+
+        expect(http_double).to receive(:connect_timeout=).with(10)
+        expect(http_double).to receive(:send_timeout=).with(10)
+        expect(http_double).to receive(:receive_timeout=).with(10)
+
+        http_instance.http_get('https://uncached.example.com')
+      end
+    end
+
+    context 'when an http request timeout is not provided' do
+      it 'does not override the default' do
+        http_instance.initialize_http_options({})
+
+        expect(http_double).not_to receive(:connect_timeout=)
+        expect(http_double).not_to receive(:send_timeout=)
+        expect(http_double).not_to receive(:receive_timeout=)
+
+        http_instance.http_get('https://uncached.example.com')
+      end
+    end
   end
-end
+end

data/spec/integration_spec.rb

@@ -44,6 +44,34 @@ module CF::UAA
     Scim.new(target, admin_token_issuer.client_credentials_grant.auth_header, options.merge(:symbolize_keys => true))
   end
 
+  describe 'when UAA does not respond' do
+    let(:http_timeout) { 0.01 }
+    let(:default_http_client_timeout) { 60 }
+    let(:scim) { Scim.new(@target, "", {:http_timeout => http_timeout}) }
+    let(:token_issuer) { TokenIssuer.new(@target, "", "", {:http_timeout => http_timeout}) }
+    let(:blackhole_ip) { '10.255.255.1'}
+
+    before do
+      @target = "http://#{blackhole_ip}"
+    end
+
+    it 'times out the connection at the configured time for the scim' do
+      expect {
+        Timeout.timeout(default_http_client_timeout - 1) do
+          scim.get(:user, "admin")
+        end
+      }.to raise_error HTTPClient::TimeoutError
+    end
+
+    it 'times out the connection at the configured time for the token issuer' do
+      expect {
+        Timeout.timeout(default_http_client_timeout - 1) do
+          token_issuer.client_credentials_grant
+        end
+      }.to raise_error HTTPClient::TimeoutError
+    end
+  end
+
   if ENV['UAA_CLIENT_TARGET']
     describe 'UAA Integration:' do
 
@@ -128,7 +156,7 @@ module CF::UAA
       end
 
       it 'should report the uaa client version' do
-        expect(VERSION).to match(/\d.\d.\d/)
+        expect(VERSION).to match(/\d+.\d+.\d+/)
       end
 
       it 'makes sure the server is there by getting the prompts for an implicit grant' do
@@ -209,4 +237,4 @@ module CF::UAA
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaa-lib
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.14.1
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cf-uaa-lib
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Client library for CloudFoundry UAA