json-jwt 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,21 +1,15 @@
 PATH
   remote: .
   specs:
-    json-jwt (0.0.1)
-      activesupport (>= 2.3)
-      i18n
+    json-jwt (0.0.2)
       json (>= 1.4.3)
       url_safe_base64
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
     diff-lcs (1.1.3)
-    i18n (0.6.0)
-    json (1.6.0)
-    multi_json (1.0.3)
+    json (1.6.1)
     rake (0.9.2)
     rcov (0.9.10)
     rspec (2.6.0)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/json-jwt.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_runtime_dependency "json", ">= 1.4.3"
   s.add_runtime_dependency "url_safe_base64"
-  s.add_runtime_dependency "activesupport", ">= 2.3"
-  s.add_runtime_dependency "i18n"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "rcov", ">= 0.9"
   s.add_development_dependency "rspec", ">= 2"

data/lib/json/jws.rb

@@ -14,14 +14,30 @@ module JSON
     end
 
     def verify(signature_base_string, signature, public_key_or_secret)
-      sign(signature_base_string, public_key_or_secret) == signature or
+      valid?(signature_base_string, signature, public_key_or_secret) or
       raise VerificationFailed
     end
 
     private
 
     def algorithm
-      @header[:alg]
+      header[:alg] || header['alg']
+    end
+
+    def digest
+      OpenSSL::Digest::Digest.new "SHA#{algorithm.to_s[2, 3]}"
+    end
+
+    def hmac?
+      [:HS256, :HS384, :HS512].collect(&:to_s).include? algorithm.to_s
+    end
+
+    def rsa?
+      [:RS256, :RS384, :RS512].collect(&:to_s).include? algorithm.to_s
+    end
+
+    def ecdsa?
+      [:ES256, :ES384, :ES512].collect(&:to_s).include? algorithm.to_s
     end
 
     def signature_base_string
@@ -34,15 +50,30 @@ module JSON
     end
 
     def sign(signature_base_string, private_key_or_secret)
-      digest = OpenSSL::Digest::Digest.new "SHA#{algorithm.to_s[2, 3]}"
-      case algorithm
-      when :HS256, :HS384, :HS512
+      case
+      when hmac?
         secret = private_key_or_secret
         OpenSSL::HMAC.digest digest, secret, signature_base_string
-      when :RS256, :RS384, :RS512
+      when rsa?
         private_key = private_key_or_secret
         private_key.sign digest, signature_base_string
-      when :ES256, :ES384, :ES512
+      when ecdsa?
+        # TODO
+        raise NotImplementedError.new
+      else
+        raise InvalidFormat.new('Unknown Signature Algorithm')
+      end
+    end
+
+    def valid?(signature_base_string, signature, public_key_or_secret)
+      case
+      when hmac?
+        secret = public_key_or_secret
+        sign(signature_base_string, secret) == signature
+      when rsa?
+        public_key = public_key_or_secret
+        public_key.verify digest, signature, signature_base_string
+      when ecdsa?
         # TODO
         raise NotImplementedError.new
       else

data/lib/json/jwt.rb

@@ -26,12 +26,12 @@ module JSON
       JWS.new(self).sign!(private_key_or_secret)
     end
 
-    def verify(signature_base_string, signature = '', prublic_key_or_secret = nil)
+    def verify(signature_base_string, signature = '', public_key_or_secret = nil)
       case header[:alg]
       when :none
         signature == '' or raise VerificationFailed
       else
-        JWS.new(self).verify(signature_base_string, signature, prublic_key_or_secret)
+        JWS.new(self).verify(signature_base_string, signature, public_key_or_secret)
       end
     end
 
@@ -51,9 +51,10 @@ module JSON
         header, claims, signature = jwt_string.split('.').collect do |segment|
           UrlSafeBase64.decode64 segment.to_s
         end
-        jwt = new JSON.parse(claims).with_indifferent_access
-        jwt.header = JSON.parse(header).with_indifferent_access
-        jwt.verify [header, claims].join('.'), signature, public_key_or_secret
+        signature_base_string = jwt_string.split('.')[0,2].join('.')
+        jwt = new JSON.parse(claims)
+        jwt.header = JSON.parse header
+        jwt.verify signature_base_string, signature, public_key_or_secret
         jwt
       rescue JSON::ParserError
         raise InvalidFormat.new("Invalid JSON Format")

data/spec/json/jws_spec.rb

@@ -8,6 +8,8 @@ describe JSON::JWS do
     _jwt_
   end
   let(:jws) { JSON::JWS.new jwt }
+  let(:signed) { jws.sign! private_key_or_secret }
+  let(:decoded) { JSON::JWT.decode signed.to_s, public_key_or_secret }
   let(:claims) do
     {
       :iss => 'joe',
@@ -15,6 +17,19 @@ describe JSON::JWS do
       'http://example.com/is_root' => true
     }
   end
+  let(:expected_signature) {
+    {
+      :HS256 => 'DyuTgO2Ggb5nrhkkhI-RjVYIBe3o8oL4ijkAn94YPxQ',
+      :HS384 => 'a5-7rr61TG8Snv9xxJ7l064ky-SCq1Mswe9t8HEorvoc_nnfIeUy9WQCLMIli34R',
+      :HS512 => 'ce-GlHDaNwaHfmAFRGp3QPPKvrpruTug2hC1bf6yNlbuvkMwJw2jFZgq_4wmIPetRdiBy7XFq7rrtmw1Im7tmQ',
+      :RS256 => 'E5VELqAdla2Bx1axc9KFxO0EiCr0Mw6HPYX070qGQ8zA_XmyxGPUZLyyWU_6Cn399W-oYBWO2ynLlr8pqqjP3jXevyCeYeGRVN0HzLYiBebEugNnc3hevr7WV2UzfksWRA-Ux2bDv2sz9p_LGbL33wWNxGDvIlpDyZUul_a48nCipS0riBjkTLTSE8dfBxQTXEF5GEUUu99ot6aBLzUhc25nHXSXogXF6MHK-hAcE7f4v-vJ0lbPbHLVGUopIoxoqe4XjoBpzE5UvhrVl5LYbdjbyJhu5ZIA8GLsgwtUFh3dfdIechORoR3k5NSFSv8157bAEa8t4iwgWD2MSNSQnw',
+      :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',
+      :ES256 => :TODO,
+      :ES384 => :TODO,
+      :ES512 => :TODO
+    }
+  }
 
   shared_examples_for :jwt_with_alg do
     it { should == jwt }
@@ -28,44 +43,79 @@ describe JSON::JWS do
   end
 
   describe '#sign!' do
-    shared_examples_for :jwt_with_expected_signature do
-      it 'should generate expected signature' do
+    shared_examples_for :generate_expected_signature do
+      it do
         UrlSafeBase64.encode64(signed.signature).should == expected_signature[alg]
       end
     end
-    let(:expected_signature) {
-      {
-        :HS256 => 'DyuTgO2Ggb5nrhkkhI-RjVYIBe3o8oL4ijkAn94YPxQ',
-        :HS384 => 'a5-7rr61TG8Snv9xxJ7l064ky-SCq1Mswe9t8HEorvoc_nnfIeUy9WQCLMIli34R',
-        :HS512 => 'ce-GlHDaNwaHfmAFRGp3QPPKvrpruTug2hC1bf6yNlbuvkMwJw2jFZgq_4wmIPetRdiBy7XFq7rrtmw1Im7tmQ',
-        :RS256 => 'E5VELqAdla2Bx1axc9KFxO0EiCr0Mw6HPYX070qGQ8zA_XmyxGPUZLyyWU_6Cn399W-oYBWO2ynLlr8pqqjP3jXevyCeYeGRVN0HzLYiBebEugNnc3hevr7WV2UzfksWRA-Ux2bDv2sz9p_LGbL33wWNxGDvIlpDyZUul_a48nCipS0riBjkTLTSE8dfBxQTXEF5GEUUu99ot6aBLzUhc25nHXSXogXF6MHK-hAcE7f4v-vJ0lbPbHLVGUopIoxoqe4XjoBpzE5UvhrVl5LYbdjbyJhu5ZIA8GLsgwtUFh3dfdIechORoR3k5NSFSv8157bAEa8t4iwgWD2MSNSQnw',
-        :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',
-        :ES256 => :TODO,
-        :ES384 => :TODO,
-        :ES512 => :TODO
-      }
-    }
-    let(:signed) do
-      jws.sign! key
-    end
     subject { signed }
 
     [:HS256, :HS384, :HS512].each do |algorithm|
       describe algorithm do
-        let(:key) { shared_secret }
+        let(:private_key_or_secret) { shared_secret }
         let(:alg) { algorithm }
         it_behaves_like :jwt_with_alg
-        it_behaves_like :jwt_with_expected_signature
+        it_behaves_like :generate_expected_signature
       end
     end
 
     [:RS256, :RS384, :RS512].each do |algorithm|
       describe algorithm do
-        let(:key) { private_key }
+        let(:private_key_or_secret) { private_key }
         let(:alg) { algorithm }
         it_behaves_like :jwt_with_alg
-        it_behaves_like :jwt_with_expected_signature
+        it_behaves_like :generate_expected_signature
+      end
+    end
+
+    [:ES256, :ES384, :ES512].each do |algorithm|
+      describe algorithm do
+        let(:alg) { algorithm }
+        it :TODO
+      end
+    end
+  end
+
+  describe '#verify' do
+    shared_examples_for :succes_signature_verification do
+      it do
+        expect { decoded }.should_not raise_error
+        decoded.should be_a JSON::JWT
+      end
+
+      describe 'header' do
+        let(:header) { decoded.header }
+        it 'should be parsed successfully' do
+          header['typ'].should == 'JWT'
+          header['alg'].should == alg.to_s
+        end
+      end
+
+      describe 'claims' do
+        it 'should be parsed successfully' do
+          decoded['iss'].should == 'joe'
+          decoded['exp'].should == 1300819380
+          decoded['http://example.com/is_root'] == true
+        end
+      end
+    end
+    subject { decoded }
+
+    [:HS256, :HS384, :HS512].each do |algorithm|
+      describe algorithm do
+        let(:private_key_or_secret) { shared_secret }
+        let(:public_key_or_secret) { shared_secret }
+        let(:alg) { algorithm }
+        it_behaves_like :succes_signature_verification
+      end
+    end
+
+    [:RS256, :RS384, :RS512].each do |algorithm|
+      describe algorithm do
+        let(:private_key_or_secret) { private_key }
+        let(:public_key_or_secret) { public_key }
+        let(:alg) { algorithm }
+        it_behaves_like :succes_signature_verification
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: json-jwt
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - nov matake
@@ -34,61 +34,39 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.3"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0.8"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0.9"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "2"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 description: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON Web Key) in Ruby
 email: 
 - nov@matake.jp