rsence-pre 2.3.0.12 → 2.3.0.13

data/VERSION

@@ -1 +1 @@
-2.3.0.12.pre
+2.3.0.13.pre

data/conf/default_conf.yaml

@@ -139,6 +139,9 @@
     # Timeout controls how long a session is valid
     :timeout_secs:       900 # 15 minutes
     #
+    # Separate timeout for the first request to prevent session flooding
+    :timeout_first:       15 # 15 seconds
+    #
     # Key length controls the length of the random-part of the key.
     :key_length:   12
     #
@@ -166,6 +169,9 @@
     # A safe value for a 60 second poll interval is 120 (default).
     :cloned_session_expires_in: 120
     #
+    # Session store/expiry sleep (in seconds) between sessions (to prevent too high loads on cleanup tasks)
+    :db_sleep: 0.001
+    #
     # Message strings
     :messages:
       #
@@ -174,6 +180,15 @@
         :title: 'Invalid Session'
         :descr: 'Your session is invalid. Please reload the page to continue.'
         :uri:    '/'
+    #
+    # MongoDB-specific settings
+    :mongo:
+      #
+      # MongoDB Connection Pool Timeout:
+      :pool_timeout: 10 # seconds
+      #
+      # MongoDB Connection Pool Size:
+      :pool_size: 500 # amount of connections
   #
   # Database configuration
   :database:

data/js/comm/session/session.js

@@ -28,7 +28,7 @@ COMM.Session = HClass.extend({
     var _this = this;
     _this.sha = SHA.nu(8);
     _this.sha_key = _this.sha.hexSHA1(((new Date().getTime())*Math.random()*1000).toString());
-    _this.ses_key = '0:.o.:'+_this.sha_key;
+    _this.ses_key = '0:1:'+_this.sha_key;
     _this.req_num = 0;
   },
   
@@ -46,7 +46,7 @@ COMM.Session = HClass.extend({
     var _this = this,
         _shaKey = _this.sha.hexSHA1(_sesKey+_this.sha_key);
     _this.req_num++;
-    _this.ses_key = _this.req_num+':.o.:'+_shaKey;
+    _this.ses_key = _this.req_num+':1:'+_shaKey;
     _this.sha_key = _shaKey;
   }
 }).nu();

data/lib/rsence/daemon.rb

@@ -327,6 +327,7 @@ module RSence
         Daemon.start_logging( self )
       end
       
+      ses_expire_loop
       autosave_loop if RSence.config[:daemon][:autosave_interval] > 0
       start_broker( conf )
       
@@ -352,6 +353,21 @@ module RSence
       RSence.config[:http_server][:port]
     end
 
+    # Expires old sessions once a second
+    def ses_expire_loop
+      Thread.new do
+        Thread.pass
+        while true
+          sleep 1
+          begin
+            @transporter.sessions.expire_sessions if @transporter.online?
+          rescue => e
+            warn "Session expiration error: #{e.inspect}"
+          end
+        end
+      end
+    end
+
     # Saves plugin and session state periodically
     def autosave_loop
       Thread.new do
@@ -383,6 +399,7 @@ module RSence
       
       Process.setsid
       
+      ses_expire_loop
       autosave_loop if RSence.config[:daemon][:autosave_interval] > 0
       start_broker( conf )
       yield @broker
@@ -428,6 +445,7 @@ module RSence
       # transporter_state = @transporter.online?
       # @transporter.online = false
       begin
+        # Store remaining active sessions
         @transporter.sessions.store_sessions
       rescue => e
         puts "Exception #{e.inspect} occurred while storing sessions"

data/lib/rsence/session/mongo_sessionstorage.rb

@@ -7,15 +7,13 @@ require 'mongo'
 class MongoSessionStorage
   
   # Poor-man's connection string parser:
-  def parse_db_uri( db_pool_size=48, db_pool_timeout=2 )
+  def parse_db_uri
     db_str = @db_uri.split('mongodb://')[1]
     ( db_auth_str, db_conn_str ) = db_str.split('@')
     ( db_username, db_password ) = db_auth_str.split(':')
     ( db_host, db_port_name_str ) = db_conn_str.split(':')
     ( db_port, db_name ) = db_port_name_str.split('/')
     return {
-      :pool_size => db_pool_size,
-      :pool_timeout => db_pool_timeout,
       :host => db_host,
       :port => db_port,
       :username => db_username,
@@ -29,8 +27,8 @@ class MongoSessionStorage
     # mongodb://rsence:2N74krTMURIpSr6Y91Hy@localhost:37035/rsence_sessions
     conn = parse_db_uri
     @conn = Mongo::Connection.new( conn[:host], conn[:port], {
-      :pool_size => conn[:pool_size],
-      :pool_timeout => conn[:timeout],
+      :pool_size => @config[:mongo][:pool_size],
+      :pool_timeout => @config[:mongo][:pool_timeout],
       :auths => [{
         'username' => conn[:username],
         'password' => conn[:password],
@@ -91,11 +89,14 @@ class MongoSessionStorage
     @ses_coll.find.each do |ses_row|
       ses_id   = ses_row['_id'].to_s
       ses_data_bin = ses_row['ses_data']
+      puts "ses_data_bin: #{ses_data_bin.inspect}"
       if ses_data_bin.nil?
+        puts "removing #{ses_id}"
         remove_session_data( ses_id )
       else
         begin
           ses_data = Marshal.load( ses_data_bin.to_s )
+          puts "ses_data: #{ses_data.inspect}"
         rescue => e
           warn "Unable to restore session #{ses_id}"
           remove_session_data( ses_id )

data/lib/rsence/sessionmanager.rb

@@ -53,13 +53,15 @@ module RSence
     ### Creates a new session
     def init_ses( msg=nil, ses_seed=false )
 
+      ## Perform old-session cleanup before creating another
+      # expire_sessions
+
       if ses_seed == false
         ses_seed = @randgen.gen
       end
     
       ## Assigns new timeout for the session
-      time_now = Time.now.to_i # seconds since epoch
-      timeout  = time_now + @config[:timeout_secs]
+      timeout  = Time.now.to_i + @config[:timeout_first] #@config[:timeout_secs]
     
       ## Creates a new session key
       ses_key    = @randgen.gen
@@ -69,7 +71,7 @@ module RSence
     
       ## Makes a new database row for the session, returns its id
       ses_id     = new_ses_id( cookie_key, ses_key, timeout )
-    
+
       ses_sha = SHA1.hexdigest(ses_key+ses_seed)
     
       ### Default session data structure,
@@ -134,6 +136,9 @@ module RSence
     end
   
     def refresh_ses( msg, ses_data, ses_id, ses_key, ses_seed )
+      ## Perform old-session cleanup before extending another
+      # expire_sessions
+
       # new time-out
       ses_data[:timeout] = Time.now.to_i + @config[:timeout_secs]
     
@@ -233,6 +238,9 @@ module RSence
     ### Otherwise stops the client and returns false.
     def check_ses( msg, ses_key, ses_seed=false )
     
+      ## Perform old-session cleanup while checking for another
+      # expire_sessions
+
       # first, check if the session key exists (sync)
       if @session_keys.has_key?( ses_key )
       
@@ -302,12 +310,15 @@ module RSence
       else
         cookie_key = nil
       end
-      unless @session_cookie_keys.has_key?( cookie_key )
+      if @session_cookie_keys.has_key?( cookie_key )
+        timeout = Time.now.to_i + @config[:timeout_secs]
+      else
         cookie_key = init_ses
+        timeout = Time.now.to_i + @config[:timeout_first]
       end
       ses_id = @session_cookie_keys[ cookie_key ]
       ses_data = @sessions[ ses_id ]
-      ses_data[:timeout] = Time.now.to_i + @config[:timeout_secs]
+      ses_data[:timeout] = timeout
       renew_cookie_req_res( request, response, cookie_key, request.fullpath )
       return ses_data
     end
@@ -507,7 +518,7 @@ module RSence
         ses_id = @session_cookie_keys[ cookie_key ]
         
         # Expire the session
-        expire_session( ses_id )
+        # expire_session( ses_id )
         
         return true
         
@@ -527,9 +538,6 @@ module RSence
         query = request.query
       end
       
-      ## Perform old-session cleanup on all sync:s
-      expire_sessions
-      
       ## The 'ses_id' request query key is required.
       ## The client defaults to '0', which means the
       ## client needs to be initialized.
@@ -550,7 +558,7 @@ module RSence
         
         ## The client tells that its ses_key is '0',
         ## until the server tells it otherwise.
-        (req_num, ses_seed) = ses_key.split(':.o.:')
+        (req_num, ses_seed) = ses_key.split(':1:')
         
         if req_num == '0'
           

data/lib/rsence/sessionstorage.rb

@@ -97,6 +97,7 @@ module RSence
         end
         begin
           store_session_data( ses_data )
+          sleep @config[:db_sleep]
         rescue => e
           warn "Unable to dump session: #{ses_id}, because: #{e.message}"
         end
@@ -173,8 +174,8 @@ module RSence
     
       if @db_avail
         remove_session_data( ses_id )
+        sleep @config[:db_sleep]
       end
-    
     end
 
     ## Expires all sessions that meet the timeout criteria
@@ -183,12 +184,13 @@ module RSence
       # Loop through all sessions in memory:
       ses_ids = @sessions.keys.clone
       ses_ids.each do |ses_id|
-      
-        timed_out = @sessions[ ses_id ][:timeout] < Time.now.to_i
-      
+        if @sessions[ses_id] and @sessions[ses_id].has_key?(:timeout)
+          timed_out = @sessions[ ses_id ][:timeout] < Time.now.to_i
+        else
+          timed_out = true
+        end
         ## Deletes the session, if the session is too old
         expire_session( ses_id ) if timed_out
-      
       end
     end
 

data/lib/rsence/transporter.rb

@@ -148,7 +148,7 @@ module RSence
         request_content = JSON.parse( request_body )
       rescue JSON::ParseError
         warn "Request body isn't valid JSON: #{request_body}"
-        request_content = ['-1:.o.:INVALID',{},[]]
+        request_content = ['-1:1:INVALID',{},[]]
       end
       options[:ses_key] = request_content[0]
       options[:values] = request_content[1]

data/plugins/main/main.rb

@@ -38,7 +38,7 @@ class MainPlugin < Plugin
   #         :servlet => true,
   #         :cookie  => (req_num==0),
   #         :query   => {
-  #           'ses_key' => "#{req_num}:.o.:#{sha_key}"
+  #           'ses_key' => "#{req_num}:1:#{sha_key}"
   #         }
   #       }
   #     )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.3.0.12
+  version: 2.3.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps