jwt-multisignature 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7255527131c473ac91de7bd0acf3cbcd2cc04feaa9676372b68f2450732d207d
-  data.tar.gz: db3a0beb3825b06cf7679e947328ef93efab64b9da34a7ba4ba89e01a3018c4a
+  metadata.gz: 5fd4d833cfadd4bdc49ea63c906f4971aefbfc391f10c9f9cd2405ad5fef339f
+  data.tar.gz: a3b7dbf5c1192afb2cfb1a06581804cf331220e553cfde0782ae3197c8674827
 SHA512:
-  metadata.gz: 8d726976082a6a8b12125f2fd1902d750c4a9168d61d86ebfa65a10d58481a4abc825395fc9bdadb04826d9d57266c0aa8023823b0cc550654136538811c9e4d
-  data.tar.gz: bdb1a6561c14f7ea0caaf197948878c7ac8f0b2514c33d0dee4d7034405387ca8f947f8f8de4e2c7d73291d750d08f9ed26f88ef9e1193e69029c4df0ee051d6
+  metadata.gz: 2e3731a51b18a390fbbeebcfa7a9398c1d303f7ce9620743be18433402dafe43320cf2bc648bcfcee0d7e88687263a311972fb3d2f8eaba9d35772beaf3cf582
+  data.tar.gz: 965622e0ff68c204e1f18f9bcae39b9e80fca1b6422dff8a27040457d8355589ea8c8a4553e628bc4e038fa18512070123d04512fe8b4d92c910ae2293e8c444

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    jwt-multisignature (1.0.1)
+    jwt-multisignature (1.0.2)
       activesupport (>= 4.0, < 6.0)
-      jwt (~> 2.1)
+      jwt (~> 2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.5)
-    i18n (1.6.0)
+    concurrent-ruby (1.1.6)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jwt (2.2.1)
-    memoist (0.16.0)
-    minitest (5.11.3)
-    power_assert (1.1.4)
-    rake (12.3.2)
-    test-unit (3.3.3)
+    memoist (0.16.2)
+    minitest (5.14.0)
+    power_assert (1.1.6)
+    rake (12.3.3)
+    test-unit (3.3.5)
       power_assert
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -38,4 +38,4 @@ DEPENDENCIES
   test-unit (~> 3.1)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/jwt-multisignature.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths   = ["lib"]
   s.required_ruby_version = "~> 2.5"
 
-  s.add_dependency             "jwt",           "~> 2.1"
+  s.add_dependency             "jwt",           "~> 2.2"
   s.add_dependency             "activesupport", ">= 4.0", "< 6.0"
   s.add_development_dependency "bundler",       "~> 1.16"
 end

data/lib/jwt-multisignature.rb

@@ -40,7 +40,7 @@ module JWT
       # @raise [JWT::EncodeError]
       def generate_jwt(payload, private_keychain, algorithms)
         algorithms_mapping = algorithms.with_indifferent_access
-        { payload:    base64_encode(JSON.generate(payload)),
+        { payload:    base64_encode(::JWT::JSON.generate(payload)),
           signatures: private_keychain.map do |id, value|
             generate_jws(payload, id, value, algorithms_mapping.fetch(id))
           end }
@@ -62,7 +62,7 @@ module JWT
       # @raise [JWT::EncodeError]
       def add_jws(jwt, key_id, key_value, algorithm)
         remove_jws(jwt, key_id).tap do |new_jwt|
-          payload = JSON.parse(base64_decode(new_jwt.fetch(:payload)))
+          payload = ::JWT::JSON.parse(base64_decode(new_jwt.fetch(:payload)))
           new_jwt.fetch(:signatures) << generate_jws(payload, key_id, key_value, algorithm)
         end
       end
@@ -119,7 +119,7 @@ module JWT
       def verify_jwt(jwt, public_keychain, options = {})
         keychain           = public_keychain.with_indifferent_access
         serialized_payload = base64_decode(jwt.fetch("payload"))
-        payload            = JSON.parse(serialized_payload)
+        payload            = ::JWT::JSON.parse(serialized_payload)
         verified           = []
         unverified         = []
 
@@ -188,12 +188,12 @@ module JWT
       def verify_jws(jws, payload, public_keychain, options = {})
         encoded_header     = jws.fetch("protected")
         serialized_header  = base64_decode(encoded_header)
-        serialized_payload = JSON.generate(payload)
+        serialized_payload = ::JWT::JSON.generate(payload)
         encoded_payload    = base64_encode(serialized_payload)
         signature          = jws.fetch("signature")
         public_key         = public_keychain.with_indifferent_access.fetch(jws.fetch("header").fetch("kid"))
         jwt                = [encoded_header, encoded_payload, signature].join(".")
-        algorithm          = JSON.parse(serialized_header).fetch("alg")
+        algorithm          = ::JWT::JSON.parse(serialized_header).fetch("alg")
         JWT.decode(jwt, to_pem_or_key(public_key, algorithm), true, options.merge(algorithms: [algorithm])).first
       end
 

data/lib/jwt-multisignature/version.rb

@@ -3,6 +3,6 @@
 
 module JWT
   module Multisignature
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/test/test-jws-verificator.rb

@@ -28,7 +28,7 @@ class JWSVerificatorTest < Test::Unit::TestCase
     jws     = %({"header":{"kid":"ebert.biz"},"signature":"3nSc9aeRuDyrq_dYQRQX5tnM1wVw6reoUlmQ4JqWIV3LM7yeIDgcVLRYxyb7UUBM0gNqA4QJj3CpwS6vg-EHYQ"})
     payload = { foo: "bar" }
     e       = assert_raise { example jws, payload, {}, payload.to_json }
-    assert_kind_of JWT::DecodeError, e
+    assert_kind_of KeyError, e
     assert_match(/key not found: "protected"/i, e.message)
   end
 
@@ -36,7 +36,7 @@ class JWSVerificatorTest < Test::Unit::TestCase
     jws     = %({"protected":"eyJhbGciOiJSUzI1NiJ9","header":{"kid":"powlowski.info"}})
     payload = {}
     e       = assert_raise { example jws, payload, {}, payload.to_json }
-    assert_kind_of JWT::DecodeError, e
+    assert_kind_of KeyError, e
     assert_match(/key not found: "signature"/i, e.message)
   end
 
@@ -44,15 +44,14 @@ class JWSVerificatorTest < Test::Unit::TestCase
     jws     = %({"protected":"qwerty","header":{"kid":"rice.com"},"signature":"yVzIjLYCl5gaLHAhKYQmyEnvlYq8rhohYVcyqI-zvTJ0ccU4MojHw9_5GvAyeECF1_DXDvY7wbiyRu4nCN1rMw"})
     payload = {}
     e       = assert_raise { example jws, payload, {}, payload.to_json }
-    assert_kind_of JWT::DecodeError, e
-    assert_match(/JSON::ParserError/i, e.message.encode("UTF-8", invalid: :replace, undef: :replace))
+    assert_kind_of JSON::ParserError, e
   end
 
   def test_header_is_required
     jws     = %({"protected":"eyJhbGciOiJSUzUxMiJ9","signature":"oRN-lE_OqSRtUeI1ZkyftpV2PmJPArrX68_3Zm6BHTxjKemyLHdR2D3z58Fm8a-9XnbRpqpawKDoHx3AB2EKZayw8WChKTZv0qZeUx0SH2oo27nCC9b--99D3_E7D4eqb6qlmML7gAlJyeFbl3QD8qEuMC-EyjSm-kyXmxZcNW5myHC4XZayE0GBfS1yzKYbpSI16PKZOUHoFHjMAHm79bFg37V6FB4qKszMyjss_pl6dK0VdGSiDpX-LPaTdh67joPQHIcmDprfMF0pn50RNvorS-5qa8Ev79mozcDLMUb4hrLXZ_x8AWen6XHbwo34nSrd_Fn7-GOaDtsGc0XdfQ"})
     payload = {}
     e       = assert_raise { example jws, payload, {}, payload.to_json }
-    assert_kind_of JWT::DecodeError, e
+    assert_kind_of KeyError, e
     assert_match(/key not found: "header"/i, e.message)
   end
 
@@ -60,7 +59,7 @@ class JWSVerificatorTest < Test::Unit::TestCase
     jws     = %({"protected":"e30","header":{"kid":"wisoky.co"},"signature":"eygCpYrkji7pmmA5sRUFUnwsW-ciZFHSwGVmCSya8Kk"})
     payload = {}
     e       = assert_raise { example jws, payload, {}, payload.to_json }
-    assert_kind_of JWT::DecodeError, e
+    assert_kind_of KeyError, e
     assert_match(/key not found: "alg"/i, e.message)
   end
 

data/test/test-jwt-generator.rb

@@ -48,7 +48,7 @@ class JWTGeneratorTest < Test::Unit::TestCase
 
   def test_algorithm_is_required
     signers = %w[olsonjacobi.name ebert.biz]
-    e = assert_raises JWT::EncodeError do
+    e = assert_raises KeyError do
       JWT::Multisignature.generate_jwt({}, private_keychain.slice(*signers), algorithms.slice(signers.sample))
     end
     assert_match(/key not found/i, e.message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jwt-multisignature
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Implements JWT with multiple signatures (RFC 7515).