sbsm 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7840c4f9bb73d0d6bb915470360a8d5578300a4
-  data.tar.gz: 6d6ab86eda66166938e161de90bccb105b89d5a3
+  metadata.gz: c6cb626e4851ec836b764fb7b362d781d0e63f3e
+  data.tar.gz: e74535cdcc374099fdc168db3f5e7c6ea2343d12
 SHA512:
-  metadata.gz: 47247200512e2e9f5e185f2492328ae7f507d6aa37e98ed3d6eddf0bdb267a4bccb33b928a7b423d649def74e2e99d4dfcae430118e01fb47f2b5230631d7437
-  data.tar.gz: 203bacf669d76975b2b5d08e4e00b8a252113e1271f90238076b83d300187f620a40d56482c94d4359c3e365c6c5d6b41fe52fa57397eb363afc6d85fb50b503
+  metadata.gz: 3a00b7d42d498ad395945d082f4a2136bc077989bfeca6c3558f07c5a9679721f4072ce3abffcff42be4b67413359776b26d401d671313f6d5043cbbccfcf7dc
+  data.tar.gz: a96428befce20e6d19e367345886205036eed9e0af0f241842c7f7f991bf10beb2c4e5d88d8bd768f500af6bb31e5c5812528234d39f162501ef8bbb540e3cef

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.3.8 / 15.05.2017
+
+* Reverted some changes to make bbmb and virbac run
+
 === 1.3.7 / 10.05.2017
 * Some changes for VIRBAC which uses viral modules and a KnownUser class
 ** Add @server_name to rack session

data/lib/sbsm/app.rb

@@ -33,18 +33,16 @@ require 'mimemagic'
 
 module SBSM
   ###
-
+  # App as a member of session
   class App
 
     def initialize()
-      SBSM.info "initialize #{self.class}"
+      SBSM.info "initialize"
     end
-
   end
 
   class RackInterface
     attr_accessor :session # thread variable!
-    attr_reader :app, :session_store
     SESSION_ID = '_session_id'
 
     # Base class for a SBSM based WebRick HTTP server
@@ -53,10 +51,11 @@ module SBSM
     #
     # === optional arguments
     #
-    # * +app+ -               the App for the Rack-Interface
+    # * +app+ -               A Ruby class used by the session
     # * +validator+ -         A Ruby class overriding the SBSM::Validator class
     # * +trans_handler+ -     A Ruby class overriding the SBSM::TransHandler class
     # * +session_class+ -     A Ruby class overriding the SBSM::Session class
+    # * +unknown_user+ -      A Ruby class overriding the SBSM::UnknownUser class
     # * +persistence_layer+ - Persistence Layer to use
     # * +cookie_name+ -       The cookie to save persistent user data
     # * +multi_threaded+ -    Allow multi_threaded SBSM (default is false)
@@ -65,7 +64,7 @@ module SBSM
     # Look at steinwies.ch
     # * https://github.com/zdavatz/steinwies.ch (simple, mostly static files, one form, no persistence layer)
     #
-    def initialize(app: ,
+    def initialize(app:,
                    validator: nil,
                    trans_handler:  nil,
                    session_class: nil,
@@ -76,12 +75,13 @@ module SBSM
                  )
       @@last_session = nil
       @app = app
-      SBSM.info "initialize validator #{validator} th #{trans_handler} cookie #{cookie_name} session #{session_class} app #{app.class} multi_threaded #{multi_threaded}"
+      SBSM.info "initialize validator #{validator} th #{trans_handler} cookie #{cookie_name} session #{session_class} app #{app} multi_threaded #{multi_threaded}"
       @session_store = SessionStore.new(app: app,
                                         persistence_layer: persistence_layer,
                                         trans_handler: trans_handler,
                                         session_class: session_class,
                                         cookie_name: cookie_name,
+                                        unknown_user: unknown_user,
                                         validator: validator,
                                         multi_threaded: multi_threaded)
     end
@@ -129,6 +129,7 @@ module SBSM
       end
       response.set_cookie(SESSION_ID, { :value => session_id, :path => '/' }) unless request.cookies[SESSION_ID]
 
+      # response.set_cookie(SBSM::Session.get_cookie_name, session_id)
       @@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']"

data/lib/sbsm/logger.rb

@@ -36,12 +36,10 @@ module SBSM
   # by the different process. Should probably later be replaced by a Rack based logger
   def self.info(msg)
     info = "#{File.basename(caller[0])} #{msg}"
-    puts info if defined? Pry
     @@logger.info(info) if @@logger
   end
   def self.debug(msg)
     info = "#{File.basename(caller[0])} #{msg}"
-    puts info if defined? Pry
     @@logger.debug(info) if @@logger
   end
 end

data/lib/sbsm/lookandfeel.rb

@@ -132,7 +132,7 @@ module SBSM
 			@session.navigation
 		end
 		def resource(rname, rstr=nil)
-			collect_resource([ self::class::RESOURCE_BASE, @session.flavor ],
+			collect_resource([ self::class::RESOURCE_BASE, @session.flavor ], 
                          rname, rstr)
 		end
 		def resource_external(rname)
@@ -166,8 +166,8 @@ module SBSM
       end
 		end
     def _collect_resource(base, part, rstr)
-      [ @session.http_protocol + ':/',
-        @session.server_name,
+      [ @session.http_protocol + ':/', 
+        @session.server_name, 
         base, part, rstr].flatten.compact.join('/')
     end
     def set_dictionary(language)

data/lib/sbsm/session.rb

@@ -106,7 +106,8 @@ module SBSM
     def initialize(app:,
                    trans_handler: nil,
                    validator: nil,
-                   cookie_name: nil,
+                    unknown_user: nil,
+                  cookie_name: nil,
                    multi_threaded: false)
       SBSM.info "initialize th #{trans_handler} validator #{validator} app #{app.class}"
       @app = app

data/lib/sbsm/session_store.rb

@@ -60,7 +60,6 @@ module SBSM
                    multi_threaded: nil)
       fail "You must specify an app!" unless app
       @sessions = {}
-      @admin_enabled = false
       @mutex = Mutex.new
       @cleaner = run_cleaner if(self.class.const_get(:RUN_CLEANER))
       @admin_threads = ThreadGroup.new
@@ -77,11 +76,8 @@ module SBSM
       @unknown_user ||= UNKNOWN_USER
       @validator = validator
     end
-    def enable_admin
-      @admin_enabled = true
-    end
     def _admin(src, result, priority=0)
-      raise "admin interface disabled" unless @admin_enabled
+      raise "admin interface disabled" unless(self::class::ENABLE_ADMIN)
       t = Thread.new {
         Thread.current.abort_on_exception = false
         result << begin
@@ -173,12 +169,12 @@ module SBSM
     end
     def [](key)
       @mutex.synchronize do
-        unless((session = @sessions[key]) && !session.expired?)
-          session = @sessions[key] = @session_class.new(app: @app, cookie_name: @cookie_name, trans_handler: @trans_handler, validator: @validator)
+        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
-        session.reset()
-        session.touch()
-        session
+        s.reset()
+        s.touch()
+        s
       end
     end
   end

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.3.7'
+  VERSION = '1.3.8'
 end

data/test/test_session.rb

@@ -144,11 +144,9 @@ end
 class TestSession < Minitest::Test
   include Rack::Test::Methods
 	def setup
-    @app = StubSessionApp.new(validator: StubSessionValidator.new,
-                           unknown_user: StubSessionUnknownUser.new)
+    @app = StubSessionApp.new(validator: StubSessionValidator.new)
     @session = StubSessionWithView.new(app: @app,
-                           validator: StubSessionValidator.new,
-                           unknown_user: StubSessionUnknownUser.new)
+                           validator: StubSessionValidator.new)
     @request = StubSessionRequest.new
 		@state = StubSessionState.new(@session, nil)
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -270,7 +270,6 @@ files:
 - data/zone_uri.grammar
 - install.rb
 - lib/sbsm.rb
-- lib/sbsm/admin_server.rb
 - lib/sbsm/app.rb
 - lib/sbsm/cgi.rb
 - lib/sbsm/exception.rb

data/lib/sbsm/admin_server.rb

@@ -1,69 +0,0 @@
-#!/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
-#
-#++
-# AdminServer -- sbsm -- niger@ywesee.com
-#  2017: Moved the old _admin interface into a separate class for BBMB and Virbac
-
-require 'delegate'
-require 'sbsm/session'
-require 'sbsm/user'
-require 'thread'
-require 'digest/md5'
-require 'sbsm/logger'
-require 'sbsm/session_store'
-
-module SBSM
-  # AdminClass must be tied to an Rack app
-  class AdminServer
-    def initialize(app:)
-      @session = SBSM::SessionStore.new(app: app)
-      @admin_threads = ThreadGroup.new
-    end
-    def _admin(src, result, priority=0)
-      t = Thread.new {
-        Thread.current.abort_on_exception = false
-        result << begin
-          response = begin
-            instance_eval(src)
-          rescue NameError => e
-            e
-          end
-          str = response.to_s
-          if(str.length > 200)
-            response.class
-          else
-            str
-          end
-        rescue StandardError => e
-          e.message
-        end.to_s
-      }
-      t[:source] = src
-      t.priority = priority
-      @admin_threads.add(t)
-      t
-    end
-  end
-end