cf-uaac 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5166dc3408b2860dd74b3beae7c699a4da045d871f194f379949e8458d207cc5
-  data.tar.gz: 0b4fc22bae413905c699f81590b482b5d74b1d6f480f428a02b839f34e60cd90
+  metadata.gz: 36488b9610f3cc86a06d229903f29beda0e6394d533894390199e89851e225de
+  data.tar.gz: 00b0ea7818b49c8871e78ebb1286982dcd569ac33decd42a96d9fa10cec0aea7
 SHA512:
-  metadata.gz: b380a1b762644585a61a9218ff83edc4dd50b39e35b3dd15b8deb856edd0b741d82e714c61b5d3f88eb0eaecb650c206ca987c4fc48e95df98f03a703706ad6c
-  data.tar.gz: 9d1c5a109a13dcc8642bb4b522d3ef7ee712f84341a98fd3f0f5c50eaf9beabd1bb74fd97eb9000c8a2f5b5d2e3a1ab13338d34c7cfcfa0961e9df80a6ac1c4a
+  metadata.gz: 349d0003eb1dba666f54fadc9017b644269d15cf89edb83cf210e22c5fac38b4faf70e0b12b07afeec378572c158ea8db77cb7242f998ad73d1258b75d285c4a
+  data.tar.gz: b669538c9b836c36ac8f493c3e0539303c0269c08fa3a6704e7f4f26140333016ec748e6e594b54932f04f993ecfaf259800c294e1f727c00b249dc060ff1476

data/README.md

@@ -1,6 +1,6 @@
 # CloudFoundry UAA Command Line Client
 
-[![Build Status](https://travis-ci.org/cloudfoundry/cf-uaac.svg?branch=master)](https://travis-ci.org/cloudfoundry/cf-uaac)
+![Build status](https://github.com/cloudfoundry/cf-uaac/actions/workflows/ruby.yml/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/cf-uaac.png)](https://rubygems.org/gems/cf-uaac)
 
 ## Installation
@@ -67,4 +67,4 @@ export UAA_CLIENT_ID="admin"
 export UAA_CLIENT_SECRET="adminsecret"
 export UAA_CLIENT_TARGET="http://localhost:8080/uaa"
 bundle exec rake test
-```
+```

data/cf-uaac.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # dependencies
-  s.add_runtime_dependency 'cf-uaa-lib', '~> 3.14', '> 3.14.3'
+  s.add_runtime_dependency 'cf-uaa-lib', '~> 4.0'
   s.add_development_dependency 'rake', '>= 10.3.1', '~> 13.0'
   s.add_development_dependency 'rspec', '>= 2.14.1', '~> 3.9'
   s.add_development_dependency 'simplecov', '~> 0.21.2'

data/lib/uaa/cli/base.rb

@@ -14,6 +14,7 @@
 require 'highline'
 require 'optparse'
 require 'json/pure'
+require 'io/console'
 
 module CF; module UAA end end
 
@@ -65,7 +66,7 @@ class Topic
 
   def terminal_columns
     return @terminal_columns ||= 0 if @terminal_columns || !@output.tty?
-    cols = HighLine::SystemExtensions.terminal_size.first rescue 0
+    cols = IO.console.winsize.last rescue 0 if $stdin.tty?
     @terminal_columns = !cols || cols < 40 ? 0 : cols
   end
 

data/lib/uaa/cli/client_reg.rb

@@ -28,6 +28,7 @@ class ClientCli < CommonCli
       :refresh_token_validity => 'seconds',
       :redirect_uri => 'list',
       :autoapprove => 'list',
+      :allowedproviders => 'list',
       :'signup_redirect_url' => 'url'
   }
   CLIENT_SCHEMA.each { |k, v| define_option(k, "--#{k} <#{v}>") }
@@ -51,6 +52,9 @@ class ClientCli < CommonCli
         info[k] = Util.arglist(info[k]) if p == 'list'
         info.delete(k) unless info[k]
       end
+      if opts.key?(k) && k == :allowedproviders && (info[k].join('') == 'all' || info[k].join('') == 'null' || info[k].join('') == 'nil')
+        info[:allowedproviders] = nil
+      end
     end
   end
 

data/lib/uaa/cli/common.rb

@@ -31,7 +31,7 @@ class CommonCli < Topic
 
   def username(name); name || ask("User name") end
   def userpwd(pwd = opts[:password]); pwd || ask_pwd("Password") end
-  def passcode(passcode = opts[:passcode]); passcode || ask("Passcode (from #{Config.target}/passcode)") end
+  def passcode(passcode = opts[:passcode]); passcode || ask("Passcode ( from #{Config.target}/passcode )") 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 end
@@ -186,7 +186,8 @@ class MiscCli < CommonCli
   define_option :ca_cert, "--ca-cert [file]", "use the given CA certificate to validate the target's SSL certificate"
   define_option :skip_ssl_validation, "--skip-ssl-validation", "do not attempt to validate ssl certificate"
   define_option :force, "--[no-]force", "-f", "set even if target does not respond"
-  desc "target [uaa_url]", "Display current or set new target", :force, :ca_cert, :skip_ssl_validation do |uaa_url|
+  define_option :basic_auth, "--[no-]basic_auth", "set if you need basic or oauth2 (url encoded) client authentication"
+  desc "target [uaa_url]", "Display current or set new target", :force, :ca_cert, :skip_ssl_validation, :basic_auth do |uaa_url|
     msg, info = nil, {}
     if uaa_url
       if uaa_url.to_i.to_s == uaa_url
@@ -204,6 +205,8 @@ class MiscCli < CommonCli
       Config.target = url # we now have a canonical url set to https if possible
       Config.target_opts(skip_ssl_validation: true) if opts[:skip_ssl_validation]
       Config.target_opts(ca_cert: opts[:ca_cert])
+      Config.target_opts(basic_auth: true) if opts[:basic_auth] == true
+      Config.target_opts(basic_auth: false) if opts[:basic_auth] == false
       update_target_info(info) if info[:prompts]
     end
     return say "no target set" unless Config.target

data/lib/uaa/cli/info.rb

@@ -47,10 +47,6 @@ class InfoCli < CommonCli
     pp info
   end
 
-  desc "stats", "Show UAA's current usage statistics", :client, :secret do
-    pp misc_request { @cli_class.uaa_info_client.varz(clientid, clientsecret) }
-  end
-
   desc "password strength [password]", "calculate strength score of a password" do |pwd|
     pp misc_request { @cli_class.uaa_info_client.password_strength(userpwd(pwd)) }
   end

data/lib/uaa/cli/token.rb

@@ -25,6 +25,7 @@ class TokenCatcher < Stub::Base
     secret = server.info.delete(:client_secret)
     ti = TokenIssuer.new(Config.target, server.info.delete(:client_id), secret,
         { token_target: Config.target_value(:token_target),
+          basic_auth: Config.target_value(:basic_auth),
           skip_ssl_validation: Config.target_value(:skip_ssl_validation)})
     tkn = secret ? ti.authcode_grant(server.info.delete(:uri), data) :
         ti.implicit_grant(server.info.delete(:uri), data)
@@ -88,8 +89,9 @@ class TokenCli < CommonCli
 
   def issuer_request(client_id, secret = nil)
     update_target_info
-    yield TokenIssuer.new(Config.target.to_s, CGI.escape(client_id), CGI.escape(secret),
+    yield TokenIssuer.new(Config.target.to_s, client_id, secret,
         { token_target: Config.target_value(:token_endpoint),
+          basic_auth: Config.target_value(:basic_auth),
           skip_ssl_validation: Config.target_value(:skip_ssl_validation),
           ssl_ca_file: Config.target_value(:ca_cert) })
   rescue Exception => e

data/lib/uaa/cli/user.rb

@@ -19,12 +19,12 @@ class UserCli < CommonCli
 
   topic 'User Accounts', 'account'
 
+  define_option :origin, '--origin <name>, select user to update by identity provider origin. Defaults to UAA'
   define_option :givenName, '--given_name <name>'
   define_option :familyName, '--family_name <name>'
   define_option :emails, '--emails <addresses>'
   define_option :phoneNumbers, '--phones <phone_numbers>'
-  define_option :origin, '--origin <identity provider origin, defaults to UAA>'
-  USER_INFO_OPTS = [:givenName, :familyName, :emails, :phoneNumbers, :origin]
+  USER_INFO_OPTS = [:origin, :givenName, :familyName, :emails, :phoneNumbers]
 
   def user_opts(info = {})
     [:emails, :phoneNumbers].each do |o|

data/lib/uaa/stub/scim.rb

@@ -65,7 +65,7 @@ class StubScim
         :authorizations, :groups].to_set,
       client: [*COMMON_ATTRS, :client_id, :name, :client_secret, :authorities,
         :authorized_grant_types, :scope, :autoapprove,
-        :access_token_validity, :refresh_token_validity, :redirect_uri,
+        :access_token_validity, :refresh_token_validity, :redirect_uri, :allowedproviders,
         :'signup_redirect_url'].to_set,
       group: [*COMMON_ATTRS, :displayname, :members, :writers, :readers, :external_groups].to_set }
   VISIBLE_ATTRS = {user: Set.new(LEGAL_ATTRS[:user] - HIDDEN_ATTRS),

data/spec/client_reg_spec.rb

@@ -59,7 +59,7 @@ describe ClientCli do
 
     it 'does not wrap the output of the access token in the terminal' do
       allow(@output).to receive(:tty?).and_return(true)
-      allow(HighLine::Terminal).to receive(:terminal_size).and_return([80, 40])
+      allow(IO.console).to receive(:winsize).and_return([40, 80])
       Cli.run('context').should be
       Cli.output.string.should match /access_token: \S+?\s+token_type/m
     end

data/spec/common_spec.rb

@@ -44,7 +44,7 @@ describe CommonCli do
 
   it "displays user help with -h has --origin option" do
     Cli.run("user -h")
-    Cli.output.string.should include("--origin <identity provider origin, defaults to UAA>")
+    Cli.output.string.should include("--origin <name>, select user to update by identity provider origin. Defaults to UAA")
   end
 
   it "displays group help with -h has --origin option" do

data/spec/info_spec.rb

@@ -53,11 +53,6 @@ describe InfoCli do
     Cli.output.string.should include "score", "requiredScore"
   end
 
-  it "gets the server stats" do
-    pending "no UAA_VARZ_SECRET environment variable set" unless @varz_secret
-    Cli.run("stats -c varz -s #{@varz_secret}").should be
-    Cli.output.string.should include 'type: UAA', 'mem:', 'version:'
-  end
 
   it "sets multiple targets to be fully qualified in config and targets output" do
     Config.load("")

data/version.txt

@@ -1 +1 @@
-4.4.0
+4.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
@@ -20,20 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.14.3
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.14.3
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement