cloudcms-server 3.2.326 → 3.2.328

package/index.js

@@ -29,6 +29,33 @@ process.logInfo = process.log = function(text, level)
     systemLogger.log(text, level);
 };
 
+var debugLog = process.debugLog = function(req, message)
+{
+    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);
+};
+
+var debugMiddleware = process.debugMiddleware = function(message)
+{
+    return function(req, res, next)
+    {
+        debugLog(req, message);
+
+        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 +333,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 +441,9 @@ exports = module.exports = function()
 
         // graphql
         app.use(graphql.interceptor());
+
+        // DEBUG
+        app.use(debugMiddleware("DEBUG v2"));
     };
 
     r.perf1 = function(app)

package/middleware/virtual-config/virtual-config.js

@@ -2,6 +2,8 @@ var util = require("../../util/util");
 
 var workQueueFactory = require("../../util/workqueue");
 
+var debugLog = process.debugLog;
+
 /**
  * Retrieves virtual driver configuration for hosts from Cloud CMS.
  *
@@ -355,8 +357,11 @@ exports = module.exports = function()
 
             var completionFunction = function (err, gitanaConfig, doesNotExist)
             {
+                debugLog(req, "g20");
                 if (doesNotExist)
                 {
+                    debugLog(req, "g21");
+
                     // console.log("BLOCK, method: " + req.method + ", url: " + req.url);
                     // if (req.headers)
                     // {
@@ -373,6 +378,8 @@ exports = module.exports = function()
                     return res.end(JSON.stringify({"error": true, "message": "Bad Request."}));
                 }
 
+                debugLog(req, "g22");
+
                 if (err)
                 {
                     if (err.message)
@@ -380,11 +387,15 @@ exports = module.exports = function()
                         req.log(err.message);
                     }
 
+                    debugLog(req, "g23: " + err);
+
                     return next();
                 }
 
                 if (gitanaConfig)
                 {
+                    debugLog(req, "g24: " + JSON.stringify(gitanaConfig, null, 2));
+
                     // store config
                     req.gitanaConfig = gitanaConfig;
 
@@ -392,11 +403,18 @@ exports = module.exports = function()
                     req.gitanaLocal = false;
                 }
 
+                debugLog(req, "g30");
+
                 next();
             };
 
+            debugLog(req, "g1: " + req.virtualHost);
+
             process.driverConfigCache.read(req.virtualHost, function(err, cachedValue)
             {
+                debugLog(req, "g2: " + err);
+                debugLog(req, "g3: " + cachedValue);
+
                 if (process.env.NULL_DRIVER_CACHE === "true") {
                     cachedValue = null;
                 }
@@ -405,20 +423,29 @@ exports = module.exports = function()
                 {
                     if (cachedValue === SENTINEL_NOT_FOUND_VALUE)
                     {
+                        debugLog(req, "g4");
+
                         // null means there verifiably isn't anything on disk (null used as sentinel marker)
                         completionFunction(null, null, true);
                     }
                     else
                     {
+                        debugLog(req, "g5");
+
                         // we have something in cache
                         completionFunction(null, cachedValue.config);
                     }
                 }
                 else
                 {
+                    debugLog(req, "g6");
+
                     // try to load from disk
                     acquireGitanaJson(req.virtualHost, req.rootStore, req.log, function (err, gitanaConfig, doesNotExist)
                     {
+                        debugLog(req, "g7: " + err);
+                        debugLog(req, "g8: " + gitanaConfig);
+
                         if (err && !doesNotExist)
                         {
                             return completionFunction(err);
@@ -426,6 +453,8 @@ exports = module.exports = function()
 
                         if (gitanaConfig)
                         {
+                            debugLog(req, "g9: " + JSON.stringify(gitanaConfig, null, 2));
+
                             return process.driverConfigCache.write(req.virtualHost, {
                                 "config": gitanaConfig
                             }, function (err) {
@@ -433,6 +462,8 @@ exports = module.exports = function()
                             });
                         }
 
+                        debugLog(req, "g10: " + req.virtualHost);
+
                         // mark with sentinel (30 minutes)
                         req.log("[BLACKLIST] Adding: " + req.virtualHost);
                         process.driverConfigCache.write(req.virtualHost, SENTINEL_NOT_FOUND_VALUE, BLACKLIST_TTL_SECONDS, function (err) {

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.326",
+  "version": "3.2.328",
   "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();
@@ -898,10 +900,7 @@ var startServer = function(config, startServerFinishedFn)
                 });
 
                 // DEBUG
-                app.use(function requestHit1(req, res, next) {
-                    console.log("[REQ: " + req.id + "] DEBUG 1");
-                    next();
-                });
+                app.use(debugMiddleware("DEBUG 1"));
 
                 // APPLY CUSTOM INIT FUNCTIONS
                 runFunctions(config.initFunctions, [app], function (err) {
@@ -997,10 +996,7 @@ var startServer = function(config, startServerFinishedFn)
                     main.common1(app);
 
                     // DEBUG
-                    app.use(function requestHit2(req, res, next) {
-                        console.log("[REQ: " + req.id + "] DEBUG 2");
-                        next();
-                    });
+                    app.use(debugMiddleware("DEBUG 2"));
 
                     // general logging of requests
                     // gather statistics on response time
@@ -1040,22 +1036,28 @@ 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(function requestHit3(req, res, next) {
-                        console.log("[REQ: " + req.id + "] DEBUG 3");
-                        next();
-                    });
+                    app.use(debugMiddleware("DEBUG 3"));
 
                     // APPLY CUSTOM DRIVER FUNCTIONS
                     runFunctions(config.driverFunctions, [app], function(err) {
@@ -1070,10 +1072,7 @@ var startServer = function(config, startServerFinishedFn)
                         main.common4(app, true);
 
                         // DEBUG
-                        app.use(function requestHit4(req, res, next) {
-                            console.log("[REQ: " + req.id + "] DEBUG 4");
-                            next();
-                        });
+                        app.use(debugMiddleware("DEBUG 4"));
 
                         // APPLY CUSTOM FILTER FUNCTIONS
                         runFunctions(config.filterFunctions, [app], function (err) {
@@ -1091,10 +1090,7 @@ var startServer = function(config, startServerFinishedFn)
                             main.perf3(app);
 
                             // DEBUG
-                            app.use(function requestHit5(req, res, next) {
-                                console.log("[REQ: " + req.id + "] DEBUG 5");
-                                next();
-                            });
+                            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)
@@ -1119,10 +1115,7 @@ var startServer = function(config, startServerFinishedFn)
                             }
 
                             // DEBUG
-                            app.use(function requestHit6(req, res, next) {
-                                console.log("[REQ: " + req.id + "] DEBUG 6");
-                                next();
-                            });
+                            app.use(debugMiddleware("DEBUG 6"));
 
                             // this is the same as calling
                             // app.use(passport.initialize());
@@ -1164,10 +1157,7 @@ var startServer = function(config, startServerFinishedFn)
                             }
 
                             // DEBUG
-                            app.use(function requestHit7(req, res, next) {
-                                console.log("[REQ: " + req.id + "] DEBUG 7");
-                                next();
-                            });
+                            app.use(debugMiddleware("DEBUG 7"));
 
                             // welcome files
                             main.welcome(app);
@@ -1181,28 +1171,19 @@ var startServer = function(config, startServerFinishedFn)
                             main.healthcheck(app);
 
                             // DEBUG
-                            app.use(function requestHit8(req, res, next) {
-                                console.log("[REQ: " + req.id + "] DEBUG 8");
-                                next();
-                            });
+                            app.use(debugMiddleware("DEBUG 8"));
 
                             // 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();
-                                });
+                                app.use(debugMiddleware("DEBUG 9"));
 
                                 // 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();
-                                });
+                                app.use(debugMiddleware("DEBUG 10"));
 
                                 // register error functions
                                 runFunctions(config.errorFunctions, [app], function (err) {
@@ -1279,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

@@ -6,6 +6,7 @@ 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({