cf-uaac 4.0.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cb3a16efbbbd2a3b0bff7ebab805279ace288798
-  data.tar.gz: 7a64f69585ad57c783213e13be0689caa03352dd
+SHA256:
+  metadata.gz: 5166dc3408b2860dd74b3beae7c699a4da045d871f194f379949e8458d207cc5
+  data.tar.gz: 0b4fc22bae413905c699f81590b482b5d74b1d6f480f428a02b839f34e60cd90
 SHA512:
-  metadata.gz: 6d0e17c6c6e7e1e75c595c7c40bd486941b05ad977437c6468e06647b43170befcb0b9f02b8e44918d37875a39cb65b42fc4782b7905f920b3fdd3d2249c44fa
-  data.tar.gz: e20e97f7510f41dd00fe7a79e1e231e20a19d9cdb6b20dc56788cecd0d5e6c26cf752e70415e9179a2e888e089786af630877bb8376fdd3769b5cfc6c54f7337
+  metadata.gz: b380a1b762644585a61a9218ff83edc4dd50b39e35b3dd15b8deb856edd0b741d82e714c61b5d3f88eb0eaecb650c206ca987c4fc48e95df98f03a703706ad6c
+  data.tar.gz: 9d1c5a109a13dcc8642bb4b522d3ef7ee712f84341a98fd3f0f5c50eaf9beabd1bb74fd97eb9000c8a2f5b5d2e3a1ab13338d34c7cfcfa0961e9df80a6ac1c4a

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 10
+  allow:
+  - dependency-type: direct
+  - dependency-type: indirect

data/.github/workflows/ruby.yml

@@ -0,0 +1,26 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.5', '2.7', '3.0', '3.1']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake cov

data/bin/uaac

@@ -15,4 +15,6 @@
 
 $:.unshift File.expand_path File.join __FILE__, '..', '..', 'lib'
 require 'uaac_cli'
-exit CF::UAA::Cli.configure("#{ENV['HOME']}/.uaac.yml").run ? 0 : 1
+home = ENV['UAAC_HOME']
+home = ENV['HOME'] if home.nil? || home.empty?
+exit CF::UAA::Cli.configure("#{home}/.uaac.yml").run ? 0 : 1

data/cf-uaac.gemspec

@@ -24,8 +24,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{Command line interface for CloudFoundry UAA}
   s.description = %q{Client command line tools for interacting with the CloudFoundry User Account and Authorization (UAA) server.  The UAA is an OAuth2 Authorization Server so it can be used by webapps and command line apps to obtain access tokens to act on behalf of users.  The tokens can then be used to access protected resources in a Resource Server.  This library can be used by clients (as a convenient wrapper for mainstream oauth gems) or by resource servers.}
 
-  s.rubyforge_project = 'cf-uaac'
-
   s.license       = 'Apache-2.0'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -33,17 +31,17 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # dependencies
-  s.add_runtime_dependency 'cf-uaa-lib', '~> 3.11'
-  s.add_development_dependency 'bundler', '~> 1.14'
-  s.add_development_dependency 'rake', '~> 10.3', '>= 10.3.1'
-  s.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.1'
-  s.add_development_dependency 'simplecov', '~> 0.8.2'
+  s.add_runtime_dependency 'cf-uaa-lib', '~> 3.14', '> 3.14.3'
+  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'
   s.add_development_dependency 'simplecov-rcov', '~> 0.2.3'
-  s.add_development_dependency 'ci_reporter', '~> 1.9', '>= 1.9.2'
-  s.add_runtime_dependency 'highline', '~> 1.6', '>= 1.6.21'
+  s.add_development_dependency 'ci_reporter', '>= 1.9.2', '~> 2.0'
+  s.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
+  s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'eventmachine', '~> 1.0', '>= 1.0.3'
   s.add_runtime_dependency 'launchy', '~> 2.4', '>= 2.4.2'
   s.add_runtime_dependency 'em-http-request', '~> 1.1', '>= 1.1.2'
-  s.add_runtime_dependency 'json_pure', '~> 1.8', '>= 1.8.1'
-  s.add_runtime_dependency 'rack', '~> 1.5', '>= 1.5.2'
+  s.add_runtime_dependency 'json_pure', '>= 1.8.1', '< 3.0'
+  s.add_runtime_dependency 'rack', '>= 1.5.2', '< 3.0'
 end

data/lib/uaa/cli/common.rb

@@ -88,11 +88,10 @@ class CommonCli < Topic
   def scim_common_list(type, filter)
     pp scim_request { |sr|
       query = { attributes: opts[:attrs], filter: filter }
-      info = nil
-      if type == :user
-        info = sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count]))
+      info = if type == :user
+        sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count]))
       else
-        info = opts[:start] || opts[:count] ?
+        opts[:start] || opts[:count] ?
                sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count])):
                sr.all_pages(type, query)
       end
@@ -109,21 +108,24 @@ class CommonCli < Topic
     info = scim.all_pages(type, query)
     raise BadResponse unless info.is_a?(Array)
     raise NotFound if info.length == 0
-    if info.length >= 2
+    chosen_info = if info.length >= 2
+      say 'Select an origin:'
       info.each_with_index do |i, idx|
+        say "#{idx + 1}. #{i['origin']}"
       end
 
       choice = @highline.ask("Select user:  ").to_i
       if choice > info.length || choice <= 0
-        raise ArgumentError 'bad input, klugscheisser'
+        raise ArgumentError.new('bad input')
       end
-      info = info[choice - 1]
+      info[choice - 1]
     else
-      info = info[0]
+      info[0]
     end
 
+
     # when getting whole object, handle case of UAA < 1.3 which did not return meta attr from query
-    attrs || !info["id"] || info["meta"] ? info : scim.get(type, info["id"])
+    attrs || !chosen_info["id"] || chosen_info["meta"] ? chosen_info : scim.get(type, chosen_info["id"])
   end
 
   def scim_get_object(scim, type, name, attrs = nil)

data/lib/uaa/cli/config.rb

@@ -46,14 +46,14 @@ class Config
           exit 1
       end
     else # file doesn't exist, make sure we can write it now
-      File.open(@config_file, 'w') { |f| f.write("--- {}\n\n") }
+      self.write_file(@config_file, "--- {}\n\n")
     end
     Util.hash_keys!(@config, :sym)
     @context = current_subhash(@config[@target][:contexts]) if @target = current_subhash(@config)
   end
 
   def self.save
-    File.open(@config_file, 'w') { |f| YAML.dump(Util.hash_keys(@config, :str), f) } if @config_file
+    self.write_file(@config_file, YAML.dump(Util.hash_keys(@config, :str))) if @config_file
     true
   end
 
@@ -134,6 +134,11 @@ class Config
   # methods below here are not intended to be part of the public interface
   private
 
+  def self.write_file(filename, content)
+    File.open(filename, 'w') { |f| f.write content }
+    File.chmod(0600, filename)
+  end
+
   def self.current_subhash(hash)
     return unless hash
     key = nil

data/lib/uaa/cli/token.rb

@@ -88,7 +88,7 @@ class TokenCli < CommonCli
 
   def issuer_request(client_id, secret = nil)
     update_target_info
-    yield TokenIssuer.new(Config.target.to_s, client_id, secret,
+    yield TokenIssuer.new(Config.target.to_s, CGI.escape(client_id), CGI.escape(secret),
         { token_target: Config.target_value(:token_endpoint),
           skip_ssl_validation: Config.target_value(:skip_ssl_validation),
           ssl_ca_file: Config.target_value(:ca_cert) })

data/lib/uaa/cli/version.rb

@@ -14,6 +14,7 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    CLI_VERSION = '4.0.0'
+    version_path = File.join( File.dirname(__FILE__), '../../../version.txt' )
+    CLI_VERSION = File.read(version_path)
   end
 end

data/lib/uaa/stub/uaa.rb

@@ -15,6 +15,7 @@ require 'uaa'
 require 'uaa/stub/server'
 require 'uaa/stub/scim'
 require 'uaa/cli/version'
+require 'cgi'
 require 'pp'
 
 module CF::UAA
@@ -168,6 +169,7 @@ class StubUAAConn < Stub::Base
     ah = basic_auth_header.split(' ')
     return unless ah[0] =~ /^basic$/i
     ah = Base64::strict_decode64(ah[1]).split(':')
+    ah = ah.map { |item| CGI::unescape(item) }
     client = server.scim.get_by_name(ah[0], :client)
     client if client && client[:client_secret] == ah[1]
   end

data/spec/client_reg_spec.rb

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

data/spec/spec_helper.rb

@@ -26,6 +26,12 @@ require 'rspec'
 require 'eventmachine'
 require 'uaa/stub/uaa'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = [:expect, :should]
+  end
+end
+
 module CF::UAA
 
 module SpecHelper

data/spec/user_spec.rb

@@ -69,7 +69,7 @@ describe UserCli do
     Cli.input = StringIO.new("password") # selecting first origin through stdin
     Cli.run("user add #{user_with_origin} " +
                 '--emails sam@example.com --given_name SamueL ' +
-                "--phones 801-555-1212 --family_name jonES --origin uaa").should be
+                "--phones 801-555-1212 --family_name jonES --origin uaa")
 
     expect(Cli.output.string).to match 'Password:'
     Cli.run("user delete #{user_with_origin}")
@@ -80,7 +80,7 @@ describe UserCli do
     Cli.input = StringIO.new("password") # selecting first origin through stdin
     Cli.run("user add #{user_with_origin} " +
                 '--emails sam@example.com --given_name SamueL ' +
-                "--phones 801-555-1212 --family_name jonES").should be
+                "--phones 801-555-1212 --family_name jonES")
 
     expect(Cli.output.string).to match 'Password:'
     Cli.run("user delete #{user_with_origin}")

data/version.txt

@@ -0,0 +1 @@
+4.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
@@ -20,82 +20,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.14'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '3.14'
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 3.14.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.3.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.3.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
@@ -114,42 +106,50 @@ dependencies:
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ci_reporter_rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -214,42 +214,42 @@ dependencies:
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Client command line tools for interacting with the CloudFoundry User
   Account and Authorization (UAA) server.  The UAA is an OAuth2 Authorization Server
   so it can be used by webapps and command line apps to obtain access tokens to act
@@ -270,8 +270,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - LICENSE
@@ -311,6 +312,7 @@ files:
 - spec/ssl_integration_spec.rb
 - spec/token_spec.rb
 - spec/user_spec.rb
+- version.txt
 homepage: https://github.com/cloudfoundry/cf-uaac
 licenses:
 - Apache-2.0
@@ -330,20 +332,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: cf-uaac
-rubygems_version: 2.6.11
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Command line interface for CloudFoundry UAA
-test_files:
-- spec/client_reg_spec.rb
-- spec/common_spec.rb
-- spec/curl_spec.rb
-- spec/group_spec.rb
-- spec/http_spec.rb
-- spec/info_spec.rb
-- spec/setup_helper.rb
-- spec/spec_helper.rb
-- spec/ssl_integration_spec.rb
-- spec/token_spec.rb
-- spec/user_spec.rb
+test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-
-before_install:
-  - gem update
-  - gem install bundler
-
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1