cloudcms-server 3.2.339 → 3.2.340

package/middleware/authentication/authentication.js

@@ -391,7 +391,9 @@ exports = module.exports = function()
 
                     if (!profile || !info)
                     {
-                        return handleFailure(null, res);
+                        return handleFailure({
+                            "message": "Authentication callback missing both profile and info"
+                        }, res);
                     }
 
                     // store these onto request

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

@@ -16,6 +16,7 @@ exports = module.exports = function()
 
     var SENTINEL_NOT_FOUND_VALUE = "null";
     var BLACKLIST_TTL_SECONDS = 60 * 60 * 24 * 30; // 30 days
+    var DISABLED_TTL_SECONDS = 60 * 10; // 10 minutes
 
     var VIRTUAL_DRIVER_CACHE_KEY = "virtualdriver";
 
@@ -115,7 +116,8 @@ exports = module.exports = function()
                         config.baseURL = configuration.virtualDriver.baseURL;
 
                         // hand back
-                        callback(null, config);
+                        var disabled = body.disabled ? true : false;
+                        callback(null, config, disabled);
                     }
                 }
                 else
@@ -183,7 +185,7 @@ exports = module.exports = function()
                             }
 
                             // load the gitana.json file from Cloud CMS
-                            loadConfigForVirtualHost(host, logMethod, function (err, virtualConfig) {
+                            loadConfigForVirtualHost(host, logMethod, function (err, virtualConfig, disabled) {
 
                                 if (err)
                                 {
@@ -194,7 +196,7 @@ exports = module.exports = function()
 
                                 if (!virtualConfig)
                                 {
-                                    // mark that it failed (30 minute TTL)
+                                    // mark that it failed (30 day blacklist TTL)
                                     return process.cache.write(VCSENTINEL_CACHE_KEY, true, BLACKLIST_TTL_SECONDS, function() {
                                         finishedLoading({
                                             "message": "No virtual config found for host: " + host
@@ -202,6 +204,16 @@ exports = module.exports = function()
                                     });
                                 }
 
+                                if (disabled)
+                                {
+                                    // mark that the virtual config is disabled (10 minutes TLL)
+                                    return process.cache.write(VCSENTINEL_CACHE_KEY, true, DISABLED_TTL_SECONDS, function() {
+                                        finishedLoading({
+                                            "message": "The virtual config was found for host: " + host + " but it has been marked as disabled"
+                                        });
+                                    });
+                                }
+
                                 // populate gitana.json
                                 var gitanaJson = {
                                     "clientKey": virtualConfig.clientKey

package/package.json

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