json-jwt 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac7876d6689bcbfa09531f34dca2b9e899e5271c
-  data.tar.gz: 39c83be6aa4d803d67b2db513846c1539876abc4
+  metadata.gz: 366867063d5d6443dc46c34adadd1a3fd4a7b574
+  data.tar.gz: 8295a9c7c3620e1cb32d47e4b27f2e6fbf947790
 SHA512:
-  metadata.gz: c95995a62590d5f37fecbdf4930000a7e7c58cb97288a852c10b1c60915f8f54da30a1b99e7d9d892c85370fa77ecf7698dd7616573376a946f4b1a0c04fc488
-  data.tar.gz: 9401202361965498b2410b84d9ef95196f5945956e28cfd86af2c77caf6d416ab7433f8b2d7c8179ea4390fffdb30acb951271c054bd3de4a8c1e3a3e888a30d
+  metadata.gz: 5ce3939943d51965ca03d2dd34c6c40623b2d337ca6b8206dcc90ae29cf0e450c205bd66191ad6bc29f70edcf3567d92ad30cc96ee20dec3b737bbae134960b4
+  data.tar.gz: 7fdd1b34b2535b3fd905e46badd0d2cee536a071eb434bc145179c07772019823bff4fc2fc22eefebb40479570439e430cab9ad1e26849775cbfc45de2952bbb

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.9.1

data/lib/json/jws.rb

@@ -13,6 +13,7 @@ module JSON
     end
 
     def sign!(private_key_or_secret)
+      self.alg = autodetected_algorithm_from(private_key_or_secret) if algorithm == :autodetect
       self.signature = sign signature_base_string, private_key_or_secret
       self
     end
@@ -68,6 +69,28 @@ module JSON
       [:ES256, :ES384, :ES512].include? algorithm.try(:to_sym)
     end
 
+    def autodetected_algorithm_from(private_key_or_secret)
+      case private_key_or_secret
+      when String
+        :HS256
+      when OpenSSL::PKey::RSA
+        :RS256
+      when OpenSSL::PKey::EC
+        case private_key_or_secret.group.curve_name
+        when 'prime256v1'
+          :ES256
+        when 'secp384r1'
+          :ES384
+        when 'secp521r1'
+          :ES512
+        else
+          raise UnknownAlgorithm.new('Unknown EC Curve')
+        end
+      else
+        raise UnexpectedAlgorithm.new('Signature algorithm auto-detection failed')
+      end
+    end
+
     def signature_base_string
       @signature_base_string ||= [
         header.to_json,

data/lib/json/jwt.rb

@@ -26,22 +26,6 @@ module JSON
     end
 
     def sign(private_key_or_secret, algorithm = :autodetect)
-      if algorithm == :autodetect
-        # NOTE:
-        #  I'd like to make :RS256 default.
-        #  However, by histrical reasons, :HS256 was default.
-        #  This code is needed to keep legacy behavior.
-        algorithm = case private_key_or_secret
-        when String
-          :HS256
-        when OpenSSL::PKey::RSA
-          :RS256
-        when OpenSSL::PKey::EC
-          :ES256
-        else
-          raise UnexpectedAlgorithm.new('Signature algorithm auto-detection failed')
-        end
-      end
       jws = JWS.new self
       jws.kid ||= private_key_or_secret[:kid] if private_key_or_secret.is_a? JSON::JWK
       jws.alg = algorithm

data/spec/json/jwt_spec.rb

@@ -56,10 +56,27 @@ describe JSON::JWT do
         its(:alg) { should == :HS256 }
       end
 
-      context 'otherwise' do
+      context 'when key is RSA key' do
         let(:key) { private_key }
         its(:alg) { should == :RS256 }
       end
+
+      context 'when key is EC key' do
+        context 'when prime256v1' do
+          let(:key) { private_key(:ecdsa) }
+          its(:alg) { should == :ES256 }
+        end
+
+        context 'when secp384r1' do
+          let(:key) { private_key(:ecdsa, digest_length: 384) }
+          its(:alg) { should == :ES384 }
+        end
+
+        context 'when secp521r1' do
+          let(:key) { private_key(:ecdsa, digest_length: 512) }
+          its(:alg) { should == :ES512 }
+        end
+      end
     end
 
     context 'when non-JWK key is given' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - nov matake