sbsm 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97b5380c3233416078670d095b29e76843a7476b
-  data.tar.gz: 2f4f64aaf4eab500ff12dc698d1fc6249b3990af
+  metadata.gz: fc9f5d89b19d63cc1e535df21aeb118e6b701b94
+  data.tar.gz: f938b3e39401c6edce02fac8fbbc50aa92fcf91c
 SHA512:
-  metadata.gz: '08d78ff9c24108e41163516ed78e2a90f1697b311f00c409aec9480d7f694be12bcf3b95b73589bd84eccf982201ef5b0801fd2d7fb89656dde83d4d3ec559fc'
-  data.tar.gz: 1897c958748d506cf989c0057a3f86f386c8172d04855e507f8126ec38731284d8c37ad4a7b0466fb7c779a7e3e3f6c72a4446925ec0eb1d03e70e102ac8f5f2
+  metadata.gz: d3053e25db4359a6e37239361a402dc39b137742adc082002c0834633be846e064b0e6724f1e9e549cac0c23fb298bbb7e3aa473d658263cf8a9976d8434993b
+  data.tar.gz: 79952026cd9423c00d419e9bd6731fd6550f99c97dd288345e1c357f224577aaa2a85cea9370ae08fcfb850a10c07f137b1577ce1847b86d6a3d5a33a2a9b1a6

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.5.3 / 05.07.2017
+
+* Add process_late for ODDB.org limit_request
+* Fix clearing/cap_max_state in sessionstore
+* Delete some variable to save space in session_store
+
 === 1.5.2 / 04.07.2017
 
 * Fix handling true/false values in cookie

data/lib/sbsm/app.rb

@@ -152,6 +152,8 @@ module SBSM
                             :path     => "/",
                             :expires  => (Time.now + (60 * 60 * 24 * 365 * 10))})
       response.set_cookie(SESSION_ID, { :value => session_id, :path => '/' ,  :expires => (Time.now + (60 * 60 * 24 * 365 * 10)) })
+      request = nil
+      session.rack_request = nil
       @@last_session = session
       if response.headers['Set-Cookie'].to_s.index(session_id)
         SBSM.debug "finish session_id.1 #{session_id}: matches response.headers['Set-Cookie'] #{response.headers['Set-Cookie']}"

data/lib/sbsm/session.rb

@@ -38,9 +38,9 @@ module SBSM
   class	Session
 
 		attr_reader :user, :active_thread, :key, :cookie_input, :persistent_cookie_name, :post_content,
-        :server_name, :server_port, :request_params, :request_method, :request_origin,
+        :server_name, :server_port, :user_agent, :request_params, :request_method, :request_origin,
 			:unsafe_input, :valid_input, :request_path, :request_post, :cgi, :attended_states
-    attr_accessor :validator, :trans_handler, :app
+    attr_accessor :validator, :trans_handler, :app, :rack_request
 		PERSISTENT_COOKIE_NAME = "sbsm-persistent-cookie"
 		DEFAULT_FLAVOR = 'sbsm'
 		DEFAULT_LANGUAGE = 'en'
@@ -161,6 +161,9 @@ module SBSM
         @attended_states.size
 			end
 		end
+    def key=(key)
+      @key = key
+    end
 		def __checkout
 			@attended_states.each_value { |state| state.__checkout }
 			@attended_states.clear
@@ -203,36 +206,36 @@ module SBSM
 		end
     def process_rack(rack_request:)
       start = Time.now
-      @passthru = false
-      @disposition = false
-      @request_path ||= rack_request.path
-      @rack_request = rack_request
-      @post_content = nil
+      html = @mutex.synchronize do
+        begin
+          @passthru = false
+          @disposition = false
+          @request_path ||= rack_request.path
+          @rack_request = rack_request
+          @post_content = nil
 
-      if rack_request.request_method.eql?('POST')
-         rack_request.params.each do |k, v|
-           # needed to test POST requests generated by curl (first parameter) or ARC (second parameter)
-          if /xml/i.match(k)
-            @post_content = "#{k} #{v}"
-            break
+          if rack_request.request_method.eql?('POST')
+            rack_request.params.each do |k, v|
+              # needed to test POST requests generated by curl (first parameter) or ARC (second parameter)
+              if /xml/i.match(k)
+                @post_content = "#{k} #{v}"
+                break
+              end
+            end
+            begin
+              # needed for request generated by https://github.com/wiztools/rest-client
+              rack_request.body.rewind # just to be sure
+              @post_content = rack_request.body.read
+            end unless @post_content
+            if @post_content
+              SBSM.debug "@post_content is #{@post_content}"
+            else
+              SBSM.debug "rack_request is #{rack_request}"
+            end
           end
-        end
-        begin
-          # needed for request generated by https://github.com/wiztools/rest-client
-          rack_request.body.rewind # just to be sure
-          @post_content = rack_request.body.read
-        end unless @post_content
-        if @post_content
-          SBSM.debug "@post_content is #{@post_content}"
-        else
-          SBSM.debug "rack_request is #{rack_request}"
-        end
-      end
 
-      rack_request.params.each { |key, val| @cgi.params.store(key, val) }
-      @trans_handler.translate_uri(rack_request)
-      html = @mutex.synchronize do
-        begin
+          rack_request.params.each { |key, val| @cgi.params.store(key, val) }
+          @trans_handler.translate_uri(rack_request)
           @request_method =rack_request.request_method
           @request_path = rack_request.path
           if rack_request.env
@@ -270,6 +273,7 @@ module SBSM
           @zone = @active_state.zone
           @active_state.touch
           cap_max_states
+          self.process_late() if self.respond_to?(:process_late) # needed for ODDB.org limit_request
         ensure
           @user_input_imported = false
         end
@@ -277,9 +281,6 @@ module SBSM
       end
       (@@stats[@request_path] ||= []).push(Time.now - start)
       html
-    rescue  => err
-        SBSM.info "Error in process_rack #{err.backtrace[0..5].join("\n")}"
-        raise err
     end
 		def error(key)
 			@state.error(key) if @state.respond_to?(:error)
@@ -454,8 +455,6 @@ module SBSM
           "#{key}="
         end
       end.join(';')
-    rescue => error
-      binding.pry
     end
 		def http_headers
         @state.http_headers

data/lib/sbsm/session_store.rb

@@ -61,6 +61,7 @@ module SBSM
                    unknown_user: UNKNOWN_USER.new,
                    multi_threaded: nil)
       fail "You must specify an app!" unless app
+      @@sessions = {}
       @cleaner = run_cleaner if(self.class.const_get(:RUN_CLEANER))
       @app = app
       @system = persistence_layer
@@ -75,23 +76,25 @@ module SBSM
       @validator = validator
     end
     def cap_max_sessions(now = Time.now)
-      if(@@sessions.size > self::class::CAP_MAX_THRESHOLD)
-        SBSM.info "too many sessions! Keeping only #{self::class::MAX_SESSIONS}"
-        sess = nil
-        sorted = @@sessions.values.sort
-        sorted[0...(-self::class::MAX_SESSIONS)].each { |sess|
-          sess.__checkout
-          @@sessions.delete(sess.key)
-        }
-        if(sess)
-          age = sess.age(now)
-          SBSM.info sprintf("deleted all sessions that had not been accessed for more than %im %is", age / 60, age % 60)
+        if(@@sessions.size > self::class::CAP_MAX_THRESHOLD)
+          SBSM.info "too many sessions! Keeping only #{self::class::MAX_SESSIONS}"
+          sess = nil
+          @@sessions.values.sort[0...(-self::class::MAX_SESSIONS)].each { |sess|
+            sess.__checkout
+            @@sessions.delete(sess.key)
+          }
+          if(sess)
+            age = sess.age(now)
+            SBSM.info sprintf("deleted all sessions that had not been accessed for more than %im %is", age / 60, age % 60)
+          end
         end
-      end
+      seconds = (Time.now.to_i - now.to_i)
+      SBSM.warn sprintf("cap_max_sessions to #{self::class::CAP_MAX_THRESHOLD}. took %d seconds", seconds)
     end
     def clean
       now = Time.now
-      @@sessions.delete_if { |key, s|
+      old_size = @@sessions.size
+      @@sessions.delete_if do |key, s|
         begin
           if s.respond_to?(:expired?)
             if s.expired?(now)
@@ -107,8 +110,9 @@ module SBSM
         rescue
           true
         end
-      }
-      #cap_max_sessions(now)
+      end
+      seconds = (Time.now.to_i - now.to_i)
+      SBSM.warn sprintf("Cleaned #{old_size - @@sessions.size} sessions. Took %d seconds", seconds)
     end
     def SessionStore.sessions
       @@sessions
@@ -148,6 +152,7 @@ module SBSM
         unless((s = @@sessions[key]) && !s.expired?)
           s = @@sessions[key] = @session_class.new(app: @app, cookie_name: @cookie_name, trans_handler: @trans_handler, validator: @validator, unknown_user: @unknown_user)
         end
+        s.key=key
         s.reset()
         s.touch()
         s

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/test/test_session_store.rb

@@ -0,0 +1,88 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+#--
+#
+# State Based Session Management
+# Copyright (C) 2004 Hannes Wyss
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zürich, Switzerland
+# hwyss@ywesee.com
+#
+# TestSession -- sbsm -- 22.10.2002 -- hwyss@ywesee.com
+#++
+
+require 'minitest/autorun'
+require 'sbsm/session_store'
+require 'sbsm/validator'
+require 'sbsm/trans_handler'
+require 'sbsm/app'
+require 'rack'
+require 'rack/test'
+
+begin
+  require 'pry'
+rescue LoadError
+end
+
+class SBSM::Session
+  attr_accessor :mtime
+end
+class SBSM::SessionStore
+  CAP_MAX_THRESHOLD = 2
+  MAX_SESSIONS = 3
+end
+class TestSessionStore < Minitest::Test
+  include Rack::Test::Methods
+	def setup
+    @app =  SBSM::App.new()
+    @session = SBSM::Session.new(app: @app)
+    @session_store = SBSM::SessionStore.new(app: @app)
+	end
+
+  def app
+    @app
+  end
+
+  IDS = ['1', '2', '3', '4', '5', '6', '7']
+  NR_SESSIONS = IDS.size
+  def test_clean
+    assert_equal(0, SBSM::SessionStore.sessions.size)
+    IDS.each do |session_id|
+      @session_store[session_id].mtime = Time.now - (SBSM::Session::EXPIRES+2)
+    end
+    assert_equal(NR_SESSIONS, SBSM::SessionStore.sessions.size)
+    @session_store.clean
+    assert_equal(0, SBSM::SessionStore.sessions.size)
+  end
+  def test_session_store_clear
+    IDS.each do |session_id|
+      @session_store[session_id]
+    end
+    assert_equal(NR_SESSIONS, SBSM::SessionStore.sessions.size)
+    SBSM::SessionStore.clear
+    assert_equal(0, SBSM::SessionStore.sessions.size)
+  end
+  def test_session_cap_max_session
+    IDS.each do |session_id|
+      @session_store[session_id]
+    end
+    assert_equal(NR_SESSIONS, SBSM::SessionStore.sessions.size)
+    @session_store.cap_max_sessions
+    assert_equal(2, NR_SESSIONS - SBSM::SessionStore::CAP_MAX_THRESHOLD - SBSM::SessionStore::MAX_SESSIONS)
+    assert_equal(2+1, SBSM::SessionStore.sessions.size)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -305,6 +305,7 @@ files:
 - test/test_rack_app.rb
 - test/test_redirect.rb
 - test/test_session.rb
+- test/test_session_store.rb
 - test/test_state.rb
 - test/test_trans_handler.rb
 - test/test_user.rb
@@ -350,6 +351,7 @@ test_files:
 - test/test_rack_app.rb
 - test/test_redirect.rb
 - test/test_session.rb
+- test/test_session_store.rb
 - test/test_state.rb
 - test/test_trans_handler.rb
 - test/test_user.rb