cloudcms-server 0.9.249 → 0.9.254

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "0.9.249",
+  "version": "0.9.254",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,7 +16,7 @@
     "agentkeepalive": "^4.1.3",
     "alpaca": "^1.5.27",
     "archiver": "^1.3.0",
-    "async": "^1.5.2",
+    "async": "^3.2.3",
     "aws-sdk": "^2.544.0",
     "basic-auth": "^1.1.0",
     "body-parser": "^1.19.0",
@@ -25,18 +25,18 @@
     "clone": "^2.1.2",
     "connect-flash": "^0.1.1",
     "connect-multiparty": "^2.2.0",
-    "connect-redis": "^3.4.2",
+    "connect-redis": "^6.1.3",
     "consolidate": "^0.14.5",
     "cookie-parser": "^1.4.4",
     "debug": "^2.6.9",
-    "dustjs-helpers": "^1.7.4",
-    "dustjs-linkedin": "^2.7.5",
+    "dustjs-helpers": "^1.6.3",
+    "dustjs-linkedin": "^3.0.1",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
     "express-session": "^1.16.2",
     "express-useragent": "^1.0.13",
     "extend-with-super": "^2.0.0",
-    "gitana": "^1.0.315",
+    "gitana": "^1.0.322",
     "handlebars": "^4.4.2",
     "hbs": "^4.0.5",
     "helmet": "^4.6.0",
@@ -45,13 +45,13 @@
     "jsonwebtoken": "^8.5.1",
     "klaw": "^1.3.1",
     "lru-cache": "^4.1.5",
-    "marked": "^1.2.8",
+    "marked": "^4.0.14",
     "memorystore": "^1.6.1",
     "mime": "^1.6.0",
     "mkdirp": "^0.5.1",
     "moment": "^2.24.0",
     "morgan": "^1.9.1",
-    "node-redis-pubsub": "^1.0.3",
+    "node-redis-pubsub": "^5.0.0",
     "object-hash": "^1.3.1",
     "object-merge": "^2.5.1",
     "on-headers": "^1.0.2",
@@ -63,13 +63,13 @@
     "passport-linkedin": "^1.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
-    "passport-saml": "^2.0.4",
-    "passport-twitter": "^1.0.4",
+    "passport-saml": "^3.2.1",
+    "passport-twitter": "^0.1.5",
     "pkginfo": "^0.4.1",
     "q": "^1.5.1",
     "random-js": "^1.0.8",
     "recursive-readdir": "^2.2.2",
-    "redis": "^2.8.0",
+    "redis": "^4.0.6",
     "redislock": "^1.3.0",
     "request": "^2.88.0",
     "request-param": "^1.0.1",
@@ -79,7 +79,7 @@
     "serve-favicon": "^2.5.0",
     "session-file-store": "^0.2.2",
     "sha1": "^1.1.1",
-    "socket.io": "2.0.3",
+    "socket.io": "^4.4.1",
     "ssl-root-cas": "^1.3.1",
     "sticky-session": "^1.1.2",
     "stomp-client": "^0.9.0",
@@ -88,7 +88,7 @@
     "toobusy-js": "^0.5.1",
     "uuid": "^3.3.2",
     "vm2": "^3.8.4",
-    "watch": "^1.0.2",
+    "watch": "^0.13.0",
     "winston": "^3.3.3"
   },
   "contributors": [

package/server/index.js

@@ -16,6 +16,9 @@ var session = require('express-session');
 var cookieParser = require('cookie-parser');
 var flash = require("connect-flash");
 
+const redis = require('redis');
+const connectRedis = require('connect-redis');
+
 // we don't bind a single passport - instead, we get the constructor here by hand
 var Passport = require("passport").Passport;
 
@@ -620,6 +623,18 @@ var startSlave = function(config, afterStartFn)
         delete process.configuration.https;
     }
     
+    
+    // auto configuration of session store
+    if (!process.configuration.session) {
+        process.configuration.session = {};
+    }
+    if (process.env.CLOUDCMS_SESSION_TYPE) {
+        process.configuration.session.enabled = true;
+        process.configuration.session.type = process.env.CLOUDCMS_SESSION_TYPE;
+    }
+    if (process.env.CLOUDCMS_SESSION_SECRET) {
+        process.configuration.session.secret = process.env.CLOUDCMS_SESSION_SECRET;
+    }
 
     // session store
     var initializedSession = null;
@@ -653,6 +668,28 @@ var startSlave = function(config, afterStartFn)
                 var SessionFileStore = require('session-file-store')(session);
                 sessionConfig.store = new SessionFileStore(options);
             }
+            else if (process.configuration.session.type === "redis")
+            {
+                var redisPort = process.env.CLOUDCMS_REDIS_PORT;
+                var redisHost = process.env.CLOUDCMS_REDIS_ENDPOINT;
+                
+                if (!redisPort)
+                {
+                    console.error("Cannot configure session for Redis storage because CLOUDCMS_REDIS_PORT is not defined");
+                }
+                else if (!redisHost)
+                {
+                    console.error("Cannot configure session for Redis storage because CLOUDCMS_REDIS_ENDPOINT is not defined");
+                }
+                else
+                {
+                    var redisOptions = {};
+                    var redisClient = redis.createClient(redisPort, redisHost, redisOptions);
+                    
+                    var RedisStore = connectRedis(session);
+                    sessionConfig.store = new RedisStore({ client: redisClient });
+                }
+            }
             else if (process.configuration.session.type === "memory" || !process.configuration.session.type)
             {
                 var options = {};

package/server/standalone.js

@@ -69,6 +69,7 @@ server.report(function(callback) {
     console.log("Hosts Directory: " + process.env.CLOUDCMS_HOSTS_PATH);
     console.log("LaunchPad Mode: " + process.env.CLOUDCMS_LAUNCHPAD_SETUP);
     console.log("Max Files Detected: " + process.env.CLOUDCMS_MAX_FILES);
+    console.log("Session Type: " + process.configuration.session.type);
     
     if (process.configuration.https) {
         console.log("Server is configured to use HTTPS");