jwt-multisig 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 196758ff74f27b332271c1265497dd698b50d78316fa4b12d85d091c9867876f
-  data.tar.gz: df16be95f6fcb777019ac810b851ccd4a2e904478e5a5e6a83f9a2bfd857c5e1
+  metadata.gz: b2d5cb56b491d2821e088bf0a109ff503f5eb348048ebb377ee265750f2970eb
+  data.tar.gz: 024a5788c0596c3076ccf4cb8e5d26299a73a9936d91ca0bc3d7ad6fed361c12
 SHA512:
-  metadata.gz: 9e2d773f5b81e57fd3ea73b1f76654ff6ccbbb1c3bda2e09562e43d235567af3d257f1e75dbf6d21388064bf06cca68bc5473c3e75b19294e61cb5e77196a9ff
-  data.tar.gz: c265d82ff2dc690a3f9652364af564fd5184d898a483c1e02a55c29d72e3c344d954d515b0f3aaa0c6462e40a06b0a08047785774edc734f10d4629f5e3847ed
+  metadata.gz: 6c3aae71b52284732567c5874afe816c7a329ccd194e1aff5ce6ea731778837402cd8f9c708eb928c3806a0097b650b604467395c5552cfb7c5f94f7e9d8bf99
+  data.tar.gz: 5b92d0fc646e416f951833d243d4f0c211d9de6422c2cb9680e8adaeed70247ecd669b0332ede5af23bb3a11508717d28b54864cc683760ca0f9c7c582eda17a

data/.drone.yml

@@ -0,0 +1,29 @@
+---
+kind: pipeline
+name: default
+
+steps:
+  - name: Run tests
+    image: ruby:2.6
+    commands:
+      - bundle install
+      - bundle exec rake test
+
+  - name: Release gems
+    image: ruby:2.6
+    environment:
+      GEM_CREDENTIALS:
+        from_secret: gem_credentials
+    commands:
+      - mkdir -p ~/.gem
+      - echo $GEM_CREDENTIALS | base64 -d > ~/.gem/credentials
+      - chmod 0600 ~/.gem/credentials
+      - gem build jwt-multisig.gemspec
+      - gem push jwt-multisig-*.gem
+    when:
+      branch:
+        - master
+
+trigger:
+  event:
+    - push

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.6.3

data/.travis.yml

@@ -3,16 +3,14 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4
   - 2.5
+  - 2.6
 
 env:
   - RAKE_ENV=test BUNDLE_PATH=vendor/bundle
 
 before_install:
-  - gem install bundler
+  - gem install bundler -v 1.17.3
 
 install:
   - bundle install

data/Gemfile.lock

@@ -1,41 +1,42 @@
 PATH
   remote: .
   specs:
-    jwt-multisig (1.0.0)
-      activesupport (>= 4.0, < 6.0)
-      jwt (~> 2.1)
+    jwt-multisig (1.0.5)
+      activesupport (>= 4.0)
+      jwt (~> 2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.6)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.0.5)
-    i18n (1.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jwt (2.1.0)
-    memoist (0.16.0)
-    minitest (5.11.3)
-    power_assert (1.1.1)
-    rake (12.3.1)
-    test-unit (3.2.7)
+    jwt (2.2.2)
+    memoist (0.16.2)
+    minitest (5.14.2)
+    power_assert (1.2.0)
+    rake (12.3.3)
+    test-unit (3.3.6)
       power_assert
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.3)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 1.17)
   jwt-multisig!
   memoist (~> 0.16)
   rake (~> 12.3)
   test-unit (~> 3.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/jwt-multisig.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files      = `git ls-files -z -- {test,spec,features}/*`.split("\x0")
   s.require_paths   = ["lib"]
 
-  s.add_dependency             "jwt",           "~> 2.1"
-  s.add_dependency             "activesupport", ">= 4.0", "< 6.0"
-  s.add_development_dependency "bundler",       "~> 1.16"
+  s.add_dependency             "jwt",           "~> 2.2"
+  s.add_dependency             "activesupport", ">= 4.0"
+  s.add_development_dependency "bundler",       "~> 1.17"
 end

data/lib/jwt-multisig.rb

@@ -41,7 +41,7 @@ module JWT
       def generate_jwt(payload, private_keychain, algorithms)
         proxy_exception JWT::EncodeError do
           algorithms_mapping = algorithms.with_indifferent_access
-          { payload:    base64_encode(payload.to_json),
+          { payload:    base64_encode(::JSON.dump(payload)),
             signatures: private_keychain.map do |id, value|
               generate_jws(payload, id, value, algorithms_mapping.fetch(id))
             end }
@@ -123,6 +123,7 @@ module JWT
       def verify_jwt(jwt, public_keychain, options = {})
         proxy_exception JWT::DecodeError do
           keychain           = public_keychain.with_indifferent_access
+          encoded_payload    = jwt.fetch("payload")
           serialized_payload = base64_decode(jwt.fetch("payload"))
           payload            = JSON.parse(serialized_payload)
           verified           = []
@@ -131,7 +132,7 @@ module JWT
           jwt.fetch("signatures").each do |jws|
             key_id = jws.fetch("header").fetch("kid")
             if keychain.key?(key_id)
-              verify_jws(jws, payload, public_keychain, options)
+              verify_jws(jws, encoded_payload, public_keychain, options)
               verified << key_id
             else
               unverified << key_id
@@ -193,12 +194,10 @@ module JWT
       # @return [Hash]
       #   Returns payload if signature is valid.
       # @raise [JWT::DecodeError]
-      def verify_jws(jws, payload, public_keychain, options = {})
+      def verify_jws(jws, encoded_payload, public_keychain, options = {})
         proxy_exception JWT::DecodeError do
           encoded_header     = jws.fetch("protected")
           serialized_header  = base64_decode(encoded_header)
-          serialized_payload = payload.to_json
-          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(".")
@@ -240,7 +239,7 @@ module JWT
       # @param string [String]
       # @return [String]
       def base64_encode(string)
-        JWT::Encode.base64url_encode(string)
+        JWT::Base64.url_encode(string)
       end
 
       #
@@ -249,7 +248,7 @@ module JWT
       # @param string [String]
       # @return [String]
       def base64_decode(string)
-        JWT::Decode.base64url_decode(string)
+        JWT::Base64.url_decode(string)
       end
     end
   end

data/lib/jwt-multisig/version.rb

@@ -3,6 +3,6 @@
 
 module JWT
   module Multisig
-    VERSION = "1.0.0"
+    VERSION = "1.0.5"
   end
 end

data/test/test-jws-verificator.rb

@@ -74,12 +74,13 @@ class JWSVerificatorTest < Test::Unit::TestCase
 private
 
   def example(jws, payload, options, expected)
+    encoded_payload = JWT::Base64.url_encode(JSON.dump(payload))
     # Pass instance of OpenSSL::PKey::PKey.
-    returned = JWT::Multisig.verify_jws(JSON.parse(jws), payload, public_keychain, options)
+    returned = JWT::Multisig.verify_jws(JSON.parse(jws), encoded_payload, public_keychain, options)
     assert_equal expected, JSON.dump(returned)
 
     # Pass key in PEM format.
-    returned = JWT::Multisig.verify_jws(JSON.parse(jws), payload, public_keychain, options)
+    returned = JWT::Multisig.verify_jws(JSON.parse(jws), encoded_payload, public_keychain, options)
     assert_equal expected, JSON.dump(returned)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jwt-multisig
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - RubyKube
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2020-12-16 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
@@ -31,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,23 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 description: The tool for working with JWT signed by multiple verificators as per
   RFC 7515. Based on the RubyGem «jwt» under the hood.
 email: support@rubykube.io
@@ -65,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".drone.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -102,15 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The tool for working with multi-signature JWT.
-test_files:
-- test/test-helper.rb
-- test/test-jws-generator.rb
-- test/test-jws-verificator.rb
-- test/test-jwt-editor.rb
-- test/test-jwt-generator.rb
-- test/test-jwt-verificator.rb
+test_files: []