json-jwt 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/json/jwe.rb

@@ -2,4 +2,4 @@ module JSON
   class JWE < JWT
     # TODO
   end
-end
+end

data/lib/json/jwk.rb

@@ -1,6 +1,6 @@
 module JSON
   class JWK < Hash
-    class UnknownAlgorighm < JWT::Exception; end
+    class UnknownAlgorithm < JWT::Exception; end
 
     def initialize(public_key, options = {})
       replace encode(public_key, options)
@@ -17,7 +17,7 @@ module JSON
       when 'secp521r1'
         :'P-521'
       else
-        raise UnknownAlgorighm.new('Unknown ECDSA Curve')
+        raise UnknownAlgorithm.new('Unknown ECDSA Curve')
       end
     end
 
@@ -40,23 +40,23 @@ 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 UnknownAlgorighm.new('Unknown Algorithm')
+        raise UnknownAlgorithm.new('Unknown Algorithm')
       end
       hash.merge(options)
     end
   end
 end
 
-require 'json/jwk/set'
+require 'json/jwk/set'

data/lib/json/jws.rb

@@ -105,4 +105,4 @@ module JSON
       self
     end
   end
-end
+end

data/lib/json/jwt.rb

@@ -10,7 +10,7 @@ module JSON
     class Exception < StandardError; end
     class InvalidFormat < Exception; end
     class VerificationFailed < Exception; end
-    class UnexpectedAlgorighm < VerificationFailed; end
+    class UnexpectedAlgorithm < VerificationFailed; end
 
     def initialize(claims)
       @header = {
@@ -30,7 +30,7 @@ module JSON
 
     def verify(signature_base_string, signature = '', public_key_or_secret = nil)
       if header[:alg].to_s == 'none'
-        raise UnexpectedAlgorighm if public_key_or_secret
+        raise UnexpectedAlgorithm if public_key_or_secret
         signature == '' or raise VerificationFailed
       else
         JWS.new(self).verify(signature_base_string, signature, public_key_or_secret)
@@ -48,16 +48,24 @@ module JSON
     end
 
     class << self
-      def decode(jwt_string, public_key_or_secret = nil)
-        raise InvalidFormat.new('Invalid JWT Format. JWT should include 2 dots.') unless jwt_string.count('.') == 2
-        header, claims, signature = jwt_string.split('.', 3).collect do |segment|
-          UrlSafeBase64.decode64 segment.to_s
+      def decode(jwt_string, key_or_secret = nil)
+        case jwt_string.count('.')
+        when 2 # JWT / JWS
+          header, claims, signature = jwt_string.split('.', 3).collect do |segment|
+            UrlSafeBase64.decode64 segment.to_s
+          end
+          signature_base_string = jwt_string.split('.')[0, 2].join('.')
+          jwt = new JSON.parse(claims, :symbolize_names => true)
+          jwt.header = JSON.parse(header, :symbolize_names => true)
+          jwt.verify signature_base_string, signature, key_or_secret
+          jwt
+        when 3 # JWE
+          # TODO: Concept code first.
+          #  jwt = JWE.decrypt ...
+          #  jwt.verify ...
+        else
+          raise InvalidFormat.new('Invalid JWT Format. JWT should include 2 or 3 dots.')
         end
-        signature_base_string = jwt_string.split('.')[0, 2].join('.')
-        jwt = new JSON.parse(claims, :symbolize_names => true)
-        jwt.header = JSON.parse(header, :symbolize_names => true)
-        jwt.verify signature_base_string, signature, public_key_or_secret
-        jwt
       rescue JSON::ParserError
         raise InvalidFormat.new("Invalid JSON Format")
       end
@@ -67,4 +75,4 @@ end
 
 require 'json/jws'
 require 'json/jwe'
-require 'json/jwk'
+require 'json/jwk'

data/spec/json/jwk_spec.rb

@@ -48,7 +48,7 @@ describe JSON::JWK do
         key = OpenSSL::PKey::EC.new('secp112r2').generate_key
         expect do
           JSON::JWK.new key
-        end.to raise_error JSON::JWK::UnknownAlgorighm, 'Unknown ECDSA Curve'
+        end.to raise_error JSON::JWK::UnknownAlgorithm, 'Unknown ECDSA Curve'
       end
     end
   end
@@ -58,7 +58,7 @@ describe JSON::JWK do
       key = OpenSSL::PKey::DSA.generate 256
       expect do
         JSON::JWK.new key
-      end.to raise_error JSON::JWK::UnknownAlgorighm, 'Unknown Algorithm'
+      end.to raise_error JSON::JWK::UnknownAlgorithm, 'Unknown Algorithm'
     end
   end
-end
+end

data/spec/json/jws_spec.rb

@@ -136,4 +136,4 @@ describe JSON::JWS do
       end
     end
   end
-end
+end

data/spec/json/jwt_spec.rb

@@ -49,7 +49,7 @@ describe JSON::JWT do
         it do
           expect do
             jwt.verify(no_signed, '', 'secret')
-          end.to raise_error JSON::JWT::UnexpectedAlgorighm
+          end.to raise_error JSON::JWT::UnexpectedAlgorithm
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json