json-jwt 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 602b3d3d4f277871ef5b199abde399770f07f2e8
-  data.tar.gz: 16647acb12b3b2cc50dfa6cca6fe9fd8e628cb31
+  metadata.gz: 3abc4f60457c79cdc55e59cb46553722b816acbe
+  data.tar.gz: 5c305020b1dfcc15f0aff4ee7ea0ab2dee3a9009
 SHA512:
-  metadata.gz: cdd326b72dd4bbf64214dda08a1b42486ebdd858b102e10d9952bbadaf7769a2808ee544cd49297aee3771f0f9e7f2ef6d55d9044af93b3d860328cb02f6380b
-  data.tar.gz: fa3d09f1b919a2caef2a17c57902723f01e5ccbabad731012b62ea0069f9ce09358065dc33e84c2f91814d2789eba0843b5b08af36213cc95fcf9469199daa1e
+  metadata.gz: 83f3cc919f8336b259a1e8fd203692024ae6d5cd7d6402ce83713a28994dd896e0e9b1800b53f9bd1ff8cc98fddf1f18ba3d1241c1349482c56d2a23ba1ffc6b
+  data.tar.gz: f17db83dbd4751c3da5f4e3d37b1e231ae5bda78916677dd13e7fb854ce0706dc58221657542287dd5e55dc81101afe498baf199ec1ba9caa633ede5b3095e90

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.8.3

data/lib/json/jose.rb

@@ -45,11 +45,11 @@ module JSON
         end
       end
 
-      def decode(input, key_or_secret = nil)
+      def decode(input, key_or_secret = nil, algorithms = nil, encryption_methods = nil)
         if input.is_a? Hash
-          decode_json_serialized input, key_or_secret
+          decode_json_serialized input, key_or_secret, algorithms, encryption_methods
         else
-          decode_compact_serialized input, key_or_secret
+          decode_compact_serialized input, key_or_secret, algorithms, encryption_methods
         end
       rescue JSON::ParserError
         raise JWT::InvalidFormat.new("Invalid JSON Format")

data/lib/json/jwe.rb

@@ -37,7 +37,9 @@ module JSON
       self
     end
 
-    def decrypt!(private_key_or_secret)
+    def decrypt!(private_key_or_secret, algorithms = nil, encryption_methods = nil)
+      raise UnexpectedAlgorithm.new('Unexpected alg header') unless algorithms.blank? || Array(algorithms).include?(alg)
+      raise UnexpectedAlgorithm.new('Unexpected enc header') unless encryption_methods.blank? || Array(encryption_methods).include?(enc)
       self.private_key_or_secret = with_jwk_support private_key_or_secret
       cipher.decrypt
       self.content_encryption_key = decrypt_content_encryption_key
@@ -247,7 +249,7 @@ module JSON
     end
 
     class << self
-      def decode_compact_serialized(input, private_key_or_secret)
+      def decode_compact_serialized(input, private_key_or_secret, algorithms = nil, encryption_methods = nil)
         unless input.count('.') + 1 == NUM_OF_SEGMENTS
           raise InvalidFormat.new("Invalid JWE Format. JWE should include #{NUM_OF_SEGMENTS} segments.")
         end
@@ -257,11 +259,13 @@ module JSON
         end
         jwe.auth_data = input.split('.').first
         jwe.header = JSON.parse(_header_json_).with_indifferent_access
-        jwe.decrypt! private_key_or_secret unless private_key_or_secret == :skip_decryption
+        unless private_key_or_secret == :skip_decryption
+          jwe.decrypt! private_key_or_secret, algorithms, encryption_methods
+        end
         jwe
       end
 
-      def decode_json_serialized(input, private_key_or_secret)
+      def decode_json_serialized(input, private_key_or_secret, algorithms = nil, encryption_methods = nil)
         input = input.with_indifferent_access
         jwe_encrypted_key = if input[:recipients].present?
           input[:recipients].first[:encrypted_key]
@@ -275,7 +279,7 @@ module JSON
           input[:ciphertext],
           input[:tag]
         ].join('.')
-        decode_compact_serialized compact_serialized, private_key_or_secret
+        decode_compact_serialized compact_serialized, private_key_or_secret, algorithms, encryption_methods
       end
     end
   end

data/lib/json/jws.rb

@@ -17,13 +17,15 @@ module JSON
       self
     end
 
-    def verify!(public_key_or_secret)
+    def verify!(public_key_or_secret, algorithms = nil)
       if alg.try(:to_sym) == :none
         raise UnexpectedAlgorithm if public_key_or_secret
         signature == '' or raise VerificationFailed
-      else
+      elsif algorithms.blank? || Array(algorithms).include?(alg.try(:to_sym))
         public_key_or_secret && valid?(public_key_or_secret) or
         raise VerificationFailed
+      else
+        raise UnexpectedAlgorithm.new('Unexpected alg header')
       end
     end
 
@@ -150,7 +152,7 @@ module JSON
     end
 
     class << self
-      def decode_compact_serialized(input, public_key_or_secret)
+      def decode_compact_serialized(input, public_key_or_secret, algorithms = nil)
         unless input.count('.') + 1 == NUM_OF_SEGMENTS
           raise InvalidFormat.new("Invalid JWS Format. JWS should include #{NUM_OF_SEGMENTS} segments.")
         end
@@ -164,11 +166,11 @@ module JSON
         jws.header = header
         jws.signature = signature
         jws.signature_base_string = input.split('.')[0, JWS::NUM_OF_SEGMENTS - 1].join('.')
-        jws.verify! public_key_or_secret unless public_key_or_secret == :skip_verification
+        jws.verify! public_key_or_secret, algorithms unless public_key_or_secret == :skip_verification
         jws
       end
 
-      def decode_json_serialized(input, public_key_or_secret)
+      def decode_json_serialized(input, public_key_or_secret, algorithms = nil)
         input = input.with_indifferent_access
         header, payload, signature = if input[:signatures].present?
           [
@@ -184,7 +186,7 @@ module JSON
           end
         end
         compact_serialized = [header, payload, signature].join('.')
-        decode_compact_serialized compact_serialized, public_key_or_secret
+        decode_compact_serialized compact_serialized, public_key_or_secret, algorithms
       end
     end
   end

data/lib/json/jwt.rb

@@ -78,28 +78,39 @@ module JSON
       end
     end
 
+    def pretty_generate
+      [
+        JSON.pretty_generate(header),
+        JSON.pretty_generate(self)
+      ]
+    end
+
     class << self
-      def decode_compact_serialized(jwt_string, key_or_secret)
+      def decode_compact_serialized(jwt_string, key_or_secret, algorithms = nil, encryption_methods = nil)
         case jwt_string.count('.') + 1
         when JWS::NUM_OF_SEGMENTS
-          JWS.decode_compact_serialized jwt_string, key_or_secret
+          JWS.decode_compact_serialized jwt_string, key_or_secret, algorithms
         when JWE::NUM_OF_SEGMENTS
-          JWE.decode_compact_serialized jwt_string, key_or_secret
+          JWE.decode_compact_serialized jwt_string, key_or_secret, algorithms, encryption_methods
         else
           raise InvalidFormat.new("Invalid JWT Format. JWT should include #{JWS::NUM_OF_SEGMENTS} or #{JWE::NUM_OF_SEGMENTS} segments.")
         end
       end
 
-      def decode_json_serialized(input, key_or_secret)
+      def decode_json_serialized(input, key_or_secret, algorithms = nil, encryption_methods = nil)
         input = input.with_indifferent_access
         if (input[:signatures] || input[:signature]).present?
-          JWS.decode_json_serialized input, key_or_secret
+          JWS.decode_json_serialized input, key_or_secret, algorithms
         elsif input[:ciphertext].present?
-          JWE.decode_json_serialized input, key_or_secret
+          JWE.decode_json_serialized input, key_or_secret, algorithms, encryption_methods
         else
           raise InvalidFormat.new("Unexpected JOSE JSON Serialization Format.")
         end
       end
+
+      def pretty_generate(jwt_string)
+        decode(jwt_string, :skip_verification).pretty_generate
+      end
     end
   end
 end
@@ -108,4 +119,4 @@ require 'json/jws'
 require 'json/jwe'
 require 'json/jwk'
 require 'json/jwk/jwkizable'
-require 'json/jwk/set'
+require 'json/jwk/set'

data/spec/interop/with_jsrsasign_spec.rb

@@ -40,7 +40,7 @@ describe 'interop' do
       describe 'verify' do
         it 'should succeed' do
           expect do
-            JSON::JWT.decode(jws_string, public_key)
+            JSON::JWT.decode(jws_string, public_key, :ES256)
           end.not_to raise_error
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: url_safe_base64
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and