json-jwt 0.2.0 → 0.3.0

data/.travis.yml

@@ -1,2 +1,3 @@
 rvm:
+  - 1.9.2
   - 1.9.3

data/Gemfile

@@ -1,7 +1,3 @@
 source "http://rubygems.org"
 
-platform :jruby do
-  gem 'jruby-openssl', '>= 0.7'
-end
-
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json-jwt (0.1.8)
+    json-jwt (0.3.0)
       activesupport (>= 2.3)
       i18n
       json (>= 1.4.3)
@@ -31,16 +31,16 @@ GEM
     rspec-core (2.11.1)
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.11.3)
     url_safe_base64 (0.2.1)
     yamler (0.1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   cover_me (>= 1.2.0)
-  jruby-openssl (>= 0.7)
   json-jwt!
   rake (>= 0.8)
   rspec (>= 2)

data/Rakefile

@@ -4,22 +4,15 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-if RUBY_VERSION >= '1.9'
-  namespace :cover_me do
-    desc "Generates and opens code coverage report."
-    task :report do
-      require 'cover_me'
-      CoverMe.complete!
-    end
-  end
-  task :spec do
-    Rake::Task['cover_me:report'].invoke
-  end
-else
-  RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.rcov = true
-    spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems']
+namespace :cover_me do
+  desc "Generates and opens code coverage report."
+  task :report do
+    require 'cover_me'
+    CoverMe.complete!
   end
 end
+task :spec do
+  Rake::Task['cover_me:report'].invoke
+end
 
-task :default => :spec
+task default: :spec

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/json-jwt.gemspec

@@ -15,10 +15,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activesupport", ">= 2.3"
   s.add_runtime_dependency "i18n"
   s.add_development_dependency "rake", ">= 0.8"
-  if RUBY_VERSION >= '1.9'
-    s.add_development_dependency "cover_me", ">= 1.2.0"
-  else
-    s.add_development_dependency "rcov", ">= 0.9"
-  end
+  s.add_development_dependency "cover_me", ">= 1.2.0"
   s.add_development_dependency "rspec", ">= 2"
 end

data/lib/json/jwk.rb

@@ -29,8 +29,8 @@ module JSON
         hex_x =  hex[2, data_len/2]
         hex_y = hex[2+data_len/2, data_len/2]
         @ecdsa_coodinates = {
-          :x => hex_x,
-          :y => hex_y
+          x: hex_x,
+          y: hex_y
         }
       end
       @ecdsa_coodinates
@@ -40,16 +40,16 @@ module JSON
       hash = case public_key
       when OpenSSL::PKey::RSA
         {
-          :alg => :RSA,
-          :exp => UrlSafeBase64.encode64(public_key.e.to_s(2)),
-          :mod => UrlSafeBase64.encode64(public_key.n.to_s(2))
+          alg: :RSA,
+          exp: UrlSafeBase64.encode64(public_key.e.to_s(2)),
+          mod: UrlSafeBase64.encode64(public_key.n.to_s(2))
         }
       when OpenSSL::PKey::EC
         {
-          :alg => :EC,
-          :crv => ecdsa_curve_name(public_key),
-          :x => UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:x].to_s),
-          :y => UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:y].to_s)
+          alg: :EC,
+          crv: ecdsa_curve_name(public_key),
+          x: UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:x].to_s),
+          y: UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:y].to_s)
         }
       else
         raise UnknownAlgorithm.new('Unknown Algorithm')
@@ -59,15 +59,15 @@ module JSON
 
     class << self
       def decode(jwk)
-        case jwk[:alg]
-        when :RSA
+        case jwk[:alg].to_s
+        when 'RSA'
           exp = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:exp]), 2
           mod = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:mod]), 2
           key = OpenSSL::PKey::RSA.new
           key.e = exp
           key.n = mod
           key
-        when :EC
+        when 'EC'
           raise NotImplementedError.new('Not Implemented Yet')
         else
           raise UnknownAlgorithm.new('Unknown Algorithm')

data/lib/json/jwk/set.rb

@@ -6,7 +6,7 @@ module JSON
 
     def as_json(options = {})
       # NOTE: Array.new wrapper is requied to avoid CircularReferenceError
-      {:keys => Array.new(self)}
+      {keys: Array.new(self)}
     end
   end
 end

data/lib/json/jws.rb

@@ -13,8 +13,8 @@ module JSON
       self
     end
 
-    def verify(signature_base_string, signature, public_key_or_secret)
-      valid?(signature_base_string, signature, public_key_or_secret) or
+    def verify(public_key_or_secret)
+      public_key_or_secret && valid?(public_key_or_secret) or
       raise VerificationFailed
     end
 
@@ -66,7 +66,7 @@ module JSON
       end
     end
 
-    def valid?(signature_base_string, signature, public_key_or_secret)
+    def valid?(public_key_or_secret)
       case
       when hmac?
         secret = public_key_or_secret

data/lib/json/jwt.rb

@@ -14,8 +14,8 @@ module JSON
 
     def initialize(claims)
       @header = {
-        :typ => :JWT,
-        :alg => :none
+        typ: :JWT,
+        alg: :none
       }
       [:exp, :nbf, :iat].each do |key|
         claims[key] = claims[key].to_i if claims[key]
@@ -28,12 +28,12 @@ module JSON
       JWS.new(self).sign!(private_key_or_secret)
     end
 
-    def verify(signature_base_string, signature = '', public_key_or_secret = nil)
+    def verify(public_key_or_secret = nil)
       if header[:alg].to_s == 'none'
         raise UnexpectedAlgorithm if public_key_or_secret
         signature == '' or raise VerificationFailed
       else
-        JWS.new(self).verify(signature_base_string, signature, public_key_or_secret)
+        JWS.new(self).verify(public_key_or_secret)
       end
     end
 
@@ -54,10 +54,14 @@ module JSON
           header, claims, signature = jwt_string.split('.', 3).collect do |segment|
             UrlSafeBase64.decode64 segment.to_s
           end
+          header, claims = [header, claims].collect do |json|
+            JSON.parse json, symbolize_names: true, symbolize_keys: true
+          end
           signature_base_string = jwt_string.split('.')[0, 2].join('.')
-          jwt = new JSON.parse(claims, :symbolize_names => true, :symbolize_keys => true)
-          jwt.header = JSON.parse(header, :symbolize_names => true, :symbolize_keys => true)
-          jwt.verify signature_base_string, signature, key_or_secret
+          jwt = new claims
+          jwt.header = header
+          jwt.signature = signature
+          jwt.verify key_or_secret unless key_or_secret == :skip_verification
           jwt
         when 3 # JWE
           # TODO: Concept code first.

data/spec/json/jwk_spec.rb

@@ -9,7 +9,7 @@ describe JSON::JWK do
     its(:mod) { jwk[:mod].should == UrlSafeBase64.encode64(public_key.n.to_s(2)) }
 
     context 'when kid/use options given' do
-      let(:jwk) { JSON::JWK.new public_key, :kid => '12345', :use => :sig }
+      let(:jwk) { JSON::JWK.new public_key, kid: '12345', use: :sig }
       it { jwk.should include :kid, :use }
       its(:kid) { jwk[:kid].should == '12345' }
       its(:use) { jwk[:use].should == :sig }
@@ -20,22 +20,22 @@ describe JSON::JWK do
     let(:expected_coodinates) do
       {
         256 => {
-          :x => 'OTUyMUU1NjJFOEQ3NDA0MTRDOEEyQjk5RDQ2NkZERDVFNUYwQzUzMUFGNENBNkMxMTY2Q0NFQzUzQjVGRDMwRg',
-          :y => 'MDIwQTRENTQwN0ExQkJFNzQwNkJDNjIyMUI5NjUxQTY1NjY5Mjg4QUU1OEE1NjRDNjcwN0Q1RkQ5REM3MDlCNw'
+          x: 'OTUyMUU1NjJFOEQ3NDA0MTRDOEEyQjk5RDQ2NkZERDVFNUYwQzUzMUFGNENBNkMxMTY2Q0NFQzUzQjVGRDMwRg',
+          y: 'MDIwQTRENTQwN0ExQkJFNzQwNkJDNjIyMUI5NjUxQTY1NjY5Mjg4QUU1OEE1NjRDNjcwN0Q1RkQ5REM3MDlCNw'
         },
         384 => {
-          :x => 'QTY1Q0MwQTcyMTY3MkJCQUIzODYwRTU3OUM4NjVCMTYzREExNjY4MUY2NTVEOTc4RjkxMTY2RUMzOUVDMzRDMUJEQjcyQUFCQTVGQUI2NDcyOERGMjgwMDVCNzA1NDZE',
-          :y => 'OEIxMDczN0RGODY0RERGNzFCOTlFOEE5MThCOTJGNDAxMzQyQ0RFMzY2RTkwMkY3ODRFNTEzMUZBMjA1MDczMzhCRDE4RUM3QjA2NEU4QTRENEQzQjI5MkUzOTYyQkRC'
+          x: 'QTY1Q0MwQTcyMTY3MkJCQUIzODYwRTU3OUM4NjVCMTYzREExNjY4MUY2NTVEOTc4RjkxMTY2RUMzOUVDMzRDMUJEQjcyQUFCQTVGQUI2NDcyOERGMjgwMDVCNzA1NDZE',
+          y: 'OEIxMDczN0RGODY0RERGNzFCOTlFOEE5MThCOTJGNDAxMzQyQ0RFMzY2RTkwMkY3ODRFNTEzMUZBMjA1MDczMzhCRDE4RUM3QjA2NEU4QTRENEQzQjI5MkUzOTYyQkRC'
         },
         512 => {
-          :x => 'MDFDMzAyMEZFNkI0NkJBQUU3MTNENEVGMEI0OThFQTg1RkMzMTk3NDYwRTU4REUyNERCRTFFMUNEQzEzOUI2OTAzRUEyQkEzQzdEMzNGN0ZDNzdGMTQ2MUVCRDBFODY5QUIzMTI3RTJCNjBGNjE5QTJFMUFDNkM4M0M0ODBCRDJBRkZG',
-          :y => 'MDE0MkQ4MTFERjI1RjlCNTdGMDQ4REJDRjVBN0IzODUyMkQ5RDUxMEM1REE1QjYwMENGMTMyRjU4RUQ4QjZBNjFBRTFDMjVDQTYyQ0IzNTQzMzI5NUQ2QzAxQTdBNzIzODNBNEQ3MjBEOTI4NTZCNTU3NjYxMzc4RDM4OEExQkI4MjM2'
+          x: 'MDFDMzAyMEZFNkI0NkJBQUU3MTNENEVGMEI0OThFQTg1RkMzMTk3NDYwRTU4REUyNERCRTFFMUNEQzEzOUI2OTAzRUEyQkEzQzdEMzNGN0ZDNzdGMTQ2MUVCRDBFODY5QUIzMTI3RTJCNjBGNjE5QTJFMUFDNkM4M0M0ODBCRDJBRkZG',
+          y: 'MDE0MkQ4MTFERjI1RjlCNTdGMDQ4REJDRjVBN0IzODUyMkQ5RDUxMEM1REE1QjYwMENGMTMyRjU4RUQ4QjZBNjFBRTFDMjVDQTYyQ0IzNTQzMzI5NUQ2QzAxQTdBNzIzODNBNEQ3MjBEOTI4NTZCNTU3NjYxMzc4RDM4OEExQkI4MjM2'
         }
       }
     end
     [256, 384, 512].each do |digest_length|
       describe "EC#{digest_length}" do
-        let(:jwk) { JSON::JWK.new public_key(:ecdsa, :digest_length => digest_length) }
+        let(:jwk) { JSON::JWK.new public_key(:ecdsa, digest_length: digest_length) }
         it { jwk.should include :alg, :crv, :x, :y }
         its(:alg) { jwk[:alg].should == :EC }
         its(:x) { jwk[:x].should == expected_coodinates[digest_length][:x] }
@@ -74,7 +74,8 @@ describe JSON::JWK do
       let(:exp) { 'AQAB' }
       let(:mod) { 'AK8ppaAGn6N3jDic2DhDN5mI5mWzvhfL1AFZOS9q2EBM8L5sjZbYiaHeNoKillZGmEF9a9g6Z20bDnoHTuHPsx93HYkZqPumFZ8K9lLCbqKAMWw2Qgk10RgrZ-kblJotTBCeer9-tZSWO-OWFzP4gp8MpSuQOQbwTJwDgEkFIQLUK2YgzWbn1PoW8xcfbVyWhZD880ELGRW6GhRgYAl0DN_EQS8kyUa0CusYCzOOg2W3-7qjYeojyP6jiOEr-eyjC7hcUvTVoTfz84BiZv72KS3i5JS8ZNNuRp5Ce51wjoDDUoNxDLWv6Da6qMaGpKz6NTSNbvhE_KFhpp4wf5yRQD8=' }
       let(:pem) do
-        <<-PEM
+        if RUBY_VERSION >= '1.9.3'
+          <<-PEM
 -----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArymloAafo3eMOJzYOEM3
 mYjmZbO+F8vUAVk5L2rYQEzwvmyNltiJod42gqKWVkaYQX1r2DpnbRsOegdO4c+z
@@ -84,7 +85,19 @@ nwylK5A5BvBMnAOASQUhAtQrZiDNZufU+hbzFx9tXJaFkPzzQQsZFboaFGBgCXQM
 LeLklLxk025GnkJ7nXCOgMNSg3EMta/oNrqoxoakrPo1NI1u+ET8oWGmnjB/nJFA
 PwIDAQAB
 -----END PUBLIC KEY-----
-        PEM
+          PEM
+        else
+          <<-PEM
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEArymloAafo3eMOJzYOEM3mYjmZbO+F8vUAVk5L2rYQEzwvmyNltiJ
+od42gqKWVkaYQX1r2DpnbRsOegdO4c+zH3cdiRmo+6YVnwr2UsJuooAxbDZCCTXR
+GCtn6RuUmi1MEJ56v361lJY745YXM/iCnwylK5A5BvBMnAOASQUhAtQrZiDNZufU
++hbzFx9tXJaFkPzzQQsZFboaFGBgCXQM38RBLyTJRrQK6xgLM46DZbf7uqNh6iPI
+/qOI4Sv57KMLuFxS9NWhN/PzgGJm/vYpLeLklLxk025GnkJ7nXCOgMNSg3EMta/o
+NrqoxoakrPo1NI1u+ET8oWGmnjB/nJFAPwIDAQAB
+-----END RSA PUBLIC KEY-----
+          PEM
+        end
       end
 
       it { should be_instance_of OpenSSL::PKey::RSA }

data/spec/json/jws_spec.rb

@@ -12,12 +12,12 @@ describe JSON::JWS do
   let(:decoded) { JSON::JWT.decode signed.to_s, public_key_or_secret }
   let(:claims) do
     {
-      :iss => 'joe',
-      :exp => 1300819380,
+      iss: 'joe',
+      exp: 1300819380,
       :'http://example.com/is_root' => true
     }
   end
-  let(:expected_signature) {
+  let(:expected_signature) do
     {
       :HS256 => 'DyuTgO2Ggb5nrhkkhI-RjVYIBe3o8oL4ijkAn94YPxQ',
       :HS384 => 'a5-7rr61TG8Snv9xxJ7l064ky-SCq1Mswe9t8HEorvoc_nnfIeUy9WQCLMIli34R',
@@ -26,7 +26,7 @@ describe JSON::JWS do
       :RS384 => 'lT5JbytGKgG9QrwkJuxgw7UjmN9tjkEQW9pVGR2XnKEdC0_wLNIzAmT-jTwyMDGBLUkWO7opDOP6Xy6_DOTg58k9PwVkyQzrLnmxJMEng2Q-aMqcitRSIvUk3DPy8kemp8yUPls9NzWmByM2GoUVHbDsR0r-tZN-g_9QYev32mvMhjMr30JI5S2xiRjc9m2GAaXMOQmNTovJgV4bgCp4UjruCrA0BD1JJwDqKYoR_YYr_ALcVjD_LUgy80udJvbi8MAYJVUf0QYtQDrX2wnT_-eiiWjD5XafLuXEQVDRh-v2MKAwdvtXMq5cZ08Zjl2SyHxJ3OqhEeWPvYGltxZh_A',
       :RS512 => 'EHeGM2Mo3ghhUfSB99AlREehrbC6OPE-nYL_rwf88ysTnJ8L1QQ0UuCrXq4SpRutGLK_bYTK3ZALvFRPoOgK_g0QWmqv6qjQRU_QTxoq8y8APP-IgKKDuIiGH6daBV2rAPLDReqYNKsKjmTvZJo2c0a0e_WZkkj_ZwpgjTG3v0gW9lbDAzLJDz18eqtR4ZO7JTu_fyNrUrNk-w2_wpxSsn9sygIMp0lKE0_pt0b01fz3gjTDjlltU0cKSalUp4geaBDH7QRcexrolIctdQFbNKTXQxoigxD3NLNkKGH7f6A8KZdcOm8AnEjullcZs8_OWGnW43p1qrxoBRSivb9pqQ'
     }
-  }
+  end
 
   shared_examples_for :jwt_with_alg do
     it { should == jwt }
@@ -120,8 +120,8 @@ describe JSON::JWS do
 
     [:ES256, :ES384, :ES512].each do |algorithm|
       describe algorithm do
-        let(:private_key_or_secret) { private_key(:ecdsa, :digest_length => algorithm.to_s[2,3].to_i) }
-        let(:public_key_or_secret) { public_key(:ecdsa, :digest_length => algorithm.to_s[2,3].to_i) }
+        let(:private_key_or_secret) { private_key :ecdsa, digest_length: algorithm.to_s[2,3].to_i }
+        let(:public_key_or_secret)  { public_key  :ecdsa, digest_length: algorithm.to_s[2,3].to_i }
         let(:alg) { algorithm }
         it_behaves_like :success_signature_verification
       end
@@ -131,7 +131,7 @@ describe JSON::JWS do
       let(:alg) { :unknown }
       it do
         expect do
-          jws.verify 'signature_base_string', 'signature', 'key'
+          jws.verify 'key'
         end.to raise_error JSON::JWS::InvalidFormat
       end
     end

data/spec/json/jwt_spec.rb

@@ -2,10 +2,16 @@ require 'spec_helper'
 
 describe JSON::JWT do
   let(:jwt) { JSON::JWT.new claims }
+  let(:jws) do
+    jwt.header[:alg] = :HS256
+    jws = JSON::JWS.new jwt
+    jws.signature = 'signature'
+    jws
+  end
   let(:claims) do
     {
-      :iss => 'joe',
-      :exp => 1300819380,
+      iss: 'joe',
+      exp: 1300819380,
       :'http://example.com/is_root' => true
     }
   end
@@ -39,36 +45,49 @@ describe JSON::JWT do
 
   describe '#verify' do
     context 'when not signed nor encrypted' do
+      let(:jwt) do
+        header, claims, signature = no_signed.split('.', 3).collect do |segment|
+          UrlSafeBase64.decode64 segment.to_s
+        end
+        header, claims = [header, claims].collect do |json|
+          JSON.parse json, symbolize_names: true, symbolize_keys: true
+        end
+        jwt = JSON::JWT.new claims
+        jwt.header = header
+        jwt.signature = signature
+        jwt
+      end
+
       context 'when no signature nor public_key_or_secret given' do
         it do
-          jwt.verify(no_signed).should be_true
+          jwt.verify.should be_true
         end
       end
 
       context 'when public_key_or_secret given' do
         it do
           expect do
-            jwt.verify(no_signed, '', 'secret')
+            jwt.verify '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(no_signed, 'signature')
+            jwt.verify
           end.to raise_error JSON::JWT::VerificationFailed
         end
       end
     end
 
     context 'when signed' do
-      before { jwt.header[:alg] = :HS256 }
       it 'should delegate verification to JWS' do
-        jws = JSON::JWS.new jwt
         jws.should_receive(:verify)
         JSON::JWS.should_receive(:new).and_return(jws)
-        jwt.verify 'signature_base_string', 'signature', 'shared_secret'
+        jwt.verify 'shared_secret'
       end
     end
   end
@@ -82,6 +101,32 @@ describe JSON::JWT do
       end
     end
 
+    context 'when signed' do
+      context 'when no secret/key given' do
+        it 'should do verification' do
+          expect do
+            JSON::JWT.decode jws.to_s
+          end.to raise_error JSON::JWT::VerificationFailed
+        end
+      end
+
+      context 'when secret/key given' do
+        it 'should do verification' do
+          expect do
+            JSON::JWT.decode jws.to_s, 'secret'
+          end.to raise_error JSON::JWT::VerificationFailed
+        end
+      end
+
+      context 'when :skip_verification given as secret/key' do
+        it 'should skip verification' do
+          expect do
+            jwt = JSON::JWT.decode jws.to_s, :skip_verification
+          end.not_to raise_error
+        end
+      end
+    end
+
     context 'when JSON parse failed' do
       it do
         expect do

data/spec/spec_helper.rb

@@ -1,7 +1,4 @@
-if RUBY_VERSION >= '1.9'
-  require 'cover_me'
-end
-
+require 'cover_me'
 require 'rspec'
 require 'json/jwt'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json