cloudcms-server 3.2.324 → 3.2.326

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.324",
+  "version": "3.2.326",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"

package/server/index.js

@@ -16,8 +16,7 @@ var session = require('express-session');
 var cookieParser = require('cookie-parser');
 var flash = require("connect-flash");
 
-//const redis = require('redis');
-const connectRedis = require('connect-redis');
+const {RedisStore} = require("connect-redis");
 
 // we don't bind a single passport - instead, we get the constructor here by hand
 var Passport = require("passport").Passport;
@@ -715,7 +714,6 @@ var initSession = function(initDone)
         var redisOptions = redisHelper.redisOptions();
         var redisClient = new IORedis(redisOptions.url);
     
-        var RedisStore = connectRedis(session);
         sessionConfig.store = new RedisStore({ client: redisClient });
         initDone(null, session(sessionConfig));
     }
@@ -891,14 +889,20 @@ var startServer = function(config, startServerFinishedFn)
                     next();
                 });
                 */
-    
+
                 // increment and assign request id
                 app.use(function increment_and_assign_id(req, res, next) {
                     requestCounter++;
                     req.id = requestCounter;
                     next();
                 });
-    
+
+                // DEBUG
+                app.use(function requestHit1(req, res, next) {
+                    console.log("[REQ: " + req.id + "] DEBUG 1");
+                    next();
+                });
+
                 // APPLY CUSTOM INIT FUNCTIONS
                 runFunctions(config.initFunctions, [app], function (err) {
     
@@ -991,7 +995,13 @@ var startServer = function(config, startServerFinishedFn)
     
                     // common interceptors and config
                     main.common1(app);
-    
+
+                    // DEBUG
+                    app.use(function requestHit2(req, res, next) {
+                        console.log("[REQ: " + req.id + "] DEBUG 2");
+                        next();
+                    });
+
                     // general logging of requests
                     // gather statistics on response time
                     app.use(responseTime(function (req, res, time) {
@@ -1040,7 +1050,13 @@ var startServer = function(config, startServerFinishedFn)
     
                     // common interceptors and config
                     main.common2(app);
-    
+
+                    // DEBUG
+                    app.use(function requestHit3(req, res, next) {
+                        console.log("[REQ: " + req.id + "] DEBUG 3");
+                        next();
+                    });
+
                     // APPLY CUSTOM DRIVER FUNCTIONS
                     runFunctions(config.driverFunctions, [app], function(err) {
     
@@ -1052,7 +1068,13 @@ var startServer = function(config, startServerFinishedFn)
     
                         // cloudcms things need to run here
                         main.common4(app, true);
-    
+
+                        // DEBUG
+                        app.use(function requestHit4(req, res, next) {
+                            console.log("[REQ: " + req.id + "] DEBUG 4");
+                            next();
+                        });
+
                         // APPLY CUSTOM FILTER FUNCTIONS
                         runFunctions(config.filterFunctions, [app], function (err) {
     
@@ -1067,7 +1089,13 @@ var startServer = function(config, startServerFinishedFn)
     
                             // DEVELOPMENT BASED PERFORMANCE CACHING
                             main.perf3(app);
-    
+
+                            // DEBUG
+                            app.use(function requestHit5(req, res, next) {
+                                console.log("[REQ: " + req.id + "] DEBUG 5");
+                                next();
+                            });
+
                             // standard body parsing + a special cloud cms body parser that makes a last ditch effort for anything
                             // that might be JSON (regardless of content type)
                             app.use(function (req, res, next) {
@@ -1089,7 +1117,13 @@ var startServer = function(config, startServerFinishedFn)
                                 app.use(initializedSession);
                                 app.use(flash());
                             }
-    
+
+                            // DEBUG
+                            app.use(function requestHit6(req, res, next) {
+                                console.log("[REQ: " + req.id + "] DEBUG 6");
+                                next();
+                            });
+
                             // this is the same as calling
                             // app.use(passport.initialize());
                             // except we create a new passport each time and store on request to support multitenancy
@@ -1128,7 +1162,13 @@ var startServer = function(config, startServerFinishedFn)
                                     req.passport.session()(req, res, next);
                                 });
                             }
-    
+
+                            // DEBUG
+                            app.use(function requestHit7(req, res, next) {
+                                console.log("[REQ: " + req.id + "] DEBUG 7");
+                                next();
+                            });
+
                             // welcome files
                             main.welcome(app);
     
@@ -1139,13 +1179,31 @@ var startServer = function(config, startServerFinishedFn)
     
                             // healthcheck middleware
                             main.healthcheck(app);
-    
+
+                            // DEBUG
+                            app.use(function requestHit8(req, res, next) {
+                                console.log("[REQ: " + req.id + "] DEBUG 8");
+                                next();
+                            });
+
                             // APPLY CUSTOM ROUTES
                             runFunctions(config.routeFunctions, [app], function (err) {
-    
+
+                                // DEBUG
+                                app.use(function requestHit9(req, res, next) {
+                                    console.log("[REQ: " + req.id + "] DEBUG 9");
+                                    next();
+                                });
+
                                 // configure cloudcms app server handlers
                                 main.handlers(app, true);
-    
+
+                                // DEBUG
+                                app.use(function requestHit10(req, res, next) {
+                                    console.log("[REQ: " + req.id + "] DEBUG 10");
+                                    next();
+                                });
+
                                 // register error functions
                                 runFunctions(config.errorFunctions, [app], function (err) {
     
@@ -1163,7 +1221,7 @@ var startServer = function(config, startServerFinishedFn)
                                         }
                                     }
                                     runFunctions(allConfigureFunctions, [app], function (err) {
-    
+
                                         // create the server (either HTTP or HTTPS)
                                         createHttpServer(app, function(err, httpServer) {
                                             

package/util/auth.js

@@ -5,16 +5,18 @@ var LRUCache = require("lru-cache");
 
 var request = require("./request");
 
+const IsolatedVM = require("isolated-vm");
+
 // trusted profile cache size 100
 var TRUSTED_PROFILE_CACHE = new LRUCache({
     max:100,
-    maxAge: 1000 * 60 * 15 // 15 minutes
+    ttl: 1000 * 60 * 15 // 15 minutes
 });
 
 // user entry cache size 100
 var USER_ENTRY_CACHE = new LRUCache({
     max: 100,
-    maxAge: 1000 * 60 * 15 // 15 minutes
+    ttl: 1000 * 60 * 15 // 15 minutes
 });
 
 var Gitana = require("gitana");
@@ -652,28 +654,28 @@ var executeRule = function(req, rule, gitanaUser, callback)
         });
     };
 
-    const {VM} = require("vm2");
-    var vm = new VM({
-        timeout: 5000,
-        sandbox: {
-            "addToProject": function(projectId, teamIdentifiers) {
-                return addToProject(projectId, teamIdentifiers, function() {
-                    console.log("Added user: " + gitanaUser._doc + " to project: " + projectId + ", teams: " + JSON.stringify(teamIdentifiers));
-                });
-            },
-            "addToPlatformTeam": function(teamIdentifier) {
-                return addToPlatformTeams([teamIdentifier], function() {
-                    console.log("Added user: " + gitanaUser._doc + " to platform team: " + teamIdentifier);
-                });
-            },
-            "addToPlatformTeams": function(teamIdentifiers) {
-                return addToPlatformTeams(teamIdentifiers, function() {
-                    console.log("Added user: " + gitanaUser._doc + " to platform teams: " + JSON.stringify(teamIdentifiers));
-                });
-            }
-        }
+    const isolate = new IsolatedVM.Isolate({ memoryLimit: 32 });
+    const context = isolate.createContextSync();
+    const jail = context.global;
+
+    // functions
+    jail.setSync('addToProject', function(projectId, teamIdentifiers) {
+        return addToProject(projectId, teamIdentifiers, function() {
+            console.log("Added user: " + gitanaUser._doc + " to project: " + projectId + ", teams: " + JSON.stringify(teamIdentifiers));
+        });
+    });
+    jail.setSync("addToPlatformTeam", function(teamIdentifier) {
+        return addToPlatformTeams([teamIdentifier], function() {
+            console.log("Added user: " + gitanaUser._doc + " to platform team: " + teamIdentifier);
+        });
     });
-    vm.run(rule);
+    jail.setSync("addToPlatformTeams", function(teamIdentifiers) {
+        return addToPlatformTeams(teamIdentifiers, function() {
+            console.log("Added user: " + gitanaUser._doc + " to platform teams: " + JSON.stringify(teamIdentifiers));
+        });
+    });
+
+    context.evalSync(rule);
 
     setTimeout(function() {
         callback();