json-jwt 1.15.3.1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d9dceefdfb0168531cd68668848730898141b097c5541cde5cbb95a1bc24d7
-  data.tar.gz: 9dd27ddf48a2102ee1da5b8a7da411d10393fb622570a170b63dc328d50db7b3
+  metadata.gz: 2097e754332fbc0d82af414efcce07c63da2bbd7cc3f2976a8df1c770dffb9b8
+  data.tar.gz: a7a9950a0501b58b249bb39d2c369ea315cd40d4f9297b6e19f66d82763ec2ce
 SHA512:
-  metadata.gz: edbf0b0eb0521841aae74427293f66595ab30dee065b59b21bf0e3bd57f929b8d700caa67d8458e6e832819d962998862067eb8de0ea5530db967f89e4b19cbc
-  data.tar.gz: d7dcc87bf09ef1ddcf9b81306c41db9286e62f9f9b90c7838a1073f6d88cdc8a8114be0834dc54c2b1e4a69a7355771257b0093ec63b1554b3bfaeab685b022a
+  metadata.gz: a0092471b468de8a24909cafa45a86c934ee67c0eedf40ae962427f72007d038e1a2dde5a1d32c39465e9594b0c06e634bed8f8bade183a7919f5a12222ee916
+  data.tar.gz: 5b5ff6abbd60b781b7d9d291153a80f83a108fe37d9358dfac8463ff810b0016c5224f849baac3a4720d0bdc8b6d8bbdc0131780b8fba29c6e4d49c72fa2c034

data/.github/workflows/{test_ruby.yml → spec.yml}

@@ -1,14 +1,16 @@
-name: Test Ruby
+name: Spec
 
 on:
   push:
+    branches:
+      - master
   pull_request:
 
 permissions:
   contents: read
 
 jobs:
-  test:
+  spec:
     strategy:
       matrix:
         os: ['ubuntu-20.04']
@@ -26,5 +28,5 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
-    - name: Run tests
-      run: bundle exec rake
+    - name: Run Specs
+      run: bundle exec rake spec

data/README.md

@@ -2,8 +2,6 @@
 
 JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON Web Key) in Ruby
 
-[![Build Status](https://secure.travis-ci.org/nov/json-jwt.png)](http://travis-ci.org/nov/json-jwt)
-
 ## Installation
 
 ```

data/VERSION

@@ -1 +1 @@
-1.15.3.1
+1.16.0

data/json-jwt.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'activesupport', '>= 4.2'
   gem.add_runtime_dependency 'bindata'
   gem.add_runtime_dependency 'aes_key_wrap'
-  gem.add_runtime_dependency 'httpclient'
+  gem.add_runtime_dependency 'faraday', '~> 2.0'
+  gem.add_runtime_dependency 'faraday-follow_redirects'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'webmock'

data/lib/json/jwk/set/fetcher.rb

@@ -36,17 +36,13 @@ module JSON
         self.debugging = false
 
         def self.http_client
-          _http_client_ = HTTPClient.new(
-            agent_name: "JSON::JWK::Set::Fetcher (#{JSON::JWT::VERSION})"
-          )
-
-          # NOTE: httpclient gem seems stopped maintaining root certtificate set, use OS default.
-          _http_client_.ssl_config.clear_cert_store
-          _http_client_.ssl_config.cert_store.set_default_paths
-
-          _http_client_.request_filter << Debugger::RequestFilter.new if debugging?
-          http_config.try(:call, _http_client_)
-          _http_client_
+          Faraday.new(headers: {user_agent: "JSON::JWK::Set::Fetcher #{VERSION}"}) do |faraday|
+            faraday.response :raise_error
+            faraday.response :follow_redirects
+            faraday.response :logger, JSON::JWK::Set::Fetcher.logger if debugging?
+            faraday.adapter Faraday.default_adapter
+            http_config.try(:call, faraday)
+          end
         end
         def self.http_config(&block)
           @@http_config ||= block
@@ -70,7 +66,7 @@ module JSON
           jwks = Set.new(
             JSON.parse(
               cache.fetch(cache_key, options) do
-                http_client.get_content(jwks_uri)
+                http_client.get(jwks_uri).body
               end
             )
           )

data/lib/json/jwt.rb

@@ -1,6 +1,7 @@
 require 'openssl'
 require 'base64'
-require 'httpclient'
+require 'faraday'
+require 'faraday/follow_redirects'
 require 'active_support'
 require 'active_support/core_ext'
 require 'json/jose'
@@ -108,11 +109,7 @@ module JSON
         when JWS::NUM_OF_SEGMENTS
           JWS.decode_compact_serialized jwt_string, key_or_secret, algorithms, allow_blank_payload
         when JWE::NUM_OF_SEGMENTS
-          if allow_blank_payload
-            raise InvalidFormat.new("JWE w/ blank payload is not supported.")
-          else
-            JWE.decode_compact_serialized jwt_string, key_or_secret, algorithms, encryption_methods
-          end
+          JWE.decode_compact_serialized jwt_string, key_or_secret, algorithms, encryption_methods
         else
           raise InvalidFormat.new("Invalid JWT Format. JWT should include #{JWS::NUM_OF_SEGMENTS} or #{JWE::NUM_OF_SEGMENTS} segments.")
         end
@@ -141,5 +138,4 @@ require 'json/jwe'
 require 'json/jwk'
 require 'json/jwk/jwkizable'
 require 'json/jwk/set'
-require 'json/jwk/set/fetcher'
-require 'json/jwk/set/fetcher/debugger/request_filter'
+require 'json/jwk/set/fetcher'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.15.3.1
+  version: 1.16.0
 platform: ruby
 authors:
 - nov matake
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,11 +159,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
-- ".github/workflows/test_ruby.yml"
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -162,14 +175,13 @@ files:
 - lib/json/jwk/jwkizable.rb
 - lib/json/jwk/set.rb
 - lib/json/jwk/set/fetcher.rb
-- lib/json/jwk/set/fetcher/debugger/request_filter.rb
 - lib/json/jws.rb
 - lib/json/jwt.rb
 homepage: https://github.com/nov/json-jwt
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -184,8 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and
   JSON Web Key) in Ruby

data/.travis.yml

@@ -1,12 +0,0 @@
-before_install:
-  - gem install bundler
-  - git submodule update --init --recursive
-
-rvm:
-  - 2.6.10
-  - 2.7.6
-  - 3.0.4
-  - 3.1.2
-
-jdk:
-  - openjdk11

data/lib/json/jwk/set/fetcher/debugger/request_filter.rb

@@ -1,34 +0,0 @@
-module JSON
-  class JWK
-    class Set
-      module Fetcher
-        module Debugger
-          class RequestFilter
-            # Callback called in HTTPClient (before sending a request)
-            # request:: HTTP::Message
-            def filter_request(request)
-              started = "======= [JSON::JWK::Set::Fetcher] HTTP REQUEST STARTED ======="
-              log started, request.dump
-            end
-
-            # Callback called in HTTPClient (after received a response)
-            # request::  HTTP::Message
-            # response:: HTTP::Message
-            def filter_response(request, response)
-              finished = "======= [JSON::JWK::Set::Fetcher] HTTP REQUEST FINISHED ======="
-              log '-' * 50, response.dump, finished
-            end
-
-            private
-
-            def log(*outputs)
-              outputs.each do |output|
-                JSON::JWK::Set::Fetcher.logger.info output
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end