cloudcms-server 3.2.315 → 3.2.317

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

@@ -345,8 +345,18 @@ exports = module.exports = function()
             {
                 if (doesNotExist)
                 {
+                    console.log("BLOCK, method: " + req.method + ", url: " + req.url);
+                    if (req.headers)
+                    {
+                        console.log(" -> headers: " + JSON.stringify(req.headers, null, 2));
+                    }
+                    if (req.query)
+                    {
+                        console.log(" -> query: " + JSON.stringify(req.query, null, 2));
+                    }
+
                     // are we being spoofed? kill the connection
-                    console.log("[BLACKLIST KILL: " + req.virtualHost + " > " + req.method + " " + req.url + "]");
+                    res.blocked = true;
                     res.writeHead(503, { 'Content-Type': 'application/json' });
                     return res.end(JSON.stringify({"error": true, "message": "Bad Request."}));
                 }
@@ -412,7 +422,7 @@ exports = module.exports = function()
                         }
 
                         // mark with sentinel (30 minutes)
-                        console.log("[BLACKLIST ADD: " + req.virtualHost + "]");
+                        req.log("[BLACKLIST] Adding: " + req.virtualHost);
                         process.driverConfigCache.write(req.virtualHost, SENTINEL_NOT_FOUND_VALUE, 30 * 60, function (err) {
                             completionFunction(null, null, true);
                         });

package/package.json

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

package/server/index.js

@@ -992,6 +992,36 @@ var startServer = function(config, startServerFinishedFn)
     
                         next();
                     });
+
+                    // black list
+                    app.use(function(req, res, next) {
+
+                        var kill = false;
+                        if (req.path.endsWith("/env"))
+                        {
+                            kill = true;
+                        }
+
+                        if (kill)
+                        {
+                            console.log("KILL, method: " + req.method + ", url: " + req.url);
+                            if (req.headers)
+                            {
+                                console.log(" -> headers: " + JSON.stringify(req.headers, null, 2));
+                            }
+                            if (req.query)
+                            {
+                                console.log(" -> query: " + JSON.stringify(req.query, null, 2));
+                            }
+
+                            // are we being spoofed? kill the connection
+                            res.blocked = true;
+                            res.writeHead(503, { 'Content-Type': 'application/json' });
+                            return res.end(JSON.stringify({"error": true, "message": "Bad Request."}));
+                        }
+
+                        next();
+                    });
     
                     // common interceptors and config
                     main.common1(app);
@@ -1023,8 +1053,16 @@ var startServer = function(config, startServerFinishedFn)
                                 requestPath = util.stripQueryStringFromUrl(requestPath);
                             }
                         }
+
+                        var m = "";
+                        if (res.blocked)
+                        {
+                            m += "*BLOCKED* ";
+                        }
+                        m += req.method + " " + requestPath + " [" + res.statusCode + "]";
+                        m += " (" + time.toFixed(2) + " ms)";
     
-                        req.log(req.method + " " + requestPath + " [" + res.statusCode + "] (" + time.toFixed(2) + " ms)", warn);
+                        req.log(m, warn);
                     }));
     
                     // set up CORS allowances