cf-uaac 1.3.6 → 1.3.8

data/cf-uaac.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov-rcov"
   s.add_development_dependency "ci_reporter"
-  s.add_runtime_dependency "cf-uaa-lib", ">= 1.3.6", "<= 1.3.6"
+  s.add_runtime_dependency "cf-uaa-lib", ">= 1.3.6", "<= 1.3.7"
   s.add_runtime_dependency "highline"
   s.add_runtime_dependency "eventmachine"
   s.add_runtime_dependency "launchy"

data/lib/cli/base.rb

@@ -240,7 +240,7 @@ class BaseCli
     @input ||= $stdin
     @output ||= $stdout
     @output.string = "" if @output.respond_to?(:string)
-    args = args.split if args.respond_to?(:split)
+    args = Shellwords.split(args) if args.respond_to?(:split)
     @option_defs, @parser, orig = {}, OptionParser.new, args
     opts = @topics.each_with_object({}) do |tpc, o|
       tpc.option_defs.each do |k, optdef|

data/lib/cli/client_reg.rb

@@ -94,7 +94,7 @@ class ClientCli < CommonCli
     }
   end
 
-  define_option :old_secret, "-o", "--old_secret <secret>", "current secret"
+  define_option :old_secret, "--old_secret <secret>", "current secret"
   desc "secret change", "Change secret for authenticated client in current context", :old_secret, :secret do
     return gripe "context not set" unless client_id = Config.context.to_s
     scim_request { |cr|

data/lib/cli/token.rb

@@ -27,7 +27,7 @@ class TokenCatcher < Stub::Base
         token_target: Config.target_value(:token_target))
     tkn = secret ? ti.authcode_grant(server.info.delete(:uri), data) :
         ti.implicit_grant(server.info.delete(:uri), data)
-    server.info.update(Util.hash_keys!(tkn.info, :sym))
+    server.info.update(token_info: tkn.info)
     reply.text "you are now logged in and can close this window"
   rescue TargetError => e
     reply.text "#{e.message}:\r\n#{Util.json_pretty(e.info)}\r\n#{e.backtrace}"
@@ -151,11 +151,11 @@ class TokenCli < CommonCli
     say "launching browser with #{uri}" if trace?
     Launchy.open(uri, debug: true, dry_run: false)
     print "waiting for token "
-    while catcher.info[:uri] || !catcher.info[:access_token]
+    while catcher.info[:uri] || !catcher.info[:token_info]
       sleep 5
       print "."
     end
-    say_success(secret ? "authorization code" : "implicit") if set_context(catcher.info)
+    say_success(secret ? "authorization code" : "implicit") if set_context(catcher.info[:token_info])
     return unless opts[:vmc]
     begin
       vmc_target = File.open(VMC_TARGET_FILE, 'r') { |f| f.read.strip }

data/lib/cli/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    CLI_VERSION = "1.3.6"
+    CLI_VERSION = "1.3.8"
   end
 end

data/lib/stub/uaa.rb

@@ -366,15 +366,16 @@ class StubUAAConn < Stub::Base
 
   route :put, %r{^/oauth/clients/([^/]+)/secret$}, "content-type" => %r{application/json} do
     info = Util.json_parse(request.body, :down)
+    return not_found(match[1]) unless id = server.scim.id(match[1], :client)
+    return bad_request("no new secret given") unless info['secret']
     if oldsecret = info['oldsecret']
       return unless valid_token("clients.secret")
-      return not_found(match[1]) unless client = server.scim.get(match[1], :client, :client_secret)
+      return not_found(match[1]) unless client = server.scim.get(id, :client, :client_secret)
       return bad_request("old secret does not match") unless oldsecret == client[:client_secret]
     else
       return unless valid_token("uaa.admin")
     end
-    return bad_request("no new secret given") unless info['secret']
-    server.scim.set_hidden_attr(match[1], :client_secret, info['secret'])
+    server.scim.set_hidden_attr(id, :client_secret, info['secret'])
     reply.json(status: "ok", message: "secret updated")
   end
 

data/spec/client_reg_spec.rb

@@ -23,7 +23,7 @@ describe ClientCli do
   before :all do
     #Util.default_logger(:trace)
     Cli.configure("", nil, StringIO.new, true)
-    setup_target(authorities: "scim.read", grant_types: "client_credentials")
+    setup_target(authorities: "scim.read,clients.secret", grant_types: "client_credentials")
     @test_user, @test_pwd = "sam_#{Time.now.to_i}", "correcthorsebatterystaple"
   end
 
@@ -54,6 +54,15 @@ describe ClientCli do
       Cli.output.string.should include "access_token", @test_client
     end
 
+    it "changes it's client secret" do
+      Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
+      Cli.run("token decode").should be
+      Cli.run("secret change --old_secret #{@test_secret} --secret newclientsecret").should be
+      Cli.run("token client get #{@test_client} -s newclientsecret").should be
+      Cli.run("secret change --old_secret newclientsecret -s #{@test_secret}").should be
+      Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
+    end
+
     it "fails to create a user account as test client" do
       Cli.run("user add #{@test_user} -p #{@test_pwd}").should be_nil
       Cli.output.string.should include "access_denied"

data/spec/setup_helper.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+#--
+# Cloud Foundry 2012.02.03 Beta
+# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#++
+
+$:.unshift File.expand_path File.join __FILE__, '..', '..', 'lib'
+require 'cli'
+
+client = ENV["UAA_CLIENT_ID"] || "admin"
+secret = ENV["UAA_CLIENT_SECRET"] || "adminsecret"
+abort("UAA_CLIENT_TARGET is not set") unless target = ENV["UAA_CLIENT_TARGET"]
+
+[
+  "target #{target}",
+  "token client get #{client} -s #{secret}",
+  "client update #{client} --authorities scim.read,scim.write,clients.read,clients.write,clients.secret,scim.password,uaa.admin,uaa.resource",
+  "token client get #{client} -s #{secret}",
+  "client -t add clapp -s clapp --scope scim.me,scim.read,openid,password.write --authorized_grant_types password,refresh_token,authorization_code --autoapprove true",
+  "user add joe -p joe --email joe@email.com",
+].each { |cmd| abort("'#{cmd}' failed") unless CF::UAA::Cli.run(cmd) }
+

data/spec/spec_helper.rb

@@ -65,7 +65,7 @@ module SpecHelper
     Cli.run("token client get #{@admin_client} -s #{@admin_secret}")
     Config.yaml.should include("access_token")
     test_client = "test_client_#{Time.now.to_i}"
-    @test_secret = "+=tEsTsEcRet~!@"
+    @test_secret = Shellwords.escape("+=tEsTsEcRet~!@--")
     Cli.run("client add #{test_client} -s #{@test_secret} " +
         "--authorities #{opts[:authorities]} --scope #{opts[:scope]} " +
         "--authorized_grant_types #{opts[:grant_types]} " +

data/spec/token_spec.rb

@@ -26,7 +26,7 @@ describe TokenCli do
     setup_target(authorities: "clients.read,scim.read,scim.write,uaa.resource")
     Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
     Config.yaml.should include("access_token")
-    @test_pwd = "@~`!$@%#%^$^&*)(|}{[]\":';?><,./"
+    @test_pwd = Shellwords.escape("@~`!$@%#%^$^&*)(|}{[]\":';?><,./")
     @test_user = "test_user_#{Time.now.to_i}"
     Cli.run("user add #{@test_user} -p #{@test_pwd} " +
         "--emails sam@example.com,joNES@sample.com --given_name SamueL " +

data/spec/user_spec.rb

@@ -48,8 +48,10 @@ describe UserCli do
 
   it "changes a user's password" do
     Cli.run("token get #{@test_user} #{@test_pwd}").should be
-    Cli.run("password change -p newpwd --old_password #{@test_pwd}").should be
+    Cli.run("password change --password newpwd --old_password #{@test_pwd}").should be
     Cli.run("token get #{@test_user} newpwd").should be
+    Cli.run("password change -p #{@test_pwd} -o newpwd").should be
+    Cli.run("token get #{@test_user} #{@test_pwd}").should be
     Cli.output.string.should include "Successfully fetched token"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,7 +121,7 @@ dependencies:
         version: 1.3.6
     - - <=
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
         version: 1.3.6
     - - <=
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +265,7 @@ files:
 - spec/group_spec.rb
 - spec/http_spec.rb
 - spec/info_spec.rb
+- spec/setup_helper.rb
 - spec/spec_helper.rb
 - spec/token_spec.rb
 - spec/user_spec.rb
@@ -282,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4530157202147700966
+      hash: 1602838962021256721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -291,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4530157202147700966
+      hash: 1602838962021256721
 requirements: []
 rubyforge_project: cf-uaac
 rubygems_version: 1.8.23