cloudcms-server 3.2.338 → 3.2.340

package/launchpad/index.js

@@ -10,6 +10,8 @@ process.on('uncaughtException', function(err, source) {
     // {
         console.log(`Launchpad - process received event 'uncaughtException': ${err}, source: ${source}`);
         console.log(err.stack);
+        console.log("ERR: ", err);
+        console.log("SOURCE: ", source);
     // }
 });
 

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.338",
+  "version": "3.2.340",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -44,7 +44,6 @@
     "hbs": "^4.2.0",
     "helmet": "^8.0.0",
     "ioredis": "5.4.1",
-    "isolated-vm": "^5.0.3",
     "json5": "^2.2.3",
     "jsonwebtoken": "^9.0.2",
     "klaw": "^4.1.0",

package/util/auth.js

@@ -5,8 +5,6 @@ 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,
@@ -389,7 +387,9 @@ var _handleConnectAsUser = function(req, key, gitanaUser, callback) {
 
 var _handleSyncUser = function(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, groupsArray, callback) {
 
-    __handleSyncUser(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, function(err, gitanaUser, synced) {
+    var rulesArray = buildRulesArray(req, strategy, settings, groupsArray);
+
+    __handleSyncUser(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, rulesArray, function(err, gitanaUser, synced) {
 
         if (err) {
             return callback(err);
@@ -414,25 +414,12 @@ var _handleSyncUser = function(req, strategy, settings, key, domainId, providerI
             });
         }
 
-        if (!synced)
-        {
-            if (!groupsArray || groupsArray.length == 0)
-            {
-                return callback(null, gitanaUser);
-            }
-        }
-
-        // sync groups
-        __handleSyncGroups(req, strategy, settings, gitanaUser, groupsArray, function(err, gitanaUser) {
-
-            return callback(null, gitanaUser);
-
-        });
+        return callback(null, gitanaUser);
     });
 
 };
 
-var __handleSyncUser = function(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, callback) {
+var __handleSyncUser = function(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, rulesArray, callback) {
 
     var baseURL = req.gitanaConfig.baseURL;
     var authorizationHeader = req.gitana.getDriver().getHttpHeaders()["Authorization"];
@@ -455,6 +442,11 @@ var __handleSyncUser = function(req, strategy, settings, key, domainId, provider
         "connection": connectionObject
     };
 
+    if (rulesArray)
+    {
+        json.rules = rulesArray;
+    }
+
     var autoCreate = strategy.autoRegister ? true : false;
 
     var requestConfig = {
@@ -480,7 +472,7 @@ var __handleSyncUser = function(req, strategy, settings, key, domainId, provider
         {
             // retry after getting new token
             return req.gitana.getDriver().reloadAuthInfo(function () {
-                __handleSyncUser(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, function(err, gitanaUser, synced) {
+                __handleSyncUser(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, rulesArray, function(err, gitanaUser, synced) {
                     callback(err, gitanaUser, synced);
                 })
             });
@@ -525,224 +517,44 @@ var __handleSyncUser = function(req, strategy, settings, key, domainId, provider
     });
 };
 
-var executeRule = function(req, rule, gitanaUser, callback)
+var buildRulesArray = function(req, strategy, settings, groupsArray)
 {
-    console.log("r1: " + rule);
-
-    //
-    // addToProject(projectId)
-    // addToProject(projectId, [teamKey]);
-    //
-    // removeFromProject(projectId);
-    //
-    // addToPlatformTeam([teamKey])
-    // removeFromPlatformTeam([teamKey])
-
-    var ensureArray = function(teamIdentifiers) {
-        var array = [];
-        if (!teamIdentifiers) {
-            return array;
-        }
-
-        if (typeof(teamIdentifiers) === "string") {
-            array.push(teamIdentifiers);
-        }
-
-        for (var i = 0; i < teamIdentifiers.length; i++) {
-            array.push(teamIdentifiers[i]);
-        }
-
-        return array;
-    };
-
-    var addToProject = function(projectId, teamIdentifiers, finished) {
-
-        console.log("r2, projectId: " + projectId + ", teamIdentifiers: " + teamIdentifiers);
-
-        if (!teamIdentifiers) {
-            teamIdentifiers = "project-users-team";
-        }
-
-        teamIdentifiers = ensureArray(teamIdentifiers);
-
-        var project = null;
-        var stack = null;
-
-        console.log("r21");
-        return req.gitana.platform().trap(function(e) {
-            console.log("r22", e);
-            return false;
-        }).readProject(projectId).then(function(){
-            project = this;
-        }).readStack().then(function() {
-            stack = this;
-
-            var fns = [];
-            for (var i = 0; i < teamIdentifiers.length; i++)
-            {
-                var fn = function(stack, teamIdentifier, user) {
-                    return function(d) {
-
-                        console.log("Working on stack: " + stack._doc + ", team: " + teamIdentifier + ", user: " + user._doc);
-
-                        Chain(stack).trap(function(e) {
-                            d();
-                            return false;
-                        }).readTeam(teamIdentifier).then(function() {
-                            var team = this;
-
-                            Chain(team).hasMember(user, function(has) {
-                                if (has) {
-                                    return d();
-                                }
-                                Chain(team).addMember(user).then(function() {
-                                    d();
-                                });
-                            });
-                        });
-
-                    }
-                }(stack, teamIdentifiers[i], gitanaUser);
-                fns.push(fn);
-            }
-            async.series(fns, function() {
-                console.log("r29");
-                finished();
-            });
-        });
-    };
-
-    var addToPlatformTeams = function(teamIdentifiers, finished) {
-
-        console.log("r3");
-
-        if (!teamIdentifiers) {
-            teamIdentifiers = "project-users-team";
-        }
-
-        teamIdentifiers = ensureArray(teamIdentifiers);
-
-        var platform = null;
-
-        return Chain(req.gitana.platform()).trap(function(e) {
-            console.log("r31: ", e);
-            return false;
-        }).then(function() {
-            platform = this;
-
-            var fns = [];
-            for (var i = 0; i < teamIdentifiers.length; i++)
-            {
-                var fn = function(platform, teamIdentifier, user) {
-                    return function(d) {
-
-                        console.log("Working on platform team: " + teamIdentifier + ", user: " + user._doc);
-
-                        Chain(platform).trap(function(e) {
-                            d();
-                            return false;
-                        }).readTeam(teamIdentifier).then(function() {
-                            var team = this;
-
-                            Chain(team).hasMember(user, function(has) {
-                                if (has) {
-                                    return d();
-                                }
-                                Chain(team).addMember(user).then(function() {
-                                    d();
-                                });
-                            });
-                        });
-
-                    }
-                }(platform, teamIdentifiers[i], gitanaUser);
-                fns.push(fn);
-            }
-            async.series(fns, function() {
-                console.log("r39");
-                finished();
-            });
-        });
-    };
-
-    console.log("r4");
-
-    const isolate = new IsolatedVM.Isolate({ memoryLimit: 128 });
-    const context = isolate.createContextSync();
-    const jail = context.global;
-
-    console.log("r5");
-    // 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);
-        });
-    });
-    jail.setSync("addToPlatformTeams", function(teamIdentifiers) {
-        return addToPlatformTeams(teamIdentifiers, function() {
-            console.log("Added user: " + gitanaUser._doc + " to platform teams: " + JSON.stringify(teamIdentifiers));
-        });
-    });
-
-    console.log("r6");
-    context.evalSync(rule, {
-        "timeout": 1000 * 60 // one minute
-    });
-    console.log("r7");
-
-    setTimeout(function() {
-        console.log("r8");
-        callback();
-    }, 250);
-};
-
-var __handleSyncGroups = function(req, strategy, settings, gitanaUser, groupsArray, callback) {
+    var rules = [];
 
     if (!groupsArray || groupsArray.length === 0)
     {
-        return callback(null, gitanaUser);
+        return rules;
     }
 
     // if no groupMappings defined, bail
     if (!settings || !settings.sso || !settings.sso.groupMappings || settings.sso.groupMappings.length === 0) {
-        return callback(null, gitanaUser);
+        return rules;
     }
 
     // copy mappings into a lookup list
-    var groupRules = {};
+    // group key -> rules
     for (var i = 0; i < settings.sso.groupMappings.length; i++)
     {
-        groupRules[settings.sso.groupMappings[i].key] = settings.sso.groupMappings[i].values;
-    }
-
-    var fns = [];
-    for (var i = 0; i < groupsArray.length; i++)
-    {
-        var groupIdentifier = groupsArray[i];
-
-        var rules = groupRules[groupIdentifier];
-        if (rules)
+        var key = settings.sso.groupMappings[i].key;
+        var values = settings.sso.groupMappings[i].values;
+        if (values && values.length > 0)
         {
-            for (var x = 0; x < rules.length; x++)
+            for (var x = 0; x < values.length; x++)
             {
-                var fn = function (rule, gitanaUser) {
-                    return function (done) {
-                        executeRule(req, rule, gitanaUser, function (err) {
-                            done(err);
-                        });
-                    }
-                }(rules[x], gitanaUser);
-                fns.push(fn);
+                var script = values[x];
+
+                rules.push({
+                    // "condition": {
+                    //     "type": "belongsToGroup",
+                    //     "config": {
+                    //         "key": key
+                    //     }
+                    // },
+                    "script": script
+                });
             }
         }
     }
 
-    async.series(fns, function() {
-        callback(null, gitanaUser);
-    });
+    return rules;
 };