json-jwt 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7649be617fc501060e8befd700c60cdb8ce8a12d
-  data.tar.gz: 9651a7ce62ff0b6f6d2871d7efca3c59d643dce4
+  metadata.gz: f19422f66eb5b83b9e0bd358351adae0079ef23b
+  data.tar.gz: 9fcfb99e7aefa37537925233bf1669706ec30b9a
 SHA512:
-  metadata.gz: c42db1a5ec52bd3ed4c9ef99c96eeffa03c9f2eef67390ad95afbf9d7b6a126d8dacc58ec6f09a50acd65b8f775a5d4829754ef94455f8a864bc353397b375d3
-  data.tar.gz: 6f73a187ff937ed434af26029ba8af42d6b6a0a523171c18006bd2db53b29128ff81eb6bc8517e35d973783421a88cc946ad2bc6756aa97e88a62eeee27e7ef9
+  metadata.gz: 43e31546b57bcf852d496a588d444669ca48060191cec2c5283eadca9c6da5c7e69d337df9f40a240798a88c9e14316d9ad0a20c2bcbe7f7d0ede3e4cad6daee
+  data.tar.gz: 867b59f52a7937a7c86fe6b159038506e2821899872b7e4bb9bbcc6ac6d18310ee6e7cd31216180eabaff1072b3cb487253fb20e26ccdb163efde2a57005fed6

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
 

data/Rakefile

@@ -12,7 +12,7 @@ namespace :cover_me do
   end
 end
 task :spec do
-  Rake::Task['cover_me:report'].invoke
+  Rake::Task['cover_me:report'].invoke unless ENV['TRAVIS_RUBY_VERSION']
 end
 
 task default: :spec

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/json-jwt.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_runtime_dependency "multi_json", ">= 1.3"
   s.add_runtime_dependency "url_safe_base64"
-  s.add_runtime_dependency "activesupport", "< 4"
+  s.add_runtime_dependency "activesupport"
   s.add_runtime_dependency "bindata"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "cover_me", ">= 1.2.0"

data/lib/json/jose.rb

@@ -0,0 +1,7 @@
+module JSON
+  class JOSE < JWT
+    def content_type
+      'application/jose'
+    end
+  end
+end

data/lib/json/jwe.rb

@@ -2,7 +2,7 @@ require 'securerandom'
 require 'bindata'
 
 module JSON
-  class JWE < JWT
+  class JWE < JOSE
     class InvalidFormat < JWT::InvalidFormat; end
     class DecryptionFailed < JWT::VerificationFailed; end
     class UnexpectedAlgorithm < JWT::UnexpectedAlgorithm; end
@@ -20,6 +20,10 @@ module JSON
       self.input = input.to_s
     end
 
+    def content_type
+      'application/jose'
+    end
+
     def encrypt!(public_key_or_secret)
       self.mode = :encyption
       self.plain_text = input

data/lib/json/jwk.rb

@@ -78,6 +78,12 @@ module JSON
           raise UnknownAlgorithm.new('Unknown Algorithm')
         end
       end
+
+      # NOTE: Ugly hack to avoid this ActiveSupport 4.0 bug.
+      #  https://github.com/rails/rails/issues/11087
+      def new_from_hash_copying_default(hash)
+        superclass.new_from_hash_copying_default hash
+      end
     end
   end
 end

data/lib/json/jws.rb

@@ -1,5 +1,5 @@
 module JSON
-  class JWS < JWT
+  class JWS < JOSE
     class InvalidFormat < JWT::InvalidFormat; end
     class VerificationFailed < JWT::VerificationFailed; end
     class UnexpectedAlgorithm < JWT::UnexpectedAlgorithm; end

data/lib/json/jwt.rb

@@ -12,10 +12,6 @@ module JSON
     class VerificationFailed < Exception; end
     class UnexpectedAlgorithm < VerificationFailed; end
 
-    def header
-      @header ||= {}
-    end
-
     class << self
       def register_header_keys(*keys)
         keys.each do |header_key|
@@ -40,6 +36,14 @@ module JSON
       replace claims
     end
 
+    def content_type
+      'application/jwt'
+    end
+
+    def header
+      @header ||= {}
+    end
+
     def sign(private_key_or_secret, algorithm = :HS256)
       jws = JWS.new(self)
       jws.alg = algorithm
@@ -62,10 +66,6 @@ module JSON
       jwe.encrypt! public_key_or_secret
     end
 
-    def content_type
-      "application/#{self.class.name.split('::').last.downcase}"
-    end
-
     def to_s
       [
         header.to_json,
@@ -101,17 +101,25 @@ module JSON
           jwe.header = MultiJson.load(
             UrlSafeBase64.decode64 jwt_string.split('.').first
           ).with_indifferent_access
-          jwe.decrypt! key_or_secret
+          jwe.decrypt! key_or_secret unless key_or_secret == :skip_decryption
+          jwe
         else
           raise InvalidFormat.new('Invalid JWT Format. JWT should include 2 or 3 dots.')
         end
       rescue MultiJson::DecodeError
         raise InvalidFormat.new("Invalid JSON Format")
       end
+
+      # NOTE: Ugly hack to avoid this ActiveSupport 4.0 bug.
+      #  https://github.com/rails/rails/issues/11087
+      def new_from_hash_copying_default(hash)
+        superclass.new_from_hash_copying_default hash
+      end
     end
   end
 end
 
+require 'json/jose'
 require 'json/jws'
 require 'json/jwe'
 require 'json/jwk'

data/spec/json/jwe_spec.rb

@@ -11,7 +11,7 @@ describe JSON::JWE do
   describe '#content_type' do
     let(:jwe) { JSON::JWE.new 'hello' }
     it do
-      jwe.content_type.should == 'application/jwe'
+      jwe.content_type.should == 'application/jose'
     end
   end
 

data/spec/json/jwk_spec.rb

@@ -10,14 +10,14 @@ describe JSON::JWK do
 
   context 'when RSA public key given' do
     let(:jwk) { JSON::JWK.new public_key }
-    it { jwk.keys.should include :kty, :e, :n }
+    it { jwk.keys.collect(&:to_sym).should include :kty, :e, :n }
     its(:kty) { jwk[:kty].should == :RSA }
     its(:e) { jwk[:e].should == UrlSafeBase64.encode64(public_key.e.to_s(2)) }
     its(:n) { jwk[:n].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 }
-      it { jwk.keys.should include :kid, :use }
+      it { jwk.keys.collect(&:to_sym).should include :kid, :use }
       its(:kid) { jwk[:kid].should == '12345' }
       its(:use) { jwk[:use].should == :sig }
     end
@@ -43,7 +43,7 @@ describe JSON::JWK do
     [256, 384, 512].each do |digest_length|
       describe "EC#{digest_length}" do
         let(:jwk) { JSON::JWK.new public_key(:ecdsa, digest_length: digest_length) }
-        it { jwk.keys.should include :kty, :crv, :x, :y }
+        it { jwk.keys.collect(&:to_sym).should include :kty, :crv, :x, :y }
         its(:kty) { jwk[:kty].should == :EC }
         its(:x) { jwk[:x].should == expected_coodinates[digest_length][:x] }
         its(:y) { jwk[:y].should == expected_coodinates[digest_length][:y] }

data/spec/json/jws_spec.rb

@@ -41,7 +41,7 @@ describe JSON::JWS do
 
   describe '#content_type' do
     it do
-      jws.content_type.should == 'application/jws'
+      jws.content_type.should == 'application/jose'
     end
   end
 

data/spec/json/jwt_spec.rb

@@ -149,6 +149,7 @@ describe JSON::JWT do
         it 'should skip verification' do
           expect do
             jwt = JSON::JWT.decode jws.to_s, :skip_verification
+            jwt.header.should == {'alg' => 'HS256', 'typ' => 'JWT'}
           end.not_to raise_error
         end
       end
@@ -161,6 +162,15 @@ describe JSON::JWT do
       it 'should decryptable' do
         JSON::JWT.decode(input, private_key).should be_a JSON::JWE
       end
+
+      context 'when :skip_decryption given as secret/key' do
+        it 'should skip verification' do
+          expect do
+            jwe = JSON::JWT.decode input, :skip_decryption
+            jwe.header.should == {'alg' => 'RSA1_5', 'enc' => 'A128CBC+HS256'}
+          end.not_to raise_error
+        end
+      end
     end
 
     context 'when JSON parse failed' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -42,16 +42,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bindata
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - Rakefile
 - VERSION
 - json-jwt.gemspec
+- lib/json/jose.rb
 - lib/json/jwe.rb
 - lib/json/jwk.rb
 - lib/json/jwk/set.rb
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and