cloudcms-server 3.2.336 → 3.2.338

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.336",
+  "version": "3.2.338",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -44,7 +44,7 @@
     "hbs": "^4.2.0",
     "helmet": "^8.0.0",
     "ioredis": "5.4.1",
-    "isolated-vm": "5.0.3",
+    "isolated-vm": "^5.0.3",
     "json5": "^2.2.3",
     "jsonwebtoken": "^9.0.2",
     "klaw": "^4.1.0",

package/util/auth.js

@@ -6,7 +6,6 @@ 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({
@@ -528,6 +527,8 @@ var __handleSyncUser = function(req, strategy, settings, key, domainId, provider
 
 var executeRule = function(req, rule, gitanaUser, callback)
 {
+    console.log("r1: " + rule);
+
     //
     // addToProject(projectId)
     // addToProject(projectId, [teamKey]);
@@ -556,6 +557,8 @@ var executeRule = function(req, rule, gitanaUser, callback)
 
     var addToProject = function(projectId, teamIdentifiers, finished) {
 
+        console.log("r2, projectId: " + projectId + ", teamIdentifiers: " + teamIdentifiers);
+
         if (!teamIdentifiers) {
             teamIdentifiers = "project-users-team";
         }
@@ -565,7 +568,9 @@ var executeRule = function(req, rule, gitanaUser, callback)
         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;
@@ -601,6 +606,7 @@ var executeRule = function(req, rule, gitanaUser, callback)
                 fns.push(fn);
             }
             async.series(fns, function() {
+                console.log("r29");
                 finished();
             });
         });
@@ -608,6 +614,8 @@ var executeRule = function(req, rule, gitanaUser, callback)
 
     var addToPlatformTeams = function(teamIdentifiers, finished) {
 
+        console.log("r3");
+
         if (!teamIdentifiers) {
             teamIdentifiers = "project-users-team";
         }
@@ -617,6 +625,7 @@ var executeRule = function(req, rule, gitanaUser, callback)
         var platform = null;
 
         return Chain(req.gitana.platform()).trap(function(e) {
+            console.log("r31: ", e);
             return false;
         }).then(function() {
             platform = this;
@@ -650,15 +659,19 @@ var executeRule = function(req, rule, gitanaUser, callback)
                 fns.push(fn);
             }
             async.series(fns, function() {
+                console.log("r39");
                 finished();
             });
         });
     };
 
-    const isolate = new IsolatedVM.Isolate({ memoryLimit: 32 });
+    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() {
@@ -676,9 +689,14 @@ var executeRule = function(req, rule, gitanaUser, callback)
         });
     });
 
-    context.evalSync(rule);
+    console.log("r6");
+    context.evalSync(rule, {
+        "timeout": 1000 * 60 // one minute
+    });
+    console.log("r7");
 
     setTimeout(function() {
+        console.log("r8");
         callback();
     }, 250);
 };