cf-uaac 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12dfcebb4cbeeb7831b7db3152534c8b3aaf503e
-  data.tar.gz: ab23c73c86a1866d5bead7157e91906928c703f1
+  metadata.gz: 60ae15860d77b0b2f0c132a4c356b244346b438c
+  data.tar.gz: 97cb870f7936e8cc67c4bfa4284e7e7281f1870a
 SHA512:
-  metadata.gz: 12420bf4c65ff1ccb262a647d7bbe9ad029a2e89bb08582e844910fc910c9d44c64488e4cbea618651ac3964f1eced2e1151157a6cf8e1ad254a2e3bb326f305
-  data.tar.gz: ba5150f1ca56e16c36002d8badbb2245cf54e5912019df8f7aaac335ae0e967b4e9923ec124ae7219f358869914afe3fde33360def68e7aa38c96d85dadcf78a
+  metadata.gz: c52ff8e0adb7e9df5270f557626c6b5e4d996a842bc9736242b836e3a1ebcafe70386053277cabc1df2781e7e09a7c65c03661e2cce8a23ef00bb581e858e27b
+  data.tar.gz: 60340d5967d8dab9babdc1d5ba34f2ab300a4e83b2871717d46f32ce3fc2e7a60ecd53e90067a40c723ab27e3e68c7d7035e5ec5ad087463b56b5d46bf28361c

data/lib/cli/client_reg.rb

@@ -20,6 +20,7 @@ class ClientCli < CommonCli
   topic "Client Application Registrations", "reg"
 
   CLIENT_SCHEMA = {
+      :name => "string",
       :scope => "list",
       :authorized_grant_types => "list",
       :authorities => "list",
@@ -57,17 +58,17 @@ class ClientCli < CommonCli
     scim_common_list(:client, filter)
   end
 
-  desc "client get [name]", "Get specific client registration", :attrs do |name|
-    pp scim_request { |sr| scim_get_object(sr, :client, clientname(name), opts[:attrs]) }
+  desc "client get [id]", "Get specific client registration", :attrs do |id|
+    pp scim_request { |sr| scim_get_object(sr, :client, clientid(id), opts[:attrs]) }
   end
 
   define_option :clone, "--clone <other>", "get default settings from other"
   define_option :interact, "--[no-]interactive", "-i", "interactively verify all values"
-
-  desc "client add [name]", "Add client registration",
-      *CLIENT_SCHEMA.keys, :clone, :secret, :interact do |name|
+  desc "client add [id]", "Add client registration",
+      *CLIENT_SCHEMA.keys, :clone, :secret, :interact do |id|
     pp scim_request { |cr|
-      opts[:client_id] = clientname(name)
+      opts[:client_id] = clientid(id)
+      opts[:name] = clientname()
       opts[:secret] = verified_pwd("New client secret", opts[:secret])
       defaults = opts[:clone] ? Util.hash_keys!(cr.get(:client, opts[:clone]), :sym) : {}
       defaults.delete(:client_id)
@@ -75,10 +76,10 @@ class ClientCli < CommonCli
     }
   end
 
-  desc "client update [name]", "Update client registration", *CLIENT_SCHEMA.keys,
-      :del_attrs, :interact do |name|
+  desc "client update [id]", "Update client registration", *CLIENT_SCHEMA.keys,
+      :del_attrs, :interact do |id|
     pp scim_request { |cr|
-      opts[:client_id] = clientname(name)
+      opts[:client_id] = clientid(id)
       orig = Util.hash_keys!(cr.get(:client, opts[:client_id]), :sym)
       info = client_info(orig)
       info.any? { |k, v| v != orig[k] } ? cr.put(:client, info) :
@@ -86,16 +87,16 @@ class ClientCli < CommonCli
     }
   end
 
-  desc "client delete [name]", "Delete client registration" do |name|
+  desc "client delete [id]", "Delete client registration" do |id|
     pp scim_request { |cr|
-      cr.delete(:client, clientname(name))
+      cr.delete(:client, clientid(id))
       "client registration deleted"
     }
   end
 
-  desc "secret set [name]", "Set client secret", :secret do |name|
+  desc "secret set [id]", "Set client secret", :secret do |id|
     pp scim_request { |cr|
-      cr.change_secret(clientname(name), verified_pwd("New secret", opts[:secret]))
+      cr.change_secret(clientid(id), verified_pwd("New secret", opts[:secret]))
       "client secret successfully set"
     }
   end

data/lib/cli/common.rb

@@ -31,8 +31,9 @@ class CommonCli < Topic
 
   def username(name); name || ask("User name") end
   def userpwd(pwd = opts[:password]); pwd || ask_pwd("Password") end
-  def clientname(name = opts[:client]); name || ask("Client name") end
-  def clientsecret(name = opts[:secret]); name || ask_pwd("Client secret") end
+  def clientid(id = opts[:client]); id || ask("Client ID") end
+  def clientsecret(secret = opts[:secret]); secret || ask_pwd("Client secret") end
+  def clientname(name = opts[:name]); name || ask("Client name") end
 
   def verified_pwd(prompt, pwd = nil)
     while pwd.nil?

data/lib/cli/info.rb

@@ -37,7 +37,7 @@ class InfoCli < CommonCli
   desc "signing key", "get the UAA's token signing key(s)", :client, :secret do
     info = misc_request {
       @cli_class.uaa_info_client.validation_key(
-          (clientname if opts.key?(:client)),
+          (clientid if opts.key?(:client)),
           (clientsecret if opts.key?(:client))
       )
     }
@@ -48,7 +48,7 @@ class InfoCli < CommonCli
   end
 
   desc "stats", "Show UAA's current usage statistics", :client, :secret do
-    pp misc_request { @cli_class.uaa_info_client.varz(clientname, clientsecret) }
+    pp misc_request { @cli_class.uaa_info_client.varz(clientid, clientsecret) }
   end
 
   desc "password strength [password]", "calculate strength score of a password" do |pwd|

data/lib/cli/token.rb

@@ -120,9 +120,9 @@ class TokenCli < CommonCli
   end
 
   define_option :secret, "--secret <secret>", "-s", "client secret"
-  desc "token client get [name]",
+  desc "token client get [id]",
       "Gets a token with client credentials grant", :secret, :scope do |id|
-    reply = issuer_request(clientname(id), clientsecret) { |ti|
+    reply = issuer_request(clientid(id), clientsecret) { |ti|
       ti.client_credentials_grant(opts[:scope]).info
     }
     say_success "client credentials" if set_context(reply)
@@ -131,7 +131,7 @@ class TokenCli < CommonCli
   define_option :password, "-p", "--password <password>", "user password"
   desc "token owner get [client] [user]", "Gets a token with a resource owner password grant",
       :secret, :password, :scope do |client, user|
-    reply = issuer_request(clientname(client), clientsecret) { |ti|
+    reply = issuer_request(clientid(client), clientsecret) { |ti|
         ti.owner_password_grant(user = username(user), userpwd, opts[:scope]).info
     }
     say_success "owner password" if set_context(reply)
@@ -139,7 +139,7 @@ class TokenCli < CommonCli
 
   desc "token refresh [refreshtoken]", "Gets a new access token from a refresh token", :client, :secret, :scope do |rtok|
     rtok ||= Config.value(:refresh_token)
-    reply = issuer_request(clientname, clientsecret) { |ti| ti.refresh_token_grant(rtok, opts[:scope]).info }
+    reply = issuer_request(clientid, clientsecret) { |ti| ti.refresh_token_grant(rtok, opts[:scope]).info }
     say_success "refresh" if set_context(reply)
   end
 
@@ -180,7 +180,7 @@ class TokenCli < CommonCli
   define_option :port, "--port <number>", "pin internal server to specific port"
   define_option :cf, "--[no-]cf", "save token in the ~/.cf_tokens file"
   desc "token authcode get", "Gets a token using the authcode flow with browser",
-      :client, :secret, :scope, :cf, :port do use_browser(clientname, clientsecret) end
+      :client, :secret, :scope, :cf, :port do use_browser(clientid, clientsecret) end
 
   desc "token implicit get", "Gets a token using the implicit flow with browser",
       :client, :scope, :cf, :port do use_browser opts[:client] || "cf" end

data/lib/cli/version.rb

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

data/lib/stub/scim.rb

@@ -22,6 +22,7 @@ class AlreadyExists < RuntimeError; end
 class BadFilter < RuntimeError; end
 class BadVersion < RuntimeError; end
 
+# StubScim is the in-memory database of the stubbed out UAA server.  Although called StubScim it manages ALL of the objects of the server; users, groups, clients, zones, providers, etc
 class StubScim
 
   private
@@ -39,10 +40,13 @@ class StubScim
   GENERAL_MULTI = [:emails, :phonenumbers, :ims, :photos, :entitlements,
       :roles, :x509certificates].to_set
   GENERAL_SUBATTRS = [:value, :display, :primary, :type].to_set
+
+  # represents the schema of the scimuser name and meta attributes
   EXPLICIT_SINGLE = {
       name: [:formatted, :familyname, :givenname, :middlename,
           :honorificprefix, :honorificsuffix].to_set,
       meta: [:created, :lastmodified, :location, :version].to_set }
+
   EXPLICIT_MULTI = {
       addresses: [:formatted, :streetaddress, :locality, :region,
           :postal_code, :country, :primary, :type].to_set,
@@ -57,7 +61,7 @@ class StubScim
         :timezone, :active, :password, :emails, :phonenumbers, :ims, :photos,
         :entitlements, :roles, :x509certificates, :name, :addresses,
         :authorizations, :groups].to_set,
-      client: [*COMMON_ATTRS, :client_id, :client_secret, :authorities,
+      client: [*COMMON_ATTRS, :client_id, :name, :client_secret, :authorities,
         :authorized_grant_types, :scope, :autoapprove,
         :access_token_validity, :refresh_token_validity, :redirect_uri,
         :'signup_redirect_url'].to_set,
@@ -127,7 +131,8 @@ class StubScim
         when *GROUPS then valid_ids?(v, :group)
         when *MEMBERSHIP then valid_ids?(v)
         when ENUMS[k] then ENUMS[k].include?(v)
-        when *EXPLICIT_SINGLE.keys then valid_complex?(v, EXPLICIT_SINGLE[k])
+        # not applicable to client objects (only scimuser objects have complex 'name' or 'meta' attributes)
+        when *EXPLICIT_SINGLE.keys && rtype.equal?(:client) then valid_complex?(v, EXPLICIT_SINGLE[k])
         when *EXPLICIT_MULTI.keys then valid_multi?(v, EXPLICIT_MULTI[k])
         else k.is_a?(String) || k.is_a?(Symbol)
       end

data/spec/spec_helper.rb

@@ -49,8 +49,10 @@ module SpecHelper
   end
 
   def setup_target(opts = {})
+    test_client = "test_client_#{Time.now.to_i}"
     opts = { authorities: "clients.read,scim.read,scim.write,uaa.resource",
       grant_types: "client_credentials,password,refresh_token",
+      name: test_client,
       scope: "openid,password.write,scim.me,scim.read",
       autoapprove: "openid,password.write,scim.me,scim.read",
       signup_redirect_url: "home"}.update(opts)
@@ -65,11 +67,11 @@ module SpecHelper
     Cli.run("target #{@target}").should be
     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 = Shellwords.escape("+=tEsTsEcRet~!@--")
     Cli.run("client add #{test_client} -s #{@test_secret} " +
         "--authorities #{opts[:authorities]} " +
         "--scope #{opts[:scope]} " +
+        "--name #{opts[:name]} " +
         "--authorized_grant_types #{opts[:grant_types]} " +
         "--autoapprove #{opts[:autoapprove]} " +
         "--signup_redirect_url #{opts[:signup_redirect_url]}").should be

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler