Make sessions system to be able to turn off

Signed-off-by: Bruno Bottazzini <bruno.bottazzini@intel.com>
solettaproject · Oct 15, 2015 · 97d873f · 97d873f
1 parent 71bdbc0
commit 97d873f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/server/app.js b/server/app.js
@@ -31,8 +31,6 @@
     'use strict';
 
     var express = require('express');
-    var session = require('express-session');
-    var SessionStore = require('session-file-store')(session);
     var path = require('path');
     var logger = require('morgan');
     var cookieParser = require('cookie-parser');
@@ -53,22 +51,28 @@
             jConf = getConfigurationJson(args[0]);
         }
 
-        app.use(session({
-            genid: function(req) {
-                // uuid for guest session ids
-                var id = uuid.v4();
-                console.log("New session: " + id);
-                return id;
-            },
-            name: "dad-session",
-            secret: 'keepitsecret',
-            resave: true,
-            saveUninitialized: true,
-            store: new SessionStore({
-                retries: 500,
-                path: jConf.sessions_dir
-            })
-        }));
+        if (jConf.session_system === true) {
+            var session = require('express-session');
+            var SessionStore = require('session-file-store')(session);
+            app.use(session({
+                genid: function(req) {
+                    // uuid for guest session ids
+                    var id = uuid.v4();
+                        console.log("New session: " + id);
+                    return id;
+                },
+                name: "dad-session",
+                secret: 'keepitsecret',
+                resave: true,
+                saveUninitialized: true,
+                store: new SessionStore({
+                    retries: 500,
+                    minTimeout: 150,
+                    maxTimeout: 200,
+                    path: jConf.sessions_dir
+                })
+            }));
+        }
 
         // view engine setup
         app.set('views', path.join(__dirname, 'views'));

diff --git a/server/configuration.json b/server/configuration.json
@@ -13,5 +13,6 @@
     "fbp_service_status_refresh_period": 1000,
     "syntax_check_refresh_period": 1100,
     "save_file_period": 5000,
-    "run_dialog_refresh_period": 1000
+    "run_dialog_refresh_period": 1000,
+    "sessions_system": false
 }
diff --git a/server/tools.js b/server/tools.js
@@ -30,6 +30,7 @@
 module.exports = function () {
     var fs = require('fs');
     var path = require('path');
+    require('./configuration.js')();
 
     this.home_dir = function(user) {
         return __dirname + '/../repos/' + user + '/';
@@ -48,7 +49,12 @@ module.exports = function () {
     };
 
     this.current_user = function (req) {
-        return req.sessionID;
+        var jConf = getConfigurationJson();
+        if (jConf.session_system === true) {
+            return req.sessionID;
+        } else {
+            return "singlesession";
+        }
     };
 
     this.processReq = function(_p, res) {