json-jwt 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b4b282f2a259c3a3dcf3fcc9f371adde084cf9
-  data.tar.gz: 4517f92ccc885139f9f99f18c6a6adeef3fa1e0a
+  metadata.gz: 01c56798357f94430201cb6c932e657a9230032b
+  data.tar.gz: d84243b770cbc03b79d3b8aab2e87f5ef2adc4ff
 SHA512:
-  metadata.gz: a44298a97fc02194b067f54b221f9955290de4dcad2e61b5a8d563c5988cf271c58b4a24089ea81e374063eddd0ff03898f1b2d7f96cec057061a525abe3b42e
-  data.tar.gz: 6b82141707ff644ed163b0de42d2efc784a5dddba3f789077e184b1a840d3f22a26d6d9b3cd33b75b2d600887471842f92cbadc3c2933927b78f617ee3b7539b
+  metadata.gz: e57c4b81ca483188c56d890bc6c1fba3270736fe57b9352d93cb567977c9373df27780803ea858c6f0d0f08da3d29d6cbb9ebb879a344db0511b696746beafb7
+  data.tar.gz: a183cbc111108d74563d8b3efef7640d47b3910b19008811d43189447f80314e33b383f91450d792071f50323f0a99649a83702df54e40f7516ea81a51ebf85e

data/.travis.yml

@@ -4,8 +4,9 @@ before_install:
 
 rvm:
   - 2.2.2 # NOTE: 2.2.1 or lower aren't supported by activesupport 5.0, CI isn't needed for such legacy versions.
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 
 jdk:
-  - oraclejdk8
+  - oraclejdk8

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/lib/json/jwk.rb

@@ -18,7 +18,7 @@ module JSON
         super params
         merge! ex_params
       end
-      self[:kid] ||= thumbprint rescue nil #ignore
+      calculate_default_kid if self[:kid].blank?
     end
 
     def content_type
@@ -64,6 +64,12 @@ module JSON
       self[:kty].try(:to_sym) == :oct
     end
 
+    def calculate_default_kid
+      self[:kid] = thumbprint
+    rescue
+      # ignore
+    end
+
     def normalize
       case
       when rsa?

data/spec/json/jwe_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe JSON::JWE do
-  let(:shared_key) { SecureRandom.hex 32 } # default shared key is too short
   let(:private_key_path) { der_file_path 'rsa/private_key' }
 
   describe '#content_type' do
@@ -248,10 +247,11 @@ describe JSON::JWE do
 
     context 'when alg=dir' do
       let(:alg) { :dir }
-      let(:key) { shared_key }
+      let(:key) { SecureRandom.random_bytes key_size }
 
       context 'when enc=A128GCM' do
         let(:enc) { :A128GCM }
+        let(:key_size) { 16 }
         if gcm_supported?
           it_behaves_like :decryptable
         else
@@ -261,6 +261,7 @@ describe JSON::JWE do
 
       context 'when enc=A256GCM' do
         let(:enc) { :A256GCM }
+        let(:key_size) { 32 }
         if gcm_supported?
           it_behaves_like :decryptable
         else
@@ -270,12 +271,14 @@ describe JSON::JWE do
 
       context 'when enc=A128CBC-HS256' do
         let(:enc) { :'A128CBC-HS256' }
+        let(:key_size) { 32 }
         it_behaves_like :decryptable
         it_behaves_like :verify_cbc_authentication_tag
       end
 
       context 'when enc=A256CBC-HS512' do
         let(:enc) { :'A256CBC-HS512' }
+        let(:key_size) { 64 }
         it_behaves_like :decryptable
         it_behaves_like :verify_cbc_authentication_tag
       end

data/spec/json/jwk_spec.rb

@@ -21,6 +21,12 @@ describe JSON::JWK do
       end
     end
 
+    context 'when no imput' do
+      it do
+        JSON::JWK.new.should be_blank
+      end
+    end
+
     context 'with OpenSSL::PKey::RSA' do
       let(:key) { public_key }
       it_behaves_like :jwk_with_kid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and