cloudcms-server 3.2.325 → 3.2.327

package/index.js

@@ -29,6 +29,28 @@ process.logInfo = process.log = function(text, level)
     systemLogger.log(text, level);
 };
 
+var debugMiddleware = process.debugMiddleware = function(message)
+{
+    return function(req, res, next)
+    {
+        var text = "[" + req.id + "] URL: " + req.url;
+        // if (req.headers)
+        // {
+        //     text += ", HEADERS: " + JSON.stringify(req.headers);
+        // }
+        if (req.query)
+        {
+            text += ", QUERY: " + JSON.stringify(req.query);
+        }
+        text += ", MESSAGE: " + message;
+
+        console.log(text);
+
+        next();
+    }
+}
+
+
 
 // by default, set up Gitana driver so that it limits to five concurrent HTTP requests back to Cloud CMS API at at time
 var Gitana = require("gitana");
@@ -306,43 +328,82 @@ exports = module.exports = function()
 
     r.common1 = function(app)
     {
+        // DEBUG
+        app.use(debugMiddleware("DEBUG x1"));
+
         // app config interceptor
         applyApplicationConfiguration(app);
 
+        // DEBUG
+        app.use(debugMiddleware("DEBUG x2"));
+
         // sets locale onto the request
         app.use(locale.localeInterceptor());
 
+        // DEBUG
+        app.use(debugMiddleware("DEBUG x3"));
+
         // sets host onto the request
         app.use(host.hostInterceptor());
+
+        // DEBUG
+        app.use(debugMiddleware("DEBUG x4"));
     };
 
     r.common2 = function(app)
     {
+        // DEBUG
+        app.use(debugMiddleware("DEBUG y1"));
+
         // bind stores into the request
         app.use(storeService.storesInterceptor());
 
+        // DEBUG
+        app.use(debugMiddleware("DEBUG y2"));
+
         // puts req.descriptor into the request and req.virtualFiles = true
         app.use(virtualFiles.interceptor());
 
+        // DEBUG
+        app.use(debugMiddleware("DEBUG y3"));
+
         // puts req.runtime into the request
         app.use(runtime.interceptor());
 
+        // DEBUG
+        app.use(debugMiddleware("DEBUG y4"));
+
         // if virtual hosting is enabled, loads "gitana.json" from cloud cms and places it into rootStore
         // for convenience, also populates req.gitanaConfig
         app.use(virtualConfig.interceptor());
 
+        // DEBUG
+        app.use(debugMiddleware("DEBUG y5"));
+
         // general method for finding "gitana.json" in root store and populating req.gitanaConfig
         app.use(driverConfig.interceptor());
+
+        // DEBUG
+        app.use(debugMiddleware("DEBUG y6"));
     };
 
     r.common3 = function(app)
     {
+        // DEBUG
+        app.use(debugMiddleware("DEBUG z1"));
+
         // binds "req.gitana" into the request for the loaded "req.gitanaConfig"
         app.use(driver.driverInterceptor());
+
+        // DEBUG
+        app.use(debugMiddleware("DEBUG z2"));
     };
 
     r.common4 = function(app, includeCloudCMS)
     {
+        // DEBUG
+        app.use(debugMiddleware("DEBUG v1"));
+
         var configuration = app.configuration;
 
         if (includeCloudCMS)
@@ -375,6 +436,9 @@ exports = module.exports = function()
 
         // graphql
         app.use(graphql.interceptor());
+
+        // DEBUG
+        app.use(debugMiddleware("DEBUG v2"));
     };
 
     r.perf1 = function(app)

package/package.json

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

package/server/index.js

@@ -729,6 +729,8 @@ var initSession = function(initDone)
     }
 };
 
+var debugMiddleware = process.debugMiddleware;
+
 var startServer = function(config, startServerFinishedFn)
 {
     var app = express();
@@ -889,14 +891,17 @@ 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(debugMiddleware("DEBUG 1"));
+
                 // APPLY CUSTOM INIT FUNCTIONS
                 runFunctions(config.initFunctions, [app], function (err) {
     
@@ -989,7 +994,10 @@ var startServer = function(config, startServerFinishedFn)
     
                     // common interceptors and config
                     main.common1(app);
-    
+
+                    // DEBUG
+                    app.use(debugMiddleware("DEBUG 2"));
+
                     // general logging of requests
                     // gather statistics on response time
                     app.use(responseTime(function (req, res, time) {
@@ -1028,17 +1036,29 @@ var startServer = function(config, startServerFinishedFn)
     
                         req.log(m, warn);
                     }));
-    
+
+                    // DEBUG
+                    app.use(debugMiddleware("DEBUG 2a"));
+
                     // set up CORS allowances
                     // this lets CORS requests float through the proxy
                     app.use(main.ensureCORS());
-    
+
+                    // DEBUG
+                    app.use(debugMiddleware("DEBUG 2b"));
+
                     // set up default security headers
                     app.use(main.ensureHeaders());
-    
+
+                    // DEBUG
+                    app.use(debugMiddleware("DEBUG 2c"));
+
                     // common interceptors and config
                     main.common2(app);
-    
+
+                    // DEBUG
+                    app.use(debugMiddleware("DEBUG 3"));
+
                     // APPLY CUSTOM DRIVER FUNCTIONS
                     runFunctions(config.driverFunctions, [app], function(err) {
     
@@ -1050,7 +1070,10 @@ var startServer = function(config, startServerFinishedFn)
     
                         // cloudcms things need to run here
                         main.common4(app, true);
-    
+
+                        // DEBUG
+                        app.use(debugMiddleware("DEBUG 4"));
+
                         // APPLY CUSTOM FILTER FUNCTIONS
                         runFunctions(config.filterFunctions, [app], function (err) {
     
@@ -1065,7 +1088,10 @@ var startServer = function(config, startServerFinishedFn)
     
                             // DEVELOPMENT BASED PERFORMANCE CACHING
                             main.perf3(app);
-    
+
+                            // DEBUG
+                            app.use(debugMiddleware("DEBUG 5"));
+
                             // 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) {
@@ -1087,7 +1113,10 @@ var startServer = function(config, startServerFinishedFn)
                                 app.use(initializedSession);
                                 app.use(flash());
                             }
-    
+
+                            // DEBUG
+                            app.use(debugMiddleware("DEBUG 6"));
+
                             // 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
@@ -1126,7 +1155,10 @@ var startServer = function(config, startServerFinishedFn)
                                     req.passport.session()(req, res, next);
                                 });
                             }
-    
+
+                            // DEBUG
+                            app.use(debugMiddleware("DEBUG 7"));
+
                             // welcome files
                             main.welcome(app);
     
@@ -1137,13 +1169,22 @@ var startServer = function(config, startServerFinishedFn)
     
                             // healthcheck middleware
                             main.healthcheck(app);
-    
+
+                            // DEBUG
+                            app.use(debugMiddleware("DEBUG 8"));
+
                             // APPLY CUSTOM ROUTES
                             runFunctions(config.routeFunctions, [app], function (err) {
-    
+
+                                // DEBUG
+                                app.use(debugMiddleware("DEBUG 9"));
+
                                 // configure cloudcms app server handlers
                                 main.handlers(app, true);
-    
+
+                                // DEBUG
+                                app.use(debugMiddleware("DEBUG 10"));
+
                                 // register error functions
                                 runFunctions(config.errorFunctions, [app], function (err) {
     
@@ -1161,7 +1202,7 @@ var startServer = function(config, startServerFinishedFn)
                                         }
                                     }
                                     runFunctions(allConfigureFunctions, [app], function (err) {
-    
+
                                         // create the server (either HTTP or HTTPS)
                                         createHttpServer(app, function(err, httpServer) {
                                             
@@ -1219,6 +1260,9 @@ var createHttpServer = function(app, done)
 
     // socket
     httpServer.on("connection", function (socket) {
+
+        console.log("[SOCKET CONNECTION] " + socket);
+
         socket.setNoDelay(true);
         
         socket.setTimeout(requestTimeout, function(socket) {

package/util/auth.js

@@ -5,16 +5,19 @@ var LRUCache = require("lru-cache");
 
 var request = require("./request");
 
+const IsolatedVM = require("isolated-vm");
+console.log("FA: " + IsolatedVM);
+
 // 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 +655,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();