sbsm 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd930d80bc37cb035451c6cd60025c07d93ecdd4
-  data.tar.gz: a885ac42d48f711ed8d66a51d4a3d54032b0571b
+  metadata.gz: 5fe0cd3bee32abd6584a2ef5bee75193dc3f6628
+  data.tar.gz: dfae87daaf90a29b77aa63cd2d6383a38adac999
 SHA512:
-  metadata.gz: 698df6a49ae0bb42eb7a11bba5b0277a35c29f17e1cfa396a61c1a08c4d047edeec0cbe5f3f10f2099b42c9c5262db5bb13dd8cd8b2bf044746668e665dd9bb8
-  data.tar.gz: c5c8f01a38aeb00a104af5998bbc0ef0a48693461a5b404379fa67959d66dd16d9d2dd2fe8cfbffadcb04861e0c0778dde848155168a01ff250fa0bd89301926
+  metadata.gz: 11964b9621a5888a2cffd473d25d6df2187cdf47bfb325bc8d8625715e173e7ed3edafe326519fc24632ef5cef43beef225db0b37f33f42fb44f7c66ad247ebd
+  data.tar.gz: c824c1ee2f3915e65d7863c75d71e0a00df4221a454b124c04855171d8e9732892aabb4c69cd43d9e7d05106c1cf28dc32d238dcd31ad153124e79d7cda11524

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.4.0 / 17.05.2017
+
+* Moved _admin to separate AdminServer class
+
 === 1.3.9 / 15.05.2017
 
 * Added SBSM.warn and SBSM.error to make lib/sbsm/state.rb happy

data/lib/sbsm/admin_server.rb

@@ -0,0 +1,69 @@
+#!/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

data/lib/sbsm/session_store.rb

@@ -43,7 +43,6 @@ module SBSM
   class SessionStore
     CLEANING_INTERVAL = 30
     CAP_MAX_THRESHOLD = 120
-    ENABLE_ADMIN = false
     MAX_SESSIONS = 100
     RUN_CLEANER = true
     SESSION = Session
@@ -62,7 +61,6 @@ module SBSM
       @sessions = {}
       @mutex = Mutex.new
       @cleaner = run_cleaner if(self.class.const_get(:RUN_CLEANER))
-      @admin_threads = ThreadGroup.new
       @async = ThreadGroup.new
       @app = app
       @system = persistence_layer
@@ -76,31 +74,6 @@ module SBSM
       @unknown_user ||= UNKNOWN_USER
       @validator = validator
     end
-    def _admin(src, result, priority=0)
-      raise "admin interface disabled" unless(self::class::ENABLE_ADMIN)
-      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
     def async(&block)
       @async.add(Thread.new(&block))
     end

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.3.9'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -270,6 +270,7 @@ 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