cf-uaa-lib 4.0.3 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eebcd4d0b7e5068266fceab3b4686335b5446bb18a6bf4f0a68139ee958dcf6
-  data.tar.gz: d010ba705cca4e1c78c87b782e17faab10f3c3f1008a5337ff2345634053e0bc
+  metadata.gz: 1265b1f30cfa697725fbdac34316f57c9bb202b84b28ca8a193e24747c223cc0
+  data.tar.gz: 442bdf0d2344510386518e92c27c05e19638bc64540315750d101c43d004bb5f
 SHA512:
-  metadata.gz: fedcc696e77cd58fb6a53b24d1eb24482c487e239bbf3e1c6470c66480f5e7f29fc8bd4ab178deb13c010cac2284a21a191c8025870961c4182ffcf212c03c03
-  data.tar.gz: 10a6ca261845b1d773b941da11fc1abffa37ee910fe1175bc5fa9a716a213ab38c70056e44d3d73e2a891ce9c3747243f00342d0a8c3ff8076e373ebeceb3b42
+  metadata.gz: 2105ab1ec2909280fc9298478faad438bf33a4822269d3d026c8a47b4ecbe52204e2b884ad688282eb852c500fd3c9cd3c00f14734dc73b4c73eca8f46fb414b
+  data.tar.gz: 570f8db56441c4bcb0082838e5c473a2759ffe08def98b4d766853fdc05772714871df92ea4f010461c7cc8e1d0fea6d07ef116cce568186ba1f5f71543f4f72

data/.github/workflows/gem-push.yml

@@ -3,27 +3,22 @@ name: Ruby Gem
 on: workflow_dispatch
 
 jobs:
-  build:
-    name: Build + Publish
+  push:
+    name: Push gem to RubyGems.org
     runs-on: ubuntu-latest
+
     permissions:
-      contents: read
-      packages: write
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby 2.6
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '2.6'
+      # Set up
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
 
-    - name: Publish to RubyGems
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: "${{ secrets.RUBYGEMS_AUTH_TOKEN }}"
+      # Release
+      - uses: rubygems/release-gem@v1

data/.github/workflows/push_gem.yml

@@ -0,0 +1,24 @@
+name: Ruby Gem
+
+on: workflow_dispatch
+
+jobs:
+  push:
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
+
+    steps:
+      # Set up
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - uses: rubygems/release-gem@v1

data/cf-uaa-lib.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # dependencies
-  s.add_dependency 'multi_json', '>= 1.12.1', '< 1.16'
+  s.add_dependency 'json_pure', '~>2.7'
   s.add_dependency 'httpclient', '~> 2.8', '>= 2.8.2.4'
   s.add_dependency 'addressable', '~> 2.8', '>= 2.8.0'
 
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '~> 0.22.0'
   s.add_development_dependency 'simplecov-rcov', '~> 0.3.0'
   s.add_development_dependency 'ci_reporter', '>= 1.9.2', '~> 2.0'
-  s.add_development_dependency 'json_pure', '>= 1.8.1', '~> 2.5'
+  s.add_development_dependency 'json_pure', '~>2.7'
   s.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
 
 end

data/lib/uaa/scim.rb

@@ -369,6 +369,28 @@ class Scim
         "#{type_info(:client, :path)}/#{Addressable::URI.encode(client_id)}/secret", req, headers))
   end
 
+  # Change client jwt trust configuration.
+  # * For a client to change its jwt client trust, the token in @auth_header must contain
+  #   "client.trust" scope.
+  # * For an admin to set a client secret, the token in @auth_header must contain
+  #   "uaa.admin" scope.
+  # @see https://docs.cloudfoundry.org/api/uaa/index.html#change-client-jwt
+  # @param [String] client_id the {Scim} +id+ attribute of the client
+  # @param [String] jwks_uri the URI to token endpoint
+  # @param [String] jwks the JSON Web Key Set
+  # @param [String] kid If changeMode is DELETE provide the id of key
+  # @param [String] changeMode Change mode, possible is ADD, UPDATE, DELETE
+  # @return [Hash] success message from server
+  def change_clientjwt(client_id, jwks_uri = nil, jwks = nil, kid = nil, changeMode = nil)
+    req = {"client_id" => client_id }
+    req["jwks_uri"] = jwks_uri if jwks_uri
+    req["jwks"] = jwks if jwks
+    req["kid"] = kid if kid
+    req["changeMode"] = changeMode if changeMode
+    json_parse_reply(@key_style, *json_put(@target,
+                                           "#{type_info(:client, :path)}/#{Addressable::URI.encode(client_id)}/clientjwt", req, headers))
+  end
+
   def unlock_user(user_id)
     req = {"locked" => false}
     json_parse_reply(@key_style, *json_patch(@target,

data/lib/uaa/util.rb

@@ -11,7 +11,7 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require 'multi_json'
+require 'json/pure'
 require "base64"
 require 'logger'
 require 'uri'
@@ -141,11 +141,11 @@ class Util
 
   # Converts +obj+ to JSON
   # @return [String] obj in JSON form.
-  def self.json(obj) MultiJson.dump(obj) end
+  def self.json(obj) JSON.dump(obj) end
 
   # Converts +obj+ to nicely formatted JSON
   # @return [String] obj in formatted json
-  def self.json_pretty(obj) MultiJson.dump(obj, pretty: true) end
+  def self.json_pretty(obj) JSON.pretty_generate(obj) end
 
   # Converts +obj+ to a URL-safe base 64 encoded string
   # @return [String]
@@ -182,8 +182,8 @@ class Util
   # @param style (see Util.hash_key)
   # @return [Hash] parsed data
   def self.json_parse(str, style = nil)
-    hash_keys!(MultiJson.load(str), style) if str && !str.empty?
-  rescue MultiJson::DecodeError
+    hash_keys!(JSON.parse(str), style) if str && !str.empty?
+  rescue Exception
     raise DecodeError, "json decoding error"
   end
 

data/lib/uaa/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    VERSION = '4.0.3'
+    VERSION = '4.0.5'
   end
 end

data/spec/scim_spec.rb

@@ -160,6 +160,30 @@ describe Scim do
     result['id'].should == 'id12345'
   end
 
+  it "add a client's jwt trust using jwks_uri" do
+    subject.set_request_handler do |url, method, body, headers|
+      url.should == "#{@target}/oauth/clients/id12345/clientjwt"
+      method.should == :put
+      check_headers(headers, :json, :json, nil)
+      body.should include('"jwks_uri":"http://localhost:8080/uaa/token_keys"')
+      [200, '{"id":"id12345"}', {'content-type' => 'application/json'}]
+    end
+    result = subject.change_clientjwt('id12345', 'http://localhost:8080/uaa/token_keys')
+    result['id'].should == 'id12345'
+  end
+
+  it "add a client's jwt trust using jwks" do
+    subject.set_request_handler do |url, method, body, headers|
+      url.should == "#{@target}/oauth/clients/id12345/clientjwt"
+      method.should == :put
+      check_headers(headers, :json, :json, nil)
+      body.should include('"jwks":"keys"')
+      [200, '{"id":"id12345"}', {'content-type' => 'application/json'}]
+    end
+    result = subject.change_clientjwt('id12345', nil, 'keys')
+    result['id'].should == 'id12345'
+  end
+
   it 'unlocks a user' do
     subject.set_request_handler do |url, method, body, headers|
       url.should == "#{@target}/Users/id12345/status"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaa-lib
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.5
 platform: ruby
 authors:
 - Dave Syer
@@ -12,28 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -58,22 +52,22 @@ dependencies:
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,22 +174,16 @@ dependencies:
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: ci_reporter_rspec
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +215,7 @@ extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
 - ".github/workflows/gem-push.yml"
+- ".github/workflows/push_gem.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".yardopts"
@@ -273,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: Client library for CloudFoundry UAA