cassiopeia 0.0.8 → 0.0.9

data/README.rdoc

@@ -7,6 +7,7 @@
 - Yet another custom CAS client/server implementation. This plugin allows you to perform single-server authorization between two different rails applications. 
 
 = Changelog:
+- 0.0.9: The bug with multiple concurrent requests processing fixed.
 - 0.0.8: Full request saving support via rack middleware.
 - 0.0.7: Some code for redirection added. Added webpath prefix support.
 - 0.0.6: Tiny refactoring.

data/Rakefile

@@ -10,7 +10,7 @@ PKG_FILES = FileList[ '[a-zA-Z]*',  'lib/**/*' ]
 
 spec = Gem::Specification.new do |s|
   s.name = "cassiopeia"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
   s.author = "smecsia"
   s.email = "smecsia@gmail.com"
   #s.homepage = ""

data/lib/cassiopeia/config.rb

@@ -16,12 +16,14 @@ module Cassiopeia
     :service_id => nil,
     :current_user_key => "current_user",
     :format => "js",
-    :rack_session_store => "cas_rack_session",
-    :rack_session_key => "rack.session",
     :rack_request_uri_key => "REQUEST_URI",
     :rack_query_string_key => "QUERY_STRING",
     :rack_save_keys => "REQUEST_METHOD QUERY_STRING REQUEST_URI",
-    :rack_unique_req_key => "cas_req_key"
+    :rack_session_store => "cas_rack_session",
+    :rack_session_key => "rack.session",
+    :rack_unique_req_key => "cas_req_key",
+    :rack_session_store_timeout => 1,
+    :rack_session_store_expires_at_key => "cas_req_expires"
   }
   CONFIG_PATH = "#{RAILS_ROOT}/config/cassiopeia.yml"
   @@conf = {}

data/lib/cassiopeia/rack_restore_request.rb

@@ -7,6 +7,8 @@ module Cassiopeia
     CAS_QUERY_STRING_KEY = Cassiopeia::CONFIG[:rack_query_string_key]
     CAS_SAVE_KEYS = Cassiopeia::CONFIG[:rack_save_keys]
     CAS_UNIQUE_REQ_KEY = Cassiopeia::CONFIG[:rack_unique_req_key]
+    CAS_REQ_EXPIRES_AT_KEY = Cassiopeia::CONFIG[:rack_session_store_expires_at_key]
+    CAS_REQ_TIMEOUT = Cassiopeia::CONFIG[:rack_session_store_timeout]
 
     def initialize( app )
       @app = app
@@ -39,13 +41,31 @@ module Cassiopeia
       env[CAS_QUERY_STRING_KEY] && env[CAS_QUERY_STRING_KEY].match(CAS_TICKET_ID_KEY.to_s) && env[CAS_RACK_SESSION_KEY] && env[CAS_RACK_SESSION_KEY][CAS_RACK_SESSION_STORE]
     end
 
+    def remove_expired_headers(env)
+      if(env[CAS_RACK_SESSION_KEY] && env[CAS_RACK_SESSION_KEY][CAS_RACK_SESSION_STORE])
+        stores = env[CAS_RACK_SESSION_KEY][CAS_RACK_SESSION_STORE]
+        stores.each do |key, store|
+          if store && store[CAS_REQ_EXPIRES_AT_KEY] && store[CAS_REQ_EXPIRES_AT_KEY] >= DateTime.now 
+            stores.delete key
+          end
+        end
+      end
+    end
+
+    def generate_expiration
+        DateTime.now() + CAS_REQ_TIMEOUT / 24.0 / 60.0
+    end
+
     def save_headers(env)
       if(env[CAS_RACK_SESSION_KEY])
+        remove_expired_headers(env)
         req_key = store_req_key(env)
-        env[CAS_RACK_SESSION_KEY][CAS_RACK_SESSION_STORE] = { req_key => {}}
+        env[CAS_RACK_SESSION_KEY][CAS_RACK_SESSION_STORE] = {} unless env[CAS_RACK_SESSION_KEY][CAS_RACK_SESSION_STORE]
+        store = env[CAS_RACK_SESSION_KEY][CAS_RACK_SESSION_STORE]
+        store[req_key] = { CAS_REQ_EXPIRES_AT_KEY => generate_expiration }
         env.each do |key,value|
           if env[key] && (key.is_a? String) && (key.match("HTTP_") || CAS_SAVE_KEYS.match(key))
-            env[CAS_RACK_SESSION_KEY][CAS_RACK_SESSION_STORE][req_key][key] = value
+            store[req_key][key] = value
           end
         end
       end

data/lib/cassiopeia.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 module Cassiopeia
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
   autoload :User, 'cassiopeia/user'
   autoload :Base, 'cassiopeia/base'
   autoload :Exception, 'cassiopeia/base'
@@ -19,7 +19,7 @@ module Cassiopeia
       ActiveRecord::Base.send :extend, ActiveRecordServerMixin
       ActionController::Base.send :extend, ActionControllerClientMixin
       Rails.configuration.middleware.use RackRestoreRequest if CONFIG[:service_id]
-      puts "Cassiopeia 0.0.8 enabled"
+      puts "Cassiopeia 0.0.9 enabled"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassiopeia
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - smecsia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +04:00
+date: 2010-04-09 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency