json-jwt 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 02a8f8276126a037916b981d30fc38e200f9e378
-  data.tar.gz: de0acf0db5b5f400b2c8ba49d0e549d718b74568
+SHA256:
+  metadata.gz: 9d4b2dfb27f37a7525522312228284729a9f940698bfa3d1b7b3562f94cf998b
+  data.tar.gz: 865265a1f3d884476535d0f3c8d3de258db91d9ca4948283b78f4a48cc1023c3
 SHA512:
-  metadata.gz: 18b298765ff484588a80e5fefbe9c349e4df237f5d3548f0359884a2b252a67b60116e476df67427655c74d8c0ae160049007df360b6597337c91995af366b65
-  data.tar.gz: 0e25eebdad2529441d1fb90a93482f354b79533715b191fb812f5d019d6e8d3b41abb59c103c8563df93441d5336f591a0ff724d69fb31a5ed6bfc16aecae5a2
+  metadata.gz: eae66e49d8e101e68575ec4a4bf7ac46cef62d151d3dbae4d1a1c17a7a17235f376991c7346c8e46c9605b8028bca41113da7b84d85a52b58a28050e59c586c1
+  data.tar.gz: '0295d9284c1fb49c1f29881c915ffacac5f5f9c985f19f2a39c2bc27aac5570102f1f2d07032f62254b88eb3e8133236d4e6d4551235c83ec03c64a324e8593e'

data/VERSION

@@ -1 +1 @@
-1.9.2
+1.9.3

data/json-jwt.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
-  gem.add_runtime_dependency 'url_safe_base64'
   gem.add_runtime_dependency 'activesupport'
   gem.add_runtime_dependency 'bindata'
   gem.add_runtime_dependency 'securecompare'

data/lib/json/jose.rb

@@ -51,9 +51,9 @@ module JSON
         else
           decode_compact_serialized input, key_or_secret, algorithms, encryption_methods
         end
-      rescue JSON::ParserError
+      rescue JSON::ParserError, ArgumentError
         raise JWT::InvalidFormat.new("Invalid JSON Format")
       end
     end
   end
-end
+end

data/lib/json/jwe.rb

@@ -32,7 +32,7 @@ module JSON
       self.mac_key, self.encryption_key = derive_encryption_and_mac_keys
       cipher.key = encryption_key
       self.iv = cipher.random_iv # NOTE: 'iv' has to be set after 'key' for GCM
-      self.auth_data = UrlSafeBase64.encode64 header.to_json
+      self.auth_data = Base64.urlsafe_encode64 header.to_json, padding: false
       cipher.auth_data = auth_data if gcm?
       self.cipher_text = cipher.update(plain_text) + cipher.final
       self
@@ -64,7 +64,7 @@ module JSON
         cipher_text,
         authentication_tag
       ].collect do |segment|
-        UrlSafeBase64.encode64 segment.to_s
+        Base64.urlsafe_encode64 segment.to_s, padding: false
       end.join('.')
     end
 
@@ -72,21 +72,21 @@ module JSON
       case options[:syntax]
       when :general
         {
-          protected:  UrlSafeBase64.encode64(header.to_json),
+          protected:  Base64.urlsafe_encode64(header.to_json, padding: false),
           recipients: [{
-            encrypted_key: UrlSafeBase64.encode64(jwe_encrypted_key)
+            encrypted_key: Base64.urlsafe_encode64(jwe_encrypted_key, padding: false)
           }],
-          iv:         UrlSafeBase64.encode64(iv),
-          ciphertext: UrlSafeBase64.encode64(cipher_text),
-          tag:        UrlSafeBase64.encode64(authentication_tag)
+          iv:         Base64.urlsafe_encode64(iv, padding: false),
+          ciphertext: Base64.urlsafe_encode64(cipher_text, padding: false),
+          tag:        Base64.urlsafe_encode64(authentication_tag, padding: false)
         }
       else
         {
-          protected:     UrlSafeBase64.encode64(header.to_json),
-          encrypted_key: UrlSafeBase64.encode64(jwe_encrypted_key),
-          iv:            UrlSafeBase64.encode64(iv),
-          ciphertext:    UrlSafeBase64.encode64(cipher_text),
-          tag:           UrlSafeBase64.encode64(authentication_tag)
+          protected:     Base64.urlsafe_encode64(header.to_json, padding: false),
+          encrypted_key: Base64.urlsafe_encode64(jwe_encrypted_key, padding: false),
+          iv:            Base64.urlsafe_encode64(iv, padding: false),
+          ciphertext:    Base64.urlsafe_encode64(cipher_text, padding: false),
+          tag:           Base64.urlsafe_encode64(authentication_tag, padding: false)
         }
       end
     end
@@ -252,7 +252,11 @@ module JSON
         end
         jwe = new
         _header_json_, jwe.jwe_encrypted_key, jwe.iv, jwe.cipher_text, jwe.authentication_tag = input.split('.').collect do |segment|
-          UrlSafeBase64.decode64 segment
+          begin
+            Base64.urlsafe_decode64 segment
+          rescue ArgumentError
+            raise DecryptionFailed
+          end
         end
         jwe.auth_data = input.split('.').first
         jwe.header = JSON.parse(_header_json_).with_indifferent_access

data/lib/json/jwk.rb

@@ -34,7 +34,7 @@ module JSON
       else
         raise UnknownAlgorithm.new('Unknown Digest Algorithm')
       end
-      UrlSafeBase64.encode64 digest.digest(normalize.to_json)
+      Base64.urlsafe_encode64 digest.digest(normalize.to_json), padding: false
     end
 
     def to_key
@@ -98,7 +98,7 @@ module JSON
     def to_rsa_key
       e, n, d, p, q, dp, dq, qi = [:e, :n, :d, :p, :q, :dp, :dq, :qi].collect do |key|
         if self[key]
-          OpenSSL::BN.new UrlSafeBase64.decode64(self[key]), 2
+          OpenSSL::BN.new Base64.urlsafe_decode64(self[key]), 2
         end
       end
       key = OpenSSL::PKey::RSA.new
@@ -132,7 +132,7 @@ module JSON
       end
       x, y, d = [:x, :y, :d].collect do |key|
         if self[key]
-          UrlSafeBase64.decode64(self[key])
+          Base64.urlsafe_decode64(self[key])
         end
       end
       key = OpenSSL::PKey::EC.new curve_name

data/lib/json/jwk/jwkizable.rb

@@ -5,17 +5,17 @@ module JSON
         def to_jwk(ex_params = {})
           params = {
             kty: :RSA,
-            e: UrlSafeBase64.encode64(e.to_s(2)),
-            n: UrlSafeBase64.encode64(n.to_s(2))
+            e: Base64.urlsafe_encode64(e.to_s(2), padding: false),
+            n: Base64.urlsafe_encode64(n.to_s(2), padding: false)
           }.merge ex_params
           if private?
             params.merge!(
-              d: UrlSafeBase64.encode64(d.to_s(2)),
-              p: UrlSafeBase64.encode64(p.to_s(2)),
-              q: UrlSafeBase64.encode64(q.to_s(2)),
-              dp: UrlSafeBase64.encode64(dmp1.to_s(2)),
-              dq: UrlSafeBase64.encode64(dmq1.to_s(2)),
-              qi: UrlSafeBase64.encode64(iqmp.to_s(2)),
+              d: Base64.urlsafe_encode64(d.to_s(2), padding: false),
+              p: Base64.urlsafe_encode64(p.to_s(2), padding: false),
+              q: Base64.urlsafe_encode64(q.to_s(2), padding: false),
+              dp: Base64.urlsafe_encode64(dmp1.to_s(2), padding: false),
+              dq: Base64.urlsafe_encode64(dmq1.to_s(2), padding: false),
+              qi: Base64.urlsafe_encode64(iqmp.to_s(2), padding: false),
             )
           end
           JWK.new params
@@ -27,10 +27,10 @@ module JSON
           params = {
             kty: :EC,
             crv: curve_name,
-            x: UrlSafeBase64.encode64([coordinates[:x]].pack('H*')),
-            y: UrlSafeBase64.encode64([coordinates[:y]].pack('H*'))
+            x: Base64.urlsafe_encode64([coordinates[:x]].pack('H*'), padding: false),
+            y: Base64.urlsafe_encode64([coordinates[:y]].pack('H*'), padding: false)
           }.merge ex_params
-          params[:d] = UrlSafeBase64.encode64([coordinates[:d]].pack('H*')) if private_key?
+          params[:d] = Base64.urlsafe_encode64([coordinates[:d]].pack('H*'), padding: false) if private_key?
           JWK.new params
         end
 

data/lib/json/jws.rb

@@ -96,7 +96,7 @@ module JSON
         header.to_json,
         self.to_json
       ].collect do |segment|
-        UrlSafeBase64.encode64 segment
+        Base64.urlsafe_encode64 segment, padding: false
       end.join('.')
     end
 
@@ -180,7 +180,7 @@ module JSON
           raise InvalidFormat.new("Invalid JWS Format. JWS should include #{NUM_OF_SEGMENTS} segments.")
         end
         header, claims, signature = input.split('.', JWS::NUM_OF_SEGMENTS).collect do |segment|
-          UrlSafeBase64.decode64 segment.to_s
+          Base64.urlsafe_decode64 segment.to_s
         end
         header, claims = [header, claims].collect do |json|
           JSON.parse(json).with_indifferent_access

data/lib/json/jwt.rb

@@ -1,5 +1,5 @@
 require 'openssl'
-require 'url_safe_base64'
+require 'base64'
 require 'active_support'
 require 'active_support/core_ext'
 require 'json/jose'
@@ -46,7 +46,7 @@ module JSON
         self.to_json,
         signature
       ].collect do |segment|
-        UrlSafeBase64.encode64 segment.to_s
+        Base64.urlsafe_encode64 segment.to_s, padding: false
       end.join('.')
     end
 
@@ -54,17 +54,17 @@ module JSON
       case options[:syntax]
       when :general
         {
-          payload: UrlSafeBase64.encode64(self.to_json),
+          payload: Base64.urlsafe_encode64(self.to_json, padding: false),
           signatures: [{
-            protected: UrlSafeBase64.encode64(header.to_json),
-            signature: UrlSafeBase64.encode64(signature.to_s)
+            protected: Base64.urlsafe_encode64(header.to_json, padding: false),
+            signature: Base64.urlsafe_encode64(signature.to_s, padding: false)
           }]
         }
       when :flattened
         {
-          protected: UrlSafeBase64.encode64(header.to_json),
-          payload:   UrlSafeBase64.encode64(self.to_json),
-          signature: UrlSafeBase64.encode64(signature.to_s)
+          protected: Base64.urlsafe_encode64(header.to_json, padding: false),
+          payload:   Base64.urlsafe_encode64(self.to_json, padding: false),
+          signature: Base64.urlsafe_encode64(signature.to_s, padding: false)
         }
       else
         super

data/spec/json/jwk_spec.rb

@@ -79,8 +79,8 @@ describe JSON::JWK do
     let(:jwk) { JSON::JWK.new public_key }
     it { jwk.keys.collect(&:to_sym).should include :kty, :e, :n }
     its(:kty) { jwk[:kty].should == :RSA }
-    its(:e) { jwk[:e].should == UrlSafeBase64.encode64(public_key.e.to_s(2)) }
-    its(:n) { jwk[:n].should == UrlSafeBase64.encode64(public_key.n.to_s(2)) }
+    its(:e) { jwk[:e].should == Base64.urlsafe_encode64(public_key.e.to_s(2), padding: false) }
+    its(:n) { jwk[:n].should == Base64.urlsafe_encode64(public_key.n.to_s(2), padding: false) }
 
     context 'when kid/use options given' do
       let(:jwk) { JSON::JWK.new public_key, kid: '12345', use: :sig }

data/spec/json/jws_spec.rb

@@ -48,7 +48,7 @@ describe JSON::JWS do
   describe '#sign!' do
     shared_examples_for :generate_expected_signature do
       it do
-        UrlSafeBase64.encode64(signed.signature).should == expected_signature[alg]
+        Base64.urlsafe_encode64(signed.signature, padding: false).should == expected_signature[alg]
       end
     end
     subject { signed }
@@ -279,10 +279,10 @@ describe JSON::JWS do
       context 'when general' do
         it 'should return General JWS JSON Serialization' do
           signed.to_json(syntax: :general).should == {
-            payload: UrlSafeBase64.encode64(claims.to_json),
+            payload: Base64.urlsafe_encode64(claims.to_json, padding: false),
             signatures: [{
-              protected: UrlSafeBase64.encode64(signed.header.to_json),
-              signature: UrlSafeBase64.encode64(signed.signature)
+              protected: Base64.urlsafe_encode64(signed.header.to_json, padding: false),
+              signature: Base64.urlsafe_encode64(signed.signature, padding: false)
             }]
           }.to_json
         end
@@ -290,10 +290,10 @@ describe JSON::JWS do
         context 'when not signed yet' do
           it 'should not fail' do
             jws.to_json(syntax: :general).should == {
-              payload: UrlSafeBase64.encode64(claims.to_json),
+              payload: Base64.urlsafe_encode64(claims.to_json, padding: false),
               signatures: [{
-                protected: UrlSafeBase64.encode64(jws.header.to_json),
-                signature: UrlSafeBase64.encode64('')
+                protected: Base64.urlsafe_encode64(jws.header.to_json, padding: false),
+                signature: Base64.urlsafe_encode64('', padding: false)
               }]
             }.to_json
           end
@@ -303,18 +303,18 @@ describe JSON::JWS do
       context 'when flattened' do
         it 'should return Flattened JWS JSON Serialization' do
           signed.to_json(syntax: :flattened).should == {
-            protected: UrlSafeBase64.encode64(signed.header.to_json),
-            payload: UrlSafeBase64.encode64(claims.to_json),
-            signature: UrlSafeBase64.encode64(signed.signature)
+            protected: Base64.urlsafe_encode64(signed.header.to_json, padding: false),
+            payload: Base64.urlsafe_encode64(claims.to_json, padding: false),
+            signature: Base64.urlsafe_encode64(signed.signature, padding: false)
           }.to_json
         end
 
         context 'when not signed yet' do
           it 'should not fail' do
             jws.to_json(syntax: :flattened).should == {
-              protected: UrlSafeBase64.encode64(jws.header.to_json),
-              payload: UrlSafeBase64.encode64(claims.to_json),
-              signature: UrlSafeBase64.encode64('')
+              protected: Base64.urlsafe_encode64(jws.header.to_json, padding: false),
+              payload: Base64.urlsafe_encode64(claims.to_json, padding: false),
+              signature: Base64.urlsafe_encode64('', padding: false)
             }.to_json
           end
         end

data/spec/json/jwt_spec.rb

@@ -202,7 +202,7 @@ describe JSON::JWT do
               header, payload, signature = jws.to_s.split('.')
               malformed_header = {alg: :none}.to_json
               [
-                UrlSafeBase64.encode64(malformed_header),
+                Base64.urlsafe_encode64(malformed_header, padding: false),
                 payload,
                 ''
               ].join('.')
@@ -226,7 +226,7 @@ describe JSON::JWT do
               header, payload, signature = jws.to_s.split('.')
               malformed_header = {alg: :none}.to_json
               [
-                UrlSafeBase64.encode64(malformed_header),
+                Base64.urlsafe_encode64(malformed_header, padding: false),
                 payload,
                 ''
               ].join('.')
@@ -246,12 +246,12 @@ describe JSON::JWT do
               malformed_signature = OpenSSL::HMAC.digest(
                 OpenSSL::Digest.new('SHA256'),
                 public_key.to_s,
-                [UrlSafeBase64.encode64(malformed_header), payload].join('.')
+                [Base64.urlsafe_encode64(malformed_header, padding: false), payload].join('.')
               )
               [
-                UrlSafeBase64.encode64(malformed_header),
+                Base64.urlsafe_encode64(malformed_header, padding: false),
                 payload,
-                UrlSafeBase64.encode64(malformed_signature)
+                Base64.urlsafe_encode64(malformed_signature, padding: false)
               ].join('.')
             end
 
@@ -276,14 +276,14 @@ describe JSON::JWT do
                 digest = OpenSSL::Digest.new('SHA256')
                 malformed_signature = private_key.sign_pss(
                   digest,
-                  [UrlSafeBase64.encode64(malformed_header), payload].join('.'),
+                  [Base64.urlsafe_encode64(malformed_header, padding: false), payload].join('.'),
                   salt_length: :digest,
                   mgf1_hash: digest
                 )
                 [
-                  UrlSafeBase64.encode64(malformed_header),
+                  Base64.urlsafe_encode64(malformed_header, padding: false),
                   payload,
-                  UrlSafeBase64.encode64(malformed_signature)
+                  Base64.urlsafe_encode64(malformed_signature, padding: false)
                 ].join('.')
               end
 
@@ -310,12 +310,12 @@ describe JSON::JWT do
                 malformed_header = {alg: :RS512}.to_json
                 malformed_signature = private_key.sign(
                   OpenSSL::Digest.new('SHA512'),
-                  [UrlSafeBase64.encode64(malformed_header), payload].join('.')
+                  [Base64.urlsafe_encode64(malformed_header, padding: false), payload].join('.')
                 )
                 [
-                  UrlSafeBase64.encode64(malformed_header),
+                  Base64.urlsafe_encode64(malformed_header, padding: false),
                   payload,
-                  UrlSafeBase64.encode64(malformed_signature)
+                  Base64.urlsafe_encode64(malformed_signature, padding: false)
                 ].join('.')
               end
 
@@ -377,10 +377,10 @@ describe JSON::JWT do
         context 'when general' do
           let(:serialized) do
             {
-              payload: UrlSafeBase64.encode64(claims.to_json),
+              payload: Base64.urlsafe_encode64(claims.to_json, padding: false),
               signatures: [{
-                protected: UrlSafeBase64.encode64(signed.header.to_json),
-                signature: UrlSafeBase64.encode64(signed.signature)
+                protected: Base64.urlsafe_encode64(signed.header.to_json, padding: false),
+                signature: Base64.urlsafe_encode64(signed.signature, padding: false)
               }]
             }
           end
@@ -390,9 +390,9 @@ describe JSON::JWT do
         context 'when flattened' do
           let(:serialized) do
             {
-              protected: UrlSafeBase64.encode64(signed.header.to_json),
-              payload: UrlSafeBase64.encode64(claims.to_json),
-              signature: UrlSafeBase64.encode64(signed.signature)
+              protected: Base64.urlsafe_encode64(signed.header.to_json, padding: false),
+              payload: Base64.urlsafe_encode64(claims.to_json, padding: false),
+              signature: Base64.urlsafe_encode64(signed.signature, padding: false)
             }
           end
           it_behaves_like :json_serialization_parser
@@ -465,7 +465,7 @@ describe JSON::JWT do
       context 'when too many dots' do
         it do
           expect do
-            JSON::JWT.decode 'header.payload.signature.something.wrong'
+            JSON::JWT.decode 'header.payload.signature.too.many.dots'
           end.to raise_error JSON::JWT::InvalidFormat
         end
       end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: url_safe_base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and