json-jwt 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e593ec307b6ef4d7c0f401221c585c615c86c918
-  data.tar.gz: 4068c3885a7f8417b577f0b5413f567f94612488
+  metadata.gz: 6c556b283e2c0c8c4d09eb134c300bad571d22fe
+  data.tar.gz: 54ebd68df1a534dc5499c9176b67767c54922e50
 SHA512:
-  metadata.gz: b15ef784c658a73d9cf7e5d79fc55966008d08c87f8d1b3b4a4384fd3017a410f490e008ecdbd12d4fdd2347c337533857b66db5569d293c9622a90cbcd1604c
-  data.tar.gz: 33b50220dfd570e1982d98a3e1a1ee30f52e4d2a3bfb49b616ba24c60463dcac23554c6fc1cbb3da3ee4f7a684f81c6101c7a84839bc727ca578cff2d0d7c313
+  metadata.gz: bf0549d83a08baaffad7e7df06f591e7ea3fc983b165747d87e23995a42a55e1c3b0d6366ef0a269787822449f0d478a5d69f226f11ef93cdc583489509d9f3d
+  data.tar.gz: 92af636c0e452cbfca9a3445d285b2b7c6399c281190a542fe8a5a0432120cb979ab259c14506a058f1d688ad856b5e5ef0f86d00d803fbfd74593e519fc3e73

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/lib/json/jwk.rb

@@ -127,14 +127,5 @@ module JSON
       )
       key
     end
-
-    class << self
-      def decode(jwk)
-        # NOTE:
-        #  returning OpenSSL::PKey::RSA/EC instance for backward compatibility.
-        #  use `new` if you want JSON::JWK instance.
-        new(jwk).to_key
-      end
-    end
   end
 end

data/lib/json/jwt.rb

@@ -32,13 +32,6 @@ module JSON
       jws.sign! private_key_or_secret
     end
 
-    # NOTE: keeping for backward compatibility
-    def verify(signature_base_string, public_key_or_secret = nil)
-      jws = JWS.new self
-      jws.signature_base_string = signature_base_string
-      jws.verify! public_key_or_secret
-    end
-
     def encrypt(public_key_or_secret, algorithm = :RSA1_5, encryption_method = :'A128CBC-HS256')
       jwe = JWE.new self
       jwe.alg = algorithm

data/spec/json/jwk_spec.rb

@@ -163,90 +163,4 @@ describe JSON::JWK do
       end.to raise_error JSON::JWK::UnknownAlgorithm, 'Unknown Key Type'
     end
   end
-
-  describe '.decode' do
-    context 'when RSA' do
-      subject do
-        JSON::JWK.decode(
-          kty: :RSA,
-          n: n,
-          e: e
-        )
-      end
-      let(:e) { 'AQAB' }
-      let(:n) { 'AK8ppaAGn6N3jDic2DhDN5mI5mWzvhfL1AFZOS9q2EBM8L5sjZbYiaHeNoKillZGmEF9a9g6Z20bDnoHTuHPsx93HYkZqPumFZ8K9lLCbqKAMWw2Qgk10RgrZ-kblJotTBCeer9-tZSWO-OWFzP4gp8MpSuQOQbwTJwDgEkFIQLUK2YgzWbn1PoW8xcfbVyWhZD880ELGRW6GhRgYAl0DN_EQS8kyUa0CusYCzOOg2W3-7qjYeojyP6jiOEr-eyjC7hcUvTVoTfz84BiZv72KS3i5JS8ZNNuRp5Ce51wjoDDUoNxDLWv6Da6qMaGpKz6NTSNbvhE_KFhpp4wf5yRQD8=' }
-      let(:pem) do
-        <<-PEM.strip_heredoc
-          -----BEGIN PUBLIC KEY-----
-          MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArymloAafo3eMOJzYOEM3
-          mYjmZbO+F8vUAVk5L2rYQEzwvmyNltiJod42gqKWVkaYQX1r2DpnbRsOegdO4c+z
-          H3cdiRmo+6YVnwr2UsJuooAxbDZCCTXRGCtn6RuUmi1MEJ56v361lJY745YXM/iC
-          nwylK5A5BvBMnAOASQUhAtQrZiDNZufU+hbzFx9tXJaFkPzzQQsZFboaFGBgCXQM
-          38RBLyTJRrQK6xgLM46DZbf7uqNh6iPI/qOI4Sv57KMLuFxS9NWhN/PzgGJm/vYp
-          LeLklLxk025GnkJ7nXCOgMNSg3EMta/oNrqoxoakrPo1NI1u+ET8oWGmnjB/nJFA
-          PwIDAQAB
-          -----END PUBLIC KEY-----
-        PEM
-      end
-
-      it { should be_instance_of OpenSSL::PKey::RSA }
-      its(:to_pem) { should == pem }
-
-      it 'should support string keys' do
-        JSON::JWK.decode(
-          'kty' => 'RSA',
-          'n' => n,
-          'e' => e
-        ).should be_instance_of OpenSSL::PKey::RSA
-      end
-    end
-
-    context 'when ECDSA' do
-      [{
-        alg: 'EC',
-        crv: 'P-256',
-        kty: 'EC',
-        x: 'saPyrO4Lh9kh2FxrF9y1QVmZznWnRRJwpr12UHqzrVY',
-        y: 'MMz4W9zzqlrJhqr-JyrpvlnaIIyZQE6DfrgPkxMAw1M'
-      }, {
-        alg: 'EC',
-        crv: 'P-384',
-        kty: 'EC',
-        x: 'plzApyFnK7qzhg5XnIZbFj2hZoH2Vdl4-RFm7DnsNMG9tyqrpfq2RyjfKABbcFRt',
-        y: 'ixBzffhk3fcbmeipGLkvQBNCzeNm6QL3hOUTH6IFBzOL0Y7HsGTopNTTspLjlivb'
-      }, {
-        alg: 'EC',
-        crv: 'P-521',
-        kty: 'EC',
-        x: 'AcMCD-a0a6rnE9TvC0mOqF_DGXRg5Y3iTb4eHNwTm2kD6iujx9M_f8d_FGHr0OhpqzEn4rYPYZouGsbIPEgL0q__',
-        y: 'AULYEd8l-bV_BI289aezhSLZ1RDF2ltgDPEy9Y7YtqYa4cJcpiyzVDMpXWwBp6cjg6TXINkoVrVXZhN404ihu4I2'
-      }].each do |jwk|
-        describe jwk['crv'] do
-          it do
-            JSON::JWK.decode(jwk).should be_instance_of OpenSSL::PKey::EC
-          end
-        end
-      end
-    end
-
-    context 'when invalid algorithm' do
-      it do
-        expect do
-          JSON::JWK.decode(
-            kty: :XXX
-          )
-        end.to raise_error JSON::JWK::UnknownAlgorithm
-      end
-    end
-
-    context 'when no algorithm' do
-      it do
-        expect do
-          JSON::JWK.decode(
-            x: :x
-          )
-        end.to raise_error JSON::JWK::UnknownAlgorithm
-      end
-    end
-  end
 end

data/spec/json/jws_spec.rb

@@ -154,7 +154,7 @@ describe JSON::JWS do
     end
   end
 
-  describe '#verify' do
+  describe '#verify!' do
     shared_examples_for :success_signature_verification do
       it do
         expect { decoded }.not_to raise_error
@@ -259,7 +259,7 @@ describe JSON::JWS do
       let(:alg) { :unknown }
       it do
         expect do
-          jws.verify jws.send(:signature_base_string), 'key'
+          jws.verify! 'key'
         end.to raise_error JSON::JWS::UnexpectedAlgorithm
       end
     end

data/spec/json/jwt_spec.rb

@@ -49,56 +49,6 @@ describe JSON::JWT do
     end
   end
 
-  describe '#verify' do
-    context 'when not signed nor encrypted' do
-      let(:jwt) do
-        header_base64, claims_base64, signature = no_signed.split('.', 3).collect do |segment|
-          UrlSafeBase64.decode64 segment.to_s
-        end
-        header, claims = [header_base64, claims_base64].collect do |json|
-          MultiJson.load(json).with_indifferent_access
-        end
-        jwt = JSON::JWT.new claims
-        jwt.header = header
-        jwt.signature = signature
-        jwt
-      end
-      let(:signature_base_string) { no_signed.split('.', 3)[0,2].join('.') }
-
-      context 'when no signature nor public_key_or_secret given' do
-        it do
-          jwt.verify(signature_base_string).should == true
-        end
-      end
-
-      context 'when public_key_or_secret given' do
-        it do
-          expect do
-            jwt.verify signature_base_string, 'secret'
-          end.to raise_error JSON::JWT::UnexpectedAlgorithm
-        end
-      end
-
-      context 'when signature given' do
-        before { jwt.signature = 'signature' }
-
-        it do
-          expect do
-            jwt.verify signature_base_string
-          end.to raise_error JSON::JWT::VerificationFailed
-        end
-      end
-    end
-
-    context 'when signed' do
-      it 'should delegate verification to JWS' do
-        expect(jws).to receive(:verify!)
-        expect(JSON::JWS).to receive(:new).and_return(jws)
-        jwt.verify 'shared_secret'
-      end
-    end
-  end
-
   describe '#encrypt' do
     let(:shared_key) { SecureRandom.hex 16 } # default shared key is too short
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json