jwt 0.1.3 → 0.1.4

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('jwt', '0.1.3') do |p|
+Echoe.new('jwt', '0.1.4') do |p|
   p.description    = "JSON Web Token implementation in Ruby"
   p.url            = "http://github.com/progrium/ruby-jwt"
   p.author         = "Jeff Lindsay"

data/jwt.gemspec

@@ -2,12 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jwt}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Jeff Lindsay}]
-  s.cert_chain = [%q{/Users/progrium/.gem/gem-public_cert.pem}]
-  s.date = %q{2011-06-30}
+  s.date = %q{2011-11-11}
   s.description = %q{JSON Web Token implementation in Ruby}
   s.email = %q{jeff.lindsay@twilio.com}
   s.extra_rdoc_files = [%q{lib/jwt.rb}]
@@ -17,7 +16,6 @@ Gem::Specification.new do |s|
   s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{jwt}
   s.rubygems_version = %q{1.8.5}
-  s.signing_key = %q{/Users/progrium/.gem/gem-private_key.pem}
   s.summary = %q{JSON Web Token implementation in Ruby}
 
   if s.respond_to? :specification_version then

data/lib/jwt.rb

@@ -1,8 +1,8 @@
 # 
 # JSON Web Token implementation
 # 
-# Minimum implementation based on this spec:
-# http://self-issued.info/docs/draft-jones-json-web-token-01.html
+# Should be up to date with the latest spec:
+# http://self-issued.info/docs/draft-jones-json-web-token-06.html
 
 require "base64"
 require "openssl"
@@ -43,35 +43,40 @@ module JWT
   end  
   
   def self.encode(payload, key, algorithm='HS256')
+    algorithm ||= "none"
     segments = []
     header = {"typ" => "JWT", "alg" => algorithm}
     segments << base64url_encode(header.to_json)
     segments << base64url_encode(payload.to_json)
     signing_input = segments.join('.')
-    signature = sign(algorithm, signing_input, key)
-    segments << base64url_encode(signature)
+    if algorithm != "none"
+      signature = sign(algorithm, signing_input, key)
+      segments << base64url_encode(signature)
+    else
+      segments << ""
+    end
     segments.join('.')
   end
   
   def self.decode(jwt, key=nil, verify=true)
     segments = jwt.split('.')
-    raise JWT::DecodeError.new("Not enough or too many segments") unless segments.length == 3
+    raise JWT::DecodeError.new("Not enough or too many segments") unless [2,3].include? segments.length
     header_segment, payload_segment, crypto_segment = segments
     signing_input = [header_segment, payload_segment].join('.')
     begin
       header = JSON.parse(base64url_decode(header_segment))
       payload = JSON.parse(base64url_decode(payload_segment))
-      signature = base64url_decode(crypto_segment)
+      signature = base64url_decode(crypto_segment) if verify
     rescue JSON::ParserError
       raise JWT::DecodeError.new("Invalid segment encoding")
     end
-    if verify
+    if verify == true
       algo = header['alg']
 
       if ["HS256", "HS384", "HS512"].include?(algo)
         raise JWT::DecodeError.new("Signature verification failed") unless signature == sign_hmac(algo, signing_input, key)
       elsif ["RS256", "RS384", "RS512"].include?(algo)
-        verify_rsa(algo, key, signing_input, signature)
+        raise JWT::DecodeError.new("Signature verification failed") unless verify_rsa(algo, key, signing_input, signature)
       else
         raise JWT::DecodeError.new("Algorithm not supported")
       end

data/spec/jwt.rb

@@ -27,12 +27,19 @@ describe JWT do
     decoded_payload.should == example_payload
   end
 
-  it "raises exception with wrong key" do
+  it "raises exception with wrong hmac key" do
     right_secret = 'foo'
     bad_secret = 'bar'
-    jwt_message = JWT.encode(@payload, right_secret)
+    jwt_message = JWT.encode(@payload, right_secret, "HS256")
     lambda { JWT.decode(jwt_message, bad_secret) }.should raise_error(JWT::DecodeError)
   end
+
+  it "raises exception with wrong rsa key" do
+    right_private_key = OpenSSL::PKey::RSA.generate(512)
+    bad_private_key = OpenSSL::PKey::RSA.generate(512)
+    jwt = JWT.encode(@payload, right_private_key, "RS256")
+    lambda { JWT.decode(jwt, bad_private_key.public_key) }.should raise_error(JWT::DecodeError)
+  end
   
   it "allows decoding without key" do
     right_secret = 'foo'
@@ -45,4 +52,11 @@ describe JWT do
   it "raises exception on unsupported crypto algorithm" do
     lambda { JWT.encode(@payload, "secret", 'HS1024') }.should raise_error(NotImplementedError)
   end
+  
+  it "encodes and decodes plaintext JWTs" do
+    jwt = JWT.encode(@payload, nil, nil)
+    jwt.split('.').length.should == 2
+    decoded_payload = JWT.decode(jwt, nil, nil)
+    decoded_payload.should == @payload
+  end
 end

metadata

@@ -1,42 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: jwt
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeff Lindsay
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBADANBgkqhkiG9w0BAQUFADBEMRUwEwYDVQQDDAxqZWZm
-  LmxpbmRzYXkxFjAUBgoJkiaJk/IsZAEZFgZ0d2lsaW8xEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wHhcNMTAwNTA0MjE0NzE3WhcNMTEwNTA0MjE0NzE3WjBEMRUwEwYDVQQD
-  DAxqZWZmLmxpbmRzYXkxFjAUBgoJkiaJk/IsZAEZFgZ0d2lsaW8xEzARBgoJkiaJ
-  k/IsZAEZFgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb1P6c
-  /CN4l2pYBO0d5y7YHW3XJbj5d+5c1E9m2PcvUJ4Vjr7ISQM1SYpwixnWMBXBpzc1
-  En9YB+PYBEOOaIRh2G23aKdu7PnYQhze91qOBcHnf6LOckq25NbWQO8eaiXD3w5W
-  HRXOcmzigyTYRIhXBa93eMSihWAXThcfGFKNbtKerVhytT/UVHZU3pr9gCvt9vD0
-  aBmwMwvDlpO72eXPr5ow3Z+VzCc51iBNC07uvR/wFQ6/lS8ULBpHI9wcdo67wdv5
-  SaSZSGZCmG1pXov0Ahji7yqFMQ9oot5RDPZavZN3Fh3n6e2hdcSMlLgGkEGYaBVx
-  gdQFudko7rc5cWTdAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
-  A1UdDgQWBBRXFNQ8j0GGeMiiPWhAlHB356JPGDANBgkqhkiG9w0BAQUFAAOCAQEA
-  VzMJe10HfJtglbDah9h9lxv8uzK2uV7bXRcIbMCGEdx8cByM+cfKOnoWVDQBVPWA
-  VznqXdPsrVC70PAMMTk66ro2ciyudilVEuxEl7rhaz0tj9FzNyJUHBKCD4KpGwkC
-  K435qpJsHMi9k0KxY17grmsE2Hq60lFLK8ZrqgDblEAKTeaGAykMxp9KJOwAKnY2
-  4lUY/SVtRuTk0YXsIPNFLYUhYt7arkJtkwWV41GWhj7PbcM5uk5sGoh0aueMzY7f
-  TvklqXtUw3g3PcoJ8CZw68WaB2/MuJXUehRCZThhkBwi8bDKZzh4rtI/WEb1EgDs
-  WZqts+sMhUpDxxL+p6p6bQ==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2011-06-30 00:00:00 Z
+date: 2011-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json

data.tar.gz.sig

@@ -1,2 +0,0 @@
-s��f:]�����Ӟk�QF��'��1���څ�g��,��n�����Fg�[�}��nf�m&w:!0jx��z�6?i�?�q劢�}���ƴ{Ú!1����a<ey�E;����p�@���C��r-N}���A��Eqĵ.�s�s!���U��M��旓C�QW���M#�΢%�\��6-�o���׉��hD˨��o1v�9Jk���O�ĩ`��k
-ޤQ�r�%�o.i�e��5�P