bosh_cli 1.3232.14.0 → 1.3232.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b03d33ea756dffb917f9234a10d247ffefeb7432
-  data.tar.gz: d4af27bc9ee1042f7ceab256f065f12a34b48c57
+  metadata.gz: c71f4dfaeff471cb81968a20e376da09e8609cfa
+  data.tar.gz: 4163600dbad95ff0513dfc74ce77552b71f35599
 SHA512:
-  metadata.gz: 10b1d29cc87aa522c4a3f4c0a14a8648b707d2e8b35eea12c4a2016b16aef4f453c3a3e4868fe86d33d5abd583ebdc35a96fd18f385c6f0376f7e1f4cdf5a141
-  data.tar.gz: 277e20eda125ea523e871bc1c4214b24339a1181331364616dec1471bdd70e796b58261d664ebea17e229f4a384673a1e3a521487141b461e060c83fc0c048fb
+  metadata.gz: ddc0eebf3cea4efd3b284be7a92c48ce3153b71dd013a419addb8e290419121902ea41a128a4d1d37fd6053e08fdc8fcddc8d7d38d61eaa075a092c195d6ec39
+  data.tar.gz: 8d6a4f9c8121ffe0937c934dafc0ace23080749ad1dbd799fe9d45008d5534f771bcb9ecdab251ae24eaba0da13c9b454c1d3a0cb66b38753b26605cd0585610

data/lib/cli/client/credentials.rb

@@ -13,6 +13,11 @@ module Bosh
         def authorization_header
           @token_provider.token
         end
+
+        def refresh
+          @token_provider.refresh
+          true
+        end
       end
 
       class BasicCredentials
@@ -28,6 +33,10 @@ module Bosh
         def authorization_header
           'Basic ' + Base64.encode64("#{@username}:#{@password}").strip
         end
+
+        def refresh
+          false
+        end
       end
     end
   end

data/lib/cli/client/director.rb

@@ -865,14 +865,32 @@ module Bosh
           end
 
           if @credentials
+            @credentials.refresh unless payload.nil?
             headers['Authorization'] = @credentials.authorization_header
           end
 
-          http_client.request(method, uri, {
+          response = http_client.request(method, uri, {
             :body => payload,
             :header => headers,
           }, &block)
 
+          if !response.nil? && response.code == 401
+            if !payload.nil?
+              return response
+            end
+
+            if @credentials.nil? || !@credentials.refresh
+              raise AuthError
+            end
+
+            headers['Authorization'] = @credentials.authorization_header
+            response = http_client.request(method, uri, {
+                :body => payload,
+                :header => headers,
+            }, &block)
+          end
+
+          response
         rescue URI::Error,
                SocketError,
                Errno::ECONNREFUSED,

data/lib/cli/client/uaa/token_provider.rb

@@ -17,17 +17,22 @@ module Bosh
             access_info.auth_header if access_info
           end
 
+          def refresh
+            get_access_info(true)
+            nil
+          end
+
           def username
             get_access_info.username
           end
 
           private
 
-          def get_access_info
+          def get_access_info(force_refresh = false)
             if @auth_info.client_auth?
-              client_access_info
+              client_access_info(force_refresh)
             else
-              password_access_info
+              password_access_info(force_refresh)
             end
           end
 
@@ -35,26 +40,28 @@ module Bosh
             @uaa_client ||= Bosh::Cli::Client::Uaa::Client.new(@target, @auth_info, @config)
           end
 
-          def client_access_info
-            if !@client_access_info.nil? && @client_access_info.was_issued_for?(@auth_info.client_id)
-              @client_access_info = refresh_if_needed(@client_access_info)
+          def client_access_info(force_refresh = false)
+            if !@access_info.nil? && @access_info.was_issued_for?(@auth_info.client_id)
+              @access_info = refresh_if_needed(@access_info, force_refresh)
             else
-              @client_access_info = uaa_client.access_info({})
+              @access_info = uaa_client.access_info({})
             end
           end
 
-          def password_access_info
-            config_access_token = @config.access_token(@target)
-            return nil unless config_access_token
+          def password_access_info(force_refresh = false)
+            if @access_info.nil?
+              config_access_token = @config.access_token(@target)
+              return nil unless config_access_token
 
-            access_info = PasswordAccessInfo.create(config_access_token, @config.refresh_token(@target), @token_decoder)
-            return nil unless access_info
+              @access_info = PasswordAccessInfo.create(config_access_token, @config.refresh_token(@target), @token_decoder)
+              return nil unless @access_info
+            end
 
-            refresh_if_needed(access_info)
+            @access_info = refresh_if_needed(@access_info, force_refresh)
           end
 
-          def refresh_if_needed(access_info)
-            if access_info.expires_soon?
+          def refresh_if_needed(access_info, force_refresh = false)
+            if access_info.expires_soon? || force_refresh
               uaa_client.refresh(access_info)
             else
               access_info

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3232.14.0'
+    VERSION = '1.3232.24.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3232.14.0
+  version: 1.3232.24.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.14.0
+        version: 1.3232.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.14.0
+        version: 1.3232.24.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.14.0
+        version: 1.3232.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.14.0
+        version: 1.3232.24.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.14.0
+        version: 1.3232.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.14.0
+        version: 1.3232.24.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement