rack-auth-cookie 0.6.0 → 0.7.0

data/lib/rack/auth/cookie.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'openssl'
 require 'rack/request'
 
@@ -55,15 +56,17 @@ module Rack
           return finish(@app, env, cookie_value)
         end
         
-        auth_datetime = Time.at(hash_data['AUTH_DATETIME']).utc
-        auth_expire_datetime = Time.at(hash_data['AUTH_EXPIRE_DATETIME']).utc
-        
-        if auth_expire_datetime < Time.now.utc
-          auth_fail = "Timed out due to inactivity"
-        end
-        
-        if auth_datetime + @@max_lifetime < Time.now.utc
-          auth_fail = "Maximum session length exceeded"
+        if !auth_fail
+          auth_datetime = Time.at(hash_data['AUTH_DATETIME']).utc
+          auth_expire_datetime = Time.at(hash_data['AUTH_EXPIRE_DATETIME']).utc
+          
+          if auth_expire_datetime < Time.now.utc
+            auth_fail = "Timed out due to inactivity"
+          end
+          
+          if auth_datetime + @@max_lifetime < Time.now.utc
+            auth_fail = "Maximum session length exceeded"
+          end
         end
         
         if auth_fail
@@ -135,7 +138,7 @@ module Rack
         # Unpack the cookie data back to a hash
         begin
           unpacked_data = raw_data.unpack("m*").first
-          hash_data = Marshal.load(unpacked_data)
+          hash_data = JSON.parse(unpacked_data)
         rescue
           raise "Unable to read cookie!"
         end
@@ -166,11 +169,11 @@ module Rack
         auth_info['AUTH_EXPIRE_DATETIME'] = Time.now.utc.to_i + @@idle_timeout
         
         # Pack the auth_info hash for cookie storage
-        cookie_data = Marshal.dump(auth_info)
-        cookie_data = [cookie_data].pack("m*")
+        json_data = auth_info.to_json
+        packed_data = [json_data].pack('m*')
         
         # Add a digest value to cookie_data to prevent tampering
-        "#{cookie_data}--#{generate_hmac(cookie_data)}"
+        "#{packed_data}--#{generate_hmac(packed_data)}"
       end
       
       def self.create_auth_cookie(env)

data/rack-auth-cookie.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |gem|
   gem.name      = 'rack-auth-cookie'
-  gem.version   = '0.6.0'
+  gem.version   = '0.7.0'
   gem.authors   = ["Daniel Berger", "Charlie O'Keefe"]
   gem.email     = 'cokeefe@globe.gov'
   gem.homepage  = 'http://www.github.com/charlieok/rack-auth-cookie'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-auth-cookie
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Daniel Berger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -07:00
+date: 2009-12-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency