json-jwt 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f805fa120c4c633a6be48aab961f504aa3e7d5f68aee05f13585e3751201c67
-  data.tar.gz: bb26869e462704b7ca5ae9109cd07749b76fc6ee53fc99a6db70238dbfa51c77
+  metadata.gz: 51a327761ea931101039a020adc776471ea89e73d4abe27267c0433916f6e327
+  data.tar.gz: 717bab99944dce15400c188ccd63e3556d60f2c498234884994966070c7b3068
 SHA512:
-  metadata.gz: f2673b42a974d7b9d003f48cf17ef15580d948ef5f06ea8d4c7f46e56249d3849e342720974fcca3a979014cfc898753a541ce851099459f559568f3523f5100
-  data.tar.gz: 749aa5e6eadb127674086f77e05e691a162dddfa4cb2d3b4132a1c96649f7a8001b506169dc45112fca117afa67ca16549b090b2ad70fd7275cae2583db735ee
+  metadata.gz: fbcd1b698ce7c0f488bc7d6f873ec5c5bf8c5099f501b140bdc371e0a00f45ada1323df227a29d2ad16e4a971bd714904138b95d221bf76c4cf2b2fd2f444b2f
+  data.tar.gz: e53705c42a6f37833a1727bf14b86733502c06312bfab503217c2985de427aa4b0d68698e449f0d42a4e62415793e710f5d5ca412d7cade734bfb7b20455834a

data/VERSION

@@ -1 +1 @@
-1.10.0
+1.10.1

data/json-jwt.gemspec

@@ -7,8 +7,9 @@ Gem::Specification.new do |gem|
   gem.summary     = %q{JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON Web Key) in Ruby}
   gem.description = %q{JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON Web Key) in Ruby}
   gem.license     = 'MIT'
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.files         = `git ls-files`.split("\n").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
   gem.required_ruby_version = '>= 2.3'

data/lib/json/jose.rb

@@ -26,7 +26,7 @@ module JSON
       when JSON::JWK::Set
         key.detect do |jwk|
           jwk[:kid] && jwk[:kid] == kid
-        end.try(:to_key) or raise JWK::Set::KidNotFound
+        end&.to_key or raise JWK::Set::KidNotFound
       else
         key
       end

data/lib/json/jwe.rb

@@ -98,15 +98,15 @@ module JSON
     # common
 
     def gcm?
-      [:A128GCM, :A256GCM].include? encryption_method.try(:to_sym)
+      [:A128GCM, :A256GCM].include? encryption_method&.to_sym
     end
 
     def cbc?
-      [:'A128CBC-HS256', :'A256CBC-HS512'].include? encryption_method.try(:to_sym)
+      [:'A128CBC-HS256', :'A256CBC-HS512'].include? encryption_method&.to_sym
     end
 
     def dir?
-      :dir == algorithm.try(:to_sym)
+      :dir == algorithm&.to_sym
     end
 
     def cipher
@@ -115,7 +115,7 @@ module JSON
     end
 
     def cipher_name
-      case encryption_method.try(:to_sym)
+      case encryption_method&.to_sym
       when :A128GCM
         'aes-128-gcm'
       when :A256GCM
@@ -130,7 +130,7 @@ module JSON
     end
 
     def sha_size
-      case encryption_method.try(:to_sym)
+      case encryption_method&.to_sym
       when :'A128CBC-HS256'
         256
       when :'A256CBC-HS512'
@@ -158,7 +158,7 @@ module JSON
     # encryption
 
     def jwe_encrypted_key
-      @jwe_encrypted_key ||= case algorithm.try(:to_sym)
+      @jwe_encrypted_key ||= case algorithm&.to_sym
       when :RSA1_5
         public_key_or_secret.public_encrypt content_encryption_key
       when :'RSA-OAEP'
@@ -210,7 +210,7 @@ module JSON
 
     def decrypt_content_encryption_key
       fake_content_encryption_key = generate_content_encryption_key # NOTE: do this always not to make timing difference
-      case algorithm.try(:to_sym)
+      case algorithm&.to_sym
       when :RSA1_5
         private_key_or_secret.private_decrypt jwe_encrypted_key
       when :'RSA-OAEP'

data/lib/json/jwk.rb

@@ -53,15 +53,15 @@ module JSON
     private
 
     def rsa?
-      self[:kty].try(:to_sym) == :RSA
+      self[:kty]&.to_sym == :RSA
     end
 
     def ec?
-      self[:kty].try(:to_sym) == :EC
+      self[:kty]&.to_sym == :EC
     end
 
     def oct?
-      self[:kty].try(:to_sym) == :oct
+      self[:kty]&.to_sym == :oct
     end
 
     def calculate_default_kid
@@ -120,7 +120,7 @@ module JSON
     end
 
     def to_ec_key
-      curve_name = case self[:crv].try(:to_sym)
+      curve_name = case self[:crv]&.to_sym
       when :'P-256'
         'prime256v1'
       when :'P-384'

data/lib/json/jws.rb

@@ -19,10 +19,10 @@ module JSON
     end
 
     def verify!(public_key_or_secret, algorithms = nil)
-      if alg.try(:to_sym) == :none
+      if alg&.to_sym == :none
         raise UnexpectedAlgorithm if public_key_or_secret
         signature == '' or raise VerificationFailed
-      elsif algorithms.blank? || Array(algorithms).include?(alg.try(:to_sym))
+      elsif algorithms.blank? || Array(algorithms).include?(alg&.to_sym)
         public_key_or_secret && valid?(public_key_or_secret) or
         raise VerificationFailed
       else
@@ -47,15 +47,15 @@ module JSON
     end
 
     def hmac?
-      [:HS256, :HS384, :HS512].include? algorithm.try(:to_sym)
+      [:HS256, :HS384, :HS512].include? algorithm&.to_sym
     end
 
     def rsa?
-      [:RS256, :RS384, :RS512].include? algorithm.try(:to_sym)
+      [:RS256, :RS384, :RS512].include? algorithm&.to_sym
     end
 
     def rsa_pss?
-      if [:PS256, :PS384, :PS512].include? algorithm.try(:to_sym)
+      if [:PS256, :PS384, :PS512].include? algorithm&.to_sym
         if OpenSSL::VERSION < '2.1.0'
           raise "#{alg} isn't supported. OpenSSL gem v2.1.0+ is required to use #{alg}."
         else
@@ -67,7 +67,7 @@ module JSON
     end
 
     def ecdsa?
-      [:ES256, :ES384, :ES512].include? algorithm.try(:to_sym)
+      [:ES256, :ES384, :ES512].include? algorithm&.to_sym
     end
 
     def autodetected_algorithm_from(private_key_or_secret)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -133,27 +133,6 @@ files:
 - lib/json/jwk/set.rb
 - lib/json/jws.rb
 - lib/json/jwt.rb
-- spec/fixtures/ecdsa/256/private_key.pem
-- spec/fixtures/ecdsa/256/public_key.pem
-- spec/fixtures/ecdsa/384/private_key.pem
-- spec/fixtures/ecdsa/384/public_key.pem
-- spec/fixtures/ecdsa/512/private_key.pem
-- spec/fixtures/ecdsa/512/public_key.pem
-- spec/fixtures/rsa/private_key.der
-- spec/fixtures/rsa/private_key.pem
-- spec/fixtures/rsa/public_key.pem
-- spec/helpers/nimbus_spec_helper.rb
-- spec/helpers/sign_key_fixture_helper.rb
-- spec/interop/with_jsrsasign_spec.rb
-- spec/interop/with_nimbus_jose_spec.rb
-- spec/interop/with_rfc_example_spec.rb
-- spec/json/jwe_spec.rb
-- spec/json/jwk/jwkizable_spec.rb
-- spec/json/jwk/set_spec.rb
-- spec/json/jwk_spec.rb
-- spec/json/jws_spec.rb
-- spec/json/jwt_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/nov/json-jwt
 licenses:
 - MIT
@@ -179,25 +158,4 @@ signing_key:
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and
   JSON Web Key) in Ruby
-test_files:
-- spec/fixtures/ecdsa/256/private_key.pem
-- spec/fixtures/ecdsa/256/public_key.pem
-- spec/fixtures/ecdsa/384/private_key.pem
-- spec/fixtures/ecdsa/384/public_key.pem
-- spec/fixtures/ecdsa/512/private_key.pem
-- spec/fixtures/ecdsa/512/public_key.pem
-- spec/fixtures/rsa/private_key.der
-- spec/fixtures/rsa/private_key.pem
-- spec/fixtures/rsa/public_key.pem
-- spec/helpers/nimbus_spec_helper.rb
-- spec/helpers/sign_key_fixture_helper.rb
-- spec/interop/with_jsrsasign_spec.rb
-- spec/interop/with_nimbus_jose_spec.rb
-- spec/interop/with_rfc_example_spec.rb
-- spec/json/jwe_spec.rb
-- spec/json/jwk/jwkizable_spec.rb
-- spec/json/jwk/set_spec.rb
-- spec/json/jwk_spec.rb
-- spec/json/jws_spec.rb
-- spec/json/jwt_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/fixtures/ecdsa/256/private_key.pem

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHo5LvIgMVpOlEKjjZiE5n+xYtTxLm4Eumx7FRMgICyDoAoGCCqGSM49
-AwEHoUQDQgAEsaPyrO4Lh9kh2FxrF9y1QVmZznWnRRJwpr12UHqzrVYwzPhb3POq
-WsmGqv4nKum+WdogjJlAToN+uA+TEwDDUw==
------END EC PRIVATE KEY-----

data/spec/fixtures/ecdsa/256/public_key.pem

@@ -1,4 +0,0 @@
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEsaPyrO4Lh9kh2FxrF9y1QVmZznWn
-RRJwpr12UHqzrVYwzPhb3POqWsmGqv4nKum+WdogjJlAToN+uA+TEwDDUw==
------END PUBLIC KEY-----

data/spec/fixtures/ecdsa/384/private_key.pem

@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB1NRLzYeQa7oRUwWrnQFZOBVqzlyJ9n654/PFjCLJh/A/uGWeECoM2
-1hXEvp80pqGgBwYFK4EEACKhZANiAASmXMCnIWcrurOGDlechlsWPaFmgfZV2Xj5
-EWbsOew0wb23Kqul+rZHKN8oAFtwVG2LEHN9+GTd9xuZ6KkYuS9AE0LN42bpAveE
-5RMfogUHM4vRjsewZOik1NOykuOWK9s=
------END EC PRIVATE KEY-----

data/spec/fixtures/ecdsa/384/public_key.pem

@@ -1,5 +0,0 @@
------BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEplzApyFnK7qzhg5XnIZbFj2hZoH2Vdl4
-+RFm7DnsNMG9tyqrpfq2RyjfKABbcFRtixBzffhk3fcbmeipGLkvQBNCzeNm6QL3
-hOUTH6IFBzOL0Y7HsGTopNTTspLjlivb
------END PUBLIC KEY-----

data/spec/fixtures/ecdsa/512/private_key.pem

@@ -1,7 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIBBpwKqvGEZGpE3wX1fDzJjrrM4uXr16WKsijjqjRP8tHdnvr5p2fO
-zrPVyDVbiQDulOhSh9aouunuwmbudKjWvZagBwYFK4EEACOhgYkDgYYABAHDAg/m
-tGuq5xPU7wtJjqhfwxl0YOWN4k2+HhzcE5tpA+oro8fTP3/HfxRh69DoaasxJ+K2
-D2GaLhrGyDxIC9Kv/wFC2BHfJfm1fwSNvPWns4Ui2dUQxdpbYAzxMvWO2LamGuHC
-XKYss1QzKV1sAaenI4Ok1yDZKFa1V2YTeNOIobuCNg==
------END EC PRIVATE KEY-----

data/spec/fixtures/ecdsa/512/public_key.pem

@@ -1,6 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBwwIP5rRrqucT1O8LSY6oX8MZdGDl
-jeJNvh4c3BObaQPqK6PH0z9/x38UYevQ6GmrMSfitg9hmi4axsg8SAvSr/8BQtgR
-3yX5tX8Ejbz1p7OFItnVEMXaW2AM8TL1jti2phrhwlymLLNUMyldbAGnpyODpNcg
-2ShWtVdmE3jTiKG7gjY=
------END PUBLIC KEY-----

data/spec/fixtures/rsa/private_key.pem

@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,A6B5D10FFA23D7BC66CE4FB46B754E8C
-
-gvYFJmzetWSwpf1Ut6USm4IReFLA6bpp5nVUfU2Xa9dJmrCu0cTupTkdzNmGp14/
-mzeT/a5WplK1hWV41Y7bLm57hOpaoxbEx2h3IW9cxuqgAp422AbafRu6hEvjUONO
-qUEm63I4d7/FKo0he4IVVx0UHaX5eEq8pdY1AZR9+fqlxWvjpgZlB0anT3AMpfVL
-CY4sGc/Es14M9A4zUpOkp+09PbV3WNG8A4G4IJA3wx6tYBxrd2866Te2ccP6/BL8
-HA2uoqeD+70ziybvd//CtGAD1xoTDvOCwzXXT5A4fCuec3apFp8O6WyJ63ao99R4
-E0r6AvD4iOkLMC8K2YUSc1zFLJAkhlfhBb8qFbXOwOomazWf2Z8rDtkP1VCfB9gC
-W6oYRBOyVUkbaBSBOOPBJtxjuTL/cJBvFhn6r0zdC67g0CD4cabMPd1VY92lUVbl
-JvE9CouDB5O39jwfpgfxo3kGev2UzwRze9U2uw6EdYIUB/ixyC8/5BoN8lKZXdTn
-7vQBmcBsC3boMqQiq2c/dVGW7yrt/Y4q8wq9aGFwdBAY1pYhRlOZ0MwFmlAJKOzo
-Y3i2OILtPM0sdfqIeAvrwicQULGAzLGEhecDOQ1r0GwZRy5/Sl3ILxKMW8ngdaK4
-iNDM56u6F9dwqqArrZDZgkfwnKakXU2ZbltSOWTCleCfYrc1D75Yw3FHKcWozB/l
-uyMTIqzBXzO6OiNDUv7zAE1xzVaV+VeBH/5KGx18dAuRP3TnpYltGSUVDyGk9FX7
-m7nhvkqOcFJMHOGdTjt2Ff9Ibn3rgCEFI0CjCwcJPo2ym1Zox8GfP0/nXk3p/oWV
-ebBTvS+yc9HaSm2Al77GDXEwY7NDcTef+3kEtQHpesS+xmC8mFtMEKV8vifXEhpt
-iNp6gtsfDMtFmrFXCADTaUD1WBmhJQtYUsGsoQ75c5zzUHU93BOswBe2KODCA3Ie
-X3XKvHTjGw3wjWJvLcnL3EgcHDL1x7ehIA5UgvHFixmkx5D91uIdq4YDMt6xERle
-JgeLKF9g1qCl9wmxqT4T1J9h9LGMQQEUhth0uTFr6bEpzgg6hFTrPDaI8dOMlcgu
-ctOH2wFZgRMfrykGIs53rwF4pL+8iy+pakaRRAVTaZIX2CL2dThy0283jTVu9dNn
-f/Zfu5mNlvsRcXlZMgTy0UMBpXeLMjaWyd+JeAnAeZxO3/ID/Ppg6vcc0Wn8XyB5
-YUOIQe+Rc0jJnB1zqjww2cB6H5Ke3GjktQqrulHFfEYbn7lj8WLVgDLmellFNOxX
-k9H2sta5SN/t3fN3oBO0A6JyotQOiBE54yHVpgoc+PBlcrpoOxSZx67lprD+WnlV
-Ynnf6qIrR9NxgYN00Elzj9KP9OT1ufFrMQ0BnW4EWdFLCScGLsZVlmBKPrtHwK3N
-FSy3JFMJcpymgNas5+bqIyZGqAZREHH3AWhc2TVl1Kt11g6PZWm3dSafT6SlqgyP
-Z7OcBEnWr+ZhDeJfnAXrn5siah9eXuT0KtQWlqpSn76dExlfz16Da/3xBtO4ceyz
-Lk4gzZ1QjP1ZvjarWOIEtkT7eiWaCQHYNVbvFRu5wo98o/KwO3xaPTDN9LCZKGhR
------END RSA PRIVATE KEY-----

data/spec/fixtures/rsa/public_key.pem

@@ -1,8 +0,0 @@
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAx9vNhcvSrxjsegZAAo4OEuoZOV/oxINEeWneJYczS80/bQ1J6lSS
-J81qecxXAzCLPlvsFoP4eeUNXSt/G7hP7SAM479N+kY/MzbihJ5LRY9sRzLbQTMe
-qsmDAmmQe4y3Ke3bvd70r8VOmo5pqM3IPLGwBkTRTQmyRsDQArilg6WtxDUgy5ol
-2STHFA8E1iCReh9bck8ZaLxzVhYRXZ0nuOKWGRMppocPlp55HVohOItUZh7uSCch
-LcVAZuhTTNaDLtLIJ6G0yNJvfEieJUhA8wGBoPhD3LMQwQMxTMerpjZhP/qjm6Gg
-eWpKf+iVil86/PSy/z0Vw06/rD0sfXPtlQIDAQAB
------END RSA PUBLIC KEY-----

data/spec/helpers/nimbus_spec_helper.rb

@@ -1,22 +0,0 @@
-module NimbusSpecHelper
-  module_function
-
-  def setup
-    nimbus_path = File.expand_path(
-      File.join(
-        File.dirname(__FILE__),
-        'json-jwt-nimbus',
-        'nimbus_jwe.rb'
-      )
-    )
-    if File.exist? nimbus_path
-      require nimbus_path
-    end
-  end
-
-  def nimbus_available?
-    defined? NimbusJWE
-  end
-end
-
-NimbusSpecHelper.setup

data/spec/helpers/sign_key_fixture_helper.rb

@@ -1,52 +0,0 @@
-module SignKeyFixtureHelper
-  def shared_secret
-    'shared-secret'
-  end
-
-  def pem_file(file_name)
-    File.new pem_file_path(file_name)
-  end
-
-  def pem_file_path(file_name)
-    File.join(
-      File.dirname(__FILE__),
-      "../fixtures/#{file_name}.pem"
-    )
-  end
-
-  def der_file_path(file_name)
-    File.join(
-      File.dirname(__FILE__),
-      "../fixtures/#{file_name}.der"
-    )
-  end
-
-  def private_key(algorithm = :rsa, options = {})
-    case algorithm
-    when :rsa
-      OpenSSL::PKey::RSA.new(
-        pem_file("#{algorithm}/private_key"),
-        'pass-phrase'
-      )
-    when :ecdsa
-      OpenSSL::PKey::EC.new(
-        pem_file("#{algorithm}/#{options[:digest_length] || 256}/private_key")
-      )
-    end
-  end
-
-  def public_key(algorithm = :rsa, options = {})
-    case algorithm
-    when :rsa
-      OpenSSL::PKey::RSA.new(
-        pem_file("#{algorithm}/public_key")
-      )
-    when :ecdsa
-      OpenSSL::PKey::EC.new(
-        pem_file("#{algorithm}/#{options[:digest_length] || 256}/public_key")
-      )
-    end
-  end
-end
-
-include SignKeyFixtureHelper

data/spec/interop/with_jsrsasign_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe 'interop' do
-  describe 'with jsrsasign' do
-    context 'JWS' do
-      let(:public_key) do
-        pem = <<-PEM.strip_heredoc
-          -----BEGIN PUBLIC KEY-----
-          MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoBUyo8CQAFPeYPvv78ylh5MwFZjT
-          CLQeb042TjiMJxG+9DLFmRSMlBQ9T/RsLLc+PmpB1+7yPAR+oR5gZn3kJQ==
-          -----END PUBLIC KEY-----
-        PEM
-        OpenSSL::PKey::EC.new pem
-      end
-      let(:private_key) do
-        pem = <<-PEM.strip_heredoc
-          -----BEGIN PRIVATE KEY-----
-          MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgEbVzfPnZPxfAyxqE
-          ZV05laAoJAl+/6Xt2O4mOB611sOhRANCAASgFTKjwJAAU95g++/vzKWHkzAVmNMI
-          tB5vTjZOOIwnEb70MsWZFIyUFD1P9Gwstz4+akHX7vI8BH6hHmBmfeQl
-          -----END PRIVATE KEY-----
-        PEM
-        OpenSSL::PKey::EC.new pem
-      end
-      let(:jws_string) do
-        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwczovL2p3dC1pZHAuZXhhbXBsZS5jb20iLCJzdWIiOiJtYWlsdG86bWlrZUBleGFtcGxlLmNvbSIsIm5iZiI6MTQzNTA2MjUyMywiZXhwIjoxNDM1MDY2MTIzLCJpYXQiOjE0MzUwNjI1MjMsImp0aSI6ImlkMTIzNDU2IiwidHlwIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9yZWdpc3RlciJ9.HFmKrExGIFm5SwzTq_ayG80ELUIKnrR9psedV_6ZsuHl5ZLZ-1nV35o0yjKkN7qPQipQMK90xMvDYpi7e2XU9Q'
-      end
-      let(:payload) do
-        {
-          iss: 'https://jwt-idp.example.com',
-          sub: 'mailto:mike@example.com',
-          nbf: 1435062523,
-          exp: 1435066123,
-          iat: 1435062523,
-          jti: 'id123456',
-          typ: 'https://example.com/register'
-        }
-      end
-
-      describe 'verify' do
-        it 'should succeed' do
-          expect do
-            JSON::JWT.decode(jws_string, public_key, :ES256)
-          end.not_to raise_error
-        end
-      end
-    end
-  end
-end