bosh_cli 1.2902.0 → 1.2905.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19c9cd4f833a3224f4d43207e1c66cfe52920a65
-  data.tar.gz: 59021c4b5c48314318d6b9607c80ed04ed62db01
+  metadata.gz: de2564930c27f2fd9d359408cf6db62f24b3fa4d
+  data.tar.gz: ee4c60205ad3c57171787bd1d596c34a499875ba
 SHA512:
-  metadata.gz: 76e5c79e0300f5359af52aea8fa6b407c6245154888c9cb4eaf74fe056545240e940f3c07e48a4a0ed0a7abc58077732bbf5b3311b33cd94403969a79a2028fb
-  data.tar.gz: 3946323d25b1b5d95c7b5b10c9c8427a10c1f19d8f62c740c64cc011e02b403479f7e3995307998f6c302359eec1043339ef774ad3785a9fbe88783be4c006c4
+  metadata.gz: 17e44063a1bf787858122d8631f2b3107e00b33cb6215adca4cb5fa1ef8db197c43e11ed6fecb9979867b8940c6580405e69474851ed885bc7bedb1dec1027d6
+  data.tar.gz: cbc4ec1c66b8ff81d5abb5a21c316c7283935075d2647e4b387fbcb4c06534502d5100558e0dba5a1c62e0dc527356e6db3c893644e95bc079aff4ace556e4e3

data/lib/cli/client/uaa.rb

@@ -5,43 +5,97 @@ module Bosh
   module Cli
     module Client
       class Uaa
+        class AccessInfo < Struct.new(:username, :token); end
+
         def initialize(options, ssl_ca_file)
           url = options.fetch('url')
           unless URI.parse(url).instance_of?(URI::HTTPS)
             err('Failed to connect to UAA, HTTPS protocol is required')
           end
           @ssl_ca_file = ssl_ca_file
-          @token_issuer = CF::UAA::TokenIssuer.new(url, 'bosh_cli', nil, { ssl_ca_file: ssl_ca_file })
+
+          token_decoder = TokenDecoder.new
+          if ENV['BOSH_CLIENT'] && ENV['BOSH_CLIENT_SECRET']
+            @token_issuer = ClientTokenIssuer.new(url, ssl_ca_file, token_decoder)
+          else
+            @token_issuer = PasswordTokenIssuer.new(url, ssl_ca_file, token_decoder)
+          end
         end
 
         def prompts
-          @token_issuer.prompts.map do |field, (type, display_text)|
-            Prompt.new(field, type, display_text)
-          end
+          @token_issuer.prompts
         rescue CF::UAA::SSLException => e
           raise e unless @ssl_ca_file.nil?
           err('Invalid SSL Cert. Use --ca-cert to specify SSL certificate')
         end
 
         def login(credentials)
-          token = @token_issuer.implicit_grant_with_creds(credentials)
-          if token
-            decoded = CF::UAA::TokenCoder.decode(
-              token.info['access_token'],
-              { verify: false }, # token signature not verified because CLI doesn't have the secret key
-              nil, nil)
-            full_token = "#{token.info['token_type']} #{token.info['access_token']}"
-            { username: decoded['user_name'], token: full_token }
-          end
+          @token_issuer.access_info(credentials)
+        rescue CF::UAA::TargetError => e
+          err("Failed to log in: #{e.info['error_description']}")
         rescue CF::UAA::BadResponse
           nil
         end
 
+        private
+
+        class ClientTokenIssuer
+          def initialize(url, ssl_ca_file, token_decoder)
+            @token_issuer = CF::UAA::TokenIssuer.new(url, ENV['BOSH_CLIENT'], ENV['BOSH_CLIENT_SECRET'], {ssl_ca_file: ssl_ca_file})
+            @token_decoder = token_decoder
+          end
+
+          def prompts
+            {}
+          end
+
+          def access_info(_)
+            token = @token_issuer.client_credentials_grant
+            decoded = @token_decoder.decode(token)
+
+            username = decoded['client_id'] if decoded
+            AccessInfo.new(username, nil)
+          end
+        end
+
+        class PasswordTokenIssuer
+          def initialize(url, ssl_ca_file, token_decoder)
+            @token_issuer = CF::UAA::TokenIssuer.new(url, 'bosh_cli', nil, {ssl_ca_file: ssl_ca_file})
+            @token_decoder = token_decoder
+          end
+
+          def prompts
+            @token_issuer.prompts.map do |field, (type, display_text)|
+              Prompt.new(field, type, display_text)
+            end
+          end
+
+          def access_info(credentials)
+            credentials = credentials.select { |_, c| !c.empty? }
+            token = @token_issuer.owner_password_credentials_grant(credentials)
+            decoded = @token_decoder.decode(token)
+
+            username = decoded['user_name'] if decoded
+            access_token = "#{token.info['token_type']} #{token.info['access_token']}"
+
+            AccessInfo.new(username, access_token)
+          end
+        end
+
         class Prompt < Struct.new(:field, :type, :display_text)
           def password?
             type == 'password'
           end
         end
+
+        class TokenDecoder
+          def decode(token)
+            CF::UAA::TokenCoder.decode(
+              token.info['access_token'],
+              {verify: false}, # token signature not verified because CLI doesn't have the secret key
+              nil, nil)
+          end
+        end
       end
     end
   end

data/lib/cli/uaa_login_strategy.rb

@@ -22,10 +22,13 @@ module Bosh
             end
           end
 
-          if results = @uaa.login(credentials)
-            @terminal.say_green("Logged in as `#{results[:username]}'")
-            @config.set_credentials(target, { 'token' => results[:token] })
-            @config.save
+          if access_info = @uaa.login(credentials)
+            @terminal.say_green("Logged in as `#{access_info.username}'")
+
+            if access_info.token
+              @config.set_credentials(target, { 'token' => access_info.token })
+              @config.save
+            end
           else
             err('Failed to log in')
           end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2902.0'
+    VERSION = '1.2905.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2902.0
+  version: 1.2905.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2902.0
+        version: 1.2905.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  ac0a41
+  327a58
 email: support@cloudfoundry.com
 executables:
 - bosh