cf-uaac 3.13.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ef367062c3e28c384a318cbf086099558e965a4
-  data.tar.gz: 2cc9ad180ad1a8ccdb88eab48191cc8931bd336c
+SHA256:
+  metadata.gz: 8ec28aaefed5216eceb8c2665fd861167475f4b02202c0f7a432ded556374b02
+  data.tar.gz: aa68a4e5bdced51b1a049f8cad96237eec7784c596dfc51f77de0c5dd0a3fdc8
 SHA512:
-  metadata.gz: c56c0743dbede318336371e6d731d0f6d895a949f41905bc60cd492348a8ae818b21cf4f0f7cbb85ebc5ae3a5b46195c44e674315a074fa97d3df55325adbfc6
-  data.tar.gz: ade14cd1d7aeec495397587b486327cf046794e68c8a5a902005b25f0124b8db7c9d50e966f828bcf3fe390ee0c15bc4e22c75a4e52de6481f1249598a50c17a
+  metadata.gz: f5e0299e7af1702bd5ec78da39eb6d731a1eda5d1458c5ff564f6a0b141877ee9e84351fa107984719c77be3e49ca4323967222ddff7dc08f8e24daa74f725dc
+  data.tar.gz: 19999aa17a59d217da5e01cdef536834d4b10529a4bc860b5ddbdac07637336ebf594b5d18e18dd93256b2cdb3607067ea283c8f687d679c75c627391721f545

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/.travis.yml

@@ -5,6 +5,6 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.7
+  - 2.6
+  - 2.5

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

@@ -34,16 +34,15 @@ Gem::Specification.new do |s|
 
   # 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_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_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/group.rb

@@ -145,7 +145,9 @@ class GroupCli < CommonCli
     group = scim_get_object(scim, :group, gname(name))
 
     old_members = (group['members'] || [])
-    new_members = find_members(scim, members)
+    new_members = find_members(scim, members).map do |member|
+      member.merge('origin' => 'uaa')
+    end
 
     unless new_members.size == members.size
       raise 'not all users found, none added'
@@ -183,25 +185,6 @@ class GroupCli < CommonCli
     'success'
   end
 
-  def update_members(scim, name, attr, users, add = true)
-    group = scim_get_object(scim, :group, gname(name))
-    old_ids = id_set(group[attr] || [])
-    new_ids = id_set(scim.ids(:user, *users))
-    if add
-      raise 'not all users found, none added' unless new_ids.size == users.size
-      group[attr] = (old_ids + new_ids).to_a
-      raise 'no new users given' unless group[attr].size > old_ids.size
-    else
-      raise 'not all users found, none deleted' unless new_ids.size == users.size
-      group[attr] = (old_ids - new_ids).to_a
-      raise 'no existing users to delete' unless group[attr].size < old_ids.size
-      group.delete(attr) if group[attr].empty?
-    end
-
-    scim.put(:group, group)
-    'success'
-  end
-
   desc "member add [name] [users...]", "add members to a group" do |name, *users|
     pp scim_request { |scim| add_members(scim, name, users) }
   end
@@ -209,23 +192,6 @@ class GroupCli < CommonCli
   desc "member delete [name] [users...]", "remove members from a group" do |name, *users|
     pp scim_request { |scim| delete_members(scim, name, users) }
   end
-
-  desc "group reader add [name] [users...]", "add users who can read the members" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "readers", users) }
-  end
-
-  desc "group reader delete [name] [users...]", "delete users who can read members" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "readers", users, false) }
-  end
-
-  desc "group writer add [name] [users...]", "add users who can modify group" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "writers", users) }
-  end
-
-  desc "group writer delete [name] [users...]", "remove user who can modify group" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "writers", users, false) }
-  end
-
   private
 
   def is_natural_number?(input)

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 = '3.13.1'
+    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/group_spec.rb

@@ -101,57 +101,6 @@ describe GroupCli do
     check_members
   end
 
-  it "adds one reader to the group" do
-    Cli.run("group reader add #{@test_group} #{@test_user}r").should be
-    Cli.output.string.should include "success"
-  end
-
-  it "adds one writer to the group" do
-    Cli.run("group writer add #{@test_group} #{@test_user}w").should be
-    Cli.output.string.should include "success"
-  end
-
-  it "gets readers and writers in the group" do
-    Cli.run("group get #{@test_group}").should be
-    Cli.output.string.should be
-  end
-
-  it "reads members as a reader" do
-    pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
-
-    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}r -p #{@test_pwd}").should be
-    Cli.run("group get #{@test_group} -a memBers").should be
-    ids = Cli.output.string.scan(/.*value:\s+([^\s]+)/).flatten
-    @users.size.should == ids.size
-  end
-
-  it "can't write members as a reader" do
-    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}r -p #{@test_pwd}").should be
-    Cli.run("member add #{@test_group} #{@test_user}z").should_not be
-    Cli.output.string.should include "access_denied"
-  end
-
-  it "adds a member as a writer" do
-    pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
-
-    Cli.run "context #{@test_client}"
-    Cli.run("user add #{@test_user}z -p #{@test_pwd} --email sam@example.com").should be
-    @users << "#{@test_user}z"
-    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}w -p #{@test_pwd}").should be
-    Cli.run("member add #{@test_group} #{@test_user}z").should be
-    Cli.run("group get #{@test_group} -a memBers").should be
-    ids = Cli.output.string.scan(/.*value:\s+([^\s]+)/).flatten
-    @users.size.should == ids.size
-    # check_members
-  end
-
-  it "can't read members as a non-reader" do
-    pending "real uaa still returns members even if user is not in readers list" unless @stub_uaa
-    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}m -p #{@test_pwd}").should be
-    Cli.run("group get #{@test_group}").should be_nil
-    Cli.output.string.should include "NotFound"
-  end
-
   it "deletes all members from a group" do
     Cli.run "context #{@test_client}"
     cmd = "member delete #{@test_group.downcase} "

data/version.txt

@@ -0,0 +1 @@
+4.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 3.13.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
@@ -28,74 +28,60 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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'
 - !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
@@ -214,42 +200,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,6 +256,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".travis.yml"
 - ".yardopts"
@@ -311,6 +298,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 +318,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: []