json-jwt 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b179f22e49515e37f1fb1a7a76ae0e4259619ec
-  data.tar.gz: 01bc05a740c8d7d9429f451061123108c9556188
+  metadata.gz: f114f8c73a49561c455f752c90361378e34691ff
+  data.tar.gz: 65e2c0a8b3f0054e81b28dd3d45bc3bd7d4354ba
 SHA512:
-  metadata.gz: 507b4a7403d63f14eb41e4d0ca4a9d7a043cefc6b8b82c8dc080666f9a793fa57e545cbc9c160fce7dffb48b530ad0feda54b54407f98829bb3176ded8be0490
-  data.tar.gz: becb5f896d13528a28a74d8d38bffa3eda0c6cf10a7c0e1e62ac00f37415637482eaa38a052ef75def9736498ff9c7bb4561664368fb13f0c8000cb0b1245907
+  metadata.gz: 47bda5992fac3eebb1403df68ed0f4914ba0ecd61a0c0b4d3d100cef9856a485c0e18f82ebded2774111e2e50ca3fddbe61eb54f198d1ce50fcbd84a1fea9281
+  data.tar.gz: da1a37510a59a5910e9e5a39fd0961c72d062dfa4fe57a6b37e4f07339aa86cd2859b0c0065b4ed5dcad56ddc4cdcaa2827b29d19939854e5492fcfae3bd36f6

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/json/jwe.rb

@@ -72,15 +72,15 @@ module JSON
     end
 
     def gcm?
-      [:A128GCM, :A256GCM].collect(&:to_s).include? encryption_method.to_s
+      [:A128GCM, :A256GCM].include? encryption_method.try(:to_sym)
     end
 
     def cbc?
-      [:'A128CBC-HS256', :'A256CBC-HS512'].collect(&:to_s).include? encryption_method.to_s
+      [:'A128CBC-HS256', :'A256CBC-HS512'].include? encryption_method.try(:to_sym)
     end
 
     def dir?
-      :dir.to_s == algorithm.to_s
+      :dir == algorithm.try(:to_sym)
     end
 
     def cipher
@@ -92,14 +92,14 @@ module JSON
     end
 
     def cipher_name
-      case encryption_method.to_s
-      when :A128GCM.to_s
+      case encryption_method.try(:to_sym)
+      when :A128GCM
         'aes-128-gcm'
-      when :A256GCM.to_s
+      when :A256GCM
         'aes-256-gcm'
-      when :'A128CBC-HS256'.to_s
+      when :'A128CBC-HS256'
         'aes-128-cbc'
-      when :'A256CBC-HS512'.to_s
+      when :'A256CBC-HS512'
         'aes-256-cbc'
       else
         raise UnexpectedAlgorithm.new('Unknown Encryption Algorithm')
@@ -107,10 +107,10 @@ module JSON
     end
 
     def sha_size
-      case encryption_method.to_s
-      when :'A128CBC-HS256'.to_s
+      case encryption_method.try(:to_sym)
+      when :'A128CBC-HS256'
         256
-      when :'A256CBC-HS512'.to_s
+      when :'A256CBC-HS512'
         512
       else
         raise UnexpectedAlgorithm.new('Unknown Hash Size')
@@ -135,22 +135,22 @@ module JSON
     # encryption
 
     def jwe_encrypted_key
-      @jwe_encrypted_key ||= case algorithm.to_s
-      when :RSA1_5.to_s
+      @jwe_encrypted_key ||= case algorithm.try(:to_sym)
+      when :RSA1_5
         public_key_or_secret.public_encrypt content_encryption_key
-      when :'RSA-OAEP'.to_s
+      when :'RSA-OAEP'
         public_key_or_secret.public_encrypt content_encryption_key, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING
-      when :A128KW.to_s
+      when :A128KW
         raise NotImplementedError.new('A128KW not supported yet')
-      when :A256KW.to_s
+      when :A256KW
         raise NotImplementedError.new('A256KW not supported yet')
-      when :dir.to_s
+      when :dir
         ''
-      when :'ECDH-ES'.to_s
+      when :'ECDH-ES'
         raise NotImplementedError.new('ECDH-ES not supported yet')
-      when :'ECDH-ES+A128KW'.to_s
+      when :'ECDH-ES+A128KW'
         raise NotImplementedError.new('ECDH-ES+A128KW not supported yet')
-      when :'ECDH-ES+A256KW'.to_s
+      when :'ECDH-ES+A256KW'
         raise NotImplementedError.new('ECDH-ES+A256KW not supported yet')
       else
         raise UnexpectedAlgorithm.new('Unknown Encryption Algorithm')
@@ -223,22 +223,22 @@ module JSON
     end
 
     def decrypt_content_encryption_key
-      case algorithm.to_s
-      when :RSA1_5.to_s
+      case algorithm.try(:to_sym)
+      when :RSA1_5
         private_key_or_secret.private_decrypt jwe_encrypted_key
-      when :'RSA-OAEP'.to_s
+      when :'RSA-OAEP'
         private_key_or_secret.private_decrypt jwe_encrypted_key, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING
-      when :A128KW.to_s
+      when :A128KW
         raise NotImplementedError.new('A128KW not supported yet')
-      when :A256KW.to_s
+      when :A256KW
         raise NotImplementedError.new('A256KW not supported yet')
-      when :dir.to_s
+      when :dir
         private_key_or_secret
-      when :'ECDH-ES'.to_s
+      when :'ECDH-ES'
         raise NotImplementedError.new('ECDH-ES not supported yet')
-      when :'ECDH-ES+A128KW'.to_s
+      when :'ECDH-ES+A128KW'
         raise NotImplementedError.new('ECDH-ES+A128KW not supported yet')
-      when :'ECDH-ES+A256KW'.to_s
+      when :'ECDH-ES+A256KW'
         raise NotImplementedError.new('ECDH-ES+A256KW not supported yet')
       else
         raise UnexpectedAlgorithm.new('Unknown Encryption Algorithm')

data/lib/json/jwk.rb

@@ -10,6 +10,18 @@ module JSON
       'application/jwk+json'
     end
 
+    def thumbprint(digest = OpenSSL::Digest::SHA256.new)
+      digest = case digest
+      when OpenSSL::Digest
+        digest
+      when String, Symbol
+        OpenSSL::Digest.new digest.to_s
+      else
+        raise UnknownAlgorithm.new('Unknown Digest Algorithm')
+      end
+      UrlSafeBase64.encode64 digest.digest(normalize.to_json)
+    end
+
     private
 
     def ecdsa_coodinates(ecdsa_key)
@@ -17,7 +29,7 @@ module JSON
         hex = ecdsa_key.public_key.to_bn.to_s(16)
         data_len = hex.length - 2
         type = hex[0,2]
-        hex_x =  hex[2, data_len/2]
+        hex_x = hex[2, data_len/2]
         hex_y = hex[2+data_len/2, data_len/2]
         @ecdsa_coodinates = {
           x: [hex_x].pack("H*"),
@@ -43,19 +55,39 @@ module JSON
           y: UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:y].to_s),
         }
       else
-        raise UnknownAlgorithm.new('Unknown Algorithm')
+        raise UnknownAlgorithm.new('Unknown Key Type')
       end
       hash.merge(options)
     end
 
+    def normalize
+      case self[:kty].try(:to_sym)
+      when :RSA
+        {
+          e: self[:e],
+          kty: self[:kty],
+          n: self[:n]
+        }
+      when :EC
+        {
+          crv: self[:crv],
+          kty: self[:kty],
+          x: self[:x],
+          y: self[:y]
+        }
+      else
+        raise UnknownAlgorithm.new('Unknown Key Type')
+      end
+    end
+
     class << self
       def ecdsa_curve_name_for(curve_identifier)
-        case curve_identifier.to_s
-        when 'P-256'
+        case curve_identifier.try(:to_sym)
+        when :'P-256'
           'prime256v1'
-        when 'P-384'
+        when :'P-384'
           'secp384r1'
-        when 'P-521'
+        when :'P-521'
           'secp521r1'
         else
           raise UnknownAlgorithm.new('Unknown ECDSA Curve')
@@ -77,15 +109,15 @@ module JSON
 
       def decode(jwk)
         jwk = jwk.with_indifferent_access
-        case jwk[:kty].to_s
-        when 'RSA'
+        case jwk[:kty].try(:to_sym)
+        when :RSA
           e = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:e]), 2
           n = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:n]), 2
           key = OpenSSL::PKey::RSA.new
           key.e = e
           key.n = n
           key
-        when 'EC'
+        when :EC
           if RUBY_VERSION >= '2.0.0'
             key = OpenSSL::PKey::EC.new ecdsa_curve_name_for(jwk[:crv])
             x, y = [jwk[:x], jwk[:y]].collect do |decoded|
@@ -97,7 +129,7 @@ module JSON
             raise UnknownAlgorithm.new('ECDSA JWK Decoding requires Ruby 2.0+')
           end
         else
-          raise UnknownAlgorithm.new('Unknown Algorithm')
+          raise UnknownAlgorithm.new('Unknown Key Type')
         end
       end
 

data/lib/json/jws.rb

@@ -28,15 +28,15 @@ module JSON
     end
 
     def hmac?
-      [:HS256, :HS384, :HS512].collect(&:to_s).include? algorithm.to_s
+      [:HS256, :HS384, :HS512].include? algorithm.try(:to_sym)
     end
 
     def rsa?
-      [:RS256, :RS384, :RS512].collect(&:to_s).include? algorithm.to_s
+      [:RS256, :RS384, :RS512].include? algorithm.try(:to_sym)
     end
 
     def ecdsa?
-      [:ES256, :ES384, :ES512].collect(&:to_s).include? algorithm.to_s
+      [:ES256, :ES384, :ES512].include? algorithm.try(:to_sym)
     end
 
     def signature_base_string

data/lib/json/jwt.rb

@@ -52,7 +52,7 @@ module JSON
     end
 
     def verify(signature_base_string, public_key_or_secret = nil)
-      if alg.to_s == 'none'
+      if alg.try(:to_sym) == :none
         raise UnexpectedAlgorithm if public_key_or_secret
         signature == '' or raise VerificationFailed
       else

data/spec/interop/with_rfc_example_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'interop' do
+  describe 'with RFC Example' do
+    describe 'JWK Thubmprint' do
+      subject { JSON::JWK.new public_key }
+
+      let(:public_key) do
+        JSON::JWK.decode(
+          kty: :RSA,
+          n: '0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw',
+          e: 'AQAB',
+          alg: :RSA256,
+          kid: '2011-04-29'
+        )
+      end
+      its(:thumbprint) { should == 'NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs' }
+    end
+  end
+end

data/spec/json/jwk_spec.rb

@@ -21,6 +21,18 @@ describe JSON::JWK do
       its(:kid) { jwk[:kid].should == '12345' }
       its(:use) { jwk[:use].should == :sig }
     end
+
+    describe '#thumbprint' do
+      context 'using default hash function' do
+        subject { jwk.thumbprint }
+        it { should == 'nuBTimkcSt_AuEsD8Yv3l8CoGV31bu_3gsRDGN1iVKA' }
+      end
+
+      context 'using SHA512 hash function' do
+        subject { jwk.thumbprint :SHA512 }
+        it { should == '6v7pXTnQLMiQgvJlPJUdhAUSuGLzgF8C1r3ABAMFet6bc53ea-Pq4ZGbGu3RoAFsNRT1-RhTzDqtqXuLU6NOtw' }
+      end
+    end
   end
 
   context 'when ECDSA public key given' do
@@ -60,12 +72,12 @@ describe JSON::JWK do
     end
   end
 
-  describe 'unknown algorithm' do
+  describe 'unknown key type' do
     it do
       key = OpenSSL::PKey::DSA.generate 256
       expect do
         JSON::JWK.new key
-      end.to raise_error JSON::JWK::UnknownAlgorithm, 'Unknown Algorithm'
+      end.to raise_error JSON::JWK::UnknownAlgorithm, 'Unknown Key Type'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -173,6 +173,7 @@ files:
 - 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/set_spec.rb
 - spec/json/jwk_spec.rb
@@ -218,6 +219,7 @@ test_files:
 - 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/set_spec.rb
 - spec/json/jwk_spec.rb