cloudcms-server 0.9.248 → 0.9.253

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "0.9.248",
+  "version": "0.9.253",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -36,9 +36,10 @@
     "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",
     "http-proxy": "^1.18.1",
     "json5": "^1.0.1",
     "jsonwebtoken": "^8.5.1",

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;
 
@@ -37,6 +40,8 @@ var duster = require("../duster/index");
 
 var coreHelpers = require("../duster/helpers/core/index");
 
+var helmet = require("helmet");
+
 var toobusy = require("toobusy-js");
 toobusy.maxLag(500); // 500 ms lag in event queue, quite high but usable for now
 toobusy.interval(250);
@@ -585,6 +590,51 @@ var startSlave = function(config, afterStartFn)
     if (!process.env.CLOUDCMS_STANDALONE_HOST) {
         process.env.CLOUDCMS_STANDALONE_HOST = "local";
     }
+    
+    
+    // auto-configuration for HTTPS
+    if (!process.configuration.https) {
+        process.configuration.https = {};
+    }
+    if (process.env.CLOUDCMS_HTTPS) {
+        process.configuration.https = JSON.parse(process.env.CLOUDCMS_HTTPS);
+    }
+    if (process.env.CLOUDCMS_HTTPS_KEY_FILEPATH) {
+        process.configuration.https.key = fs.readFileSync(process.env.CLOUDCMS_HTTPS_KEY_FILEPATH);
+    }
+    if (process.env.CLOUDCMS_HTTPS_CERT_FILEPATH) {
+        process.configuration.https.cert = fs.readFileSync(process.env.CLOUDCMS_HTTPS_CERT_FILEPATH);
+    }
+    if (process.env.CLOUDCMS_HTTPS_PFX_FILEPATH) {
+        process.configuration.https.pfx = fs.readFileSync(process.env.CLOUDCMS_HTTPS_PFX_FILEPATH);
+    }
+    if (process.env.CLOUDCMS_HTTPS_PASSPHRASE) {
+        process.configuration.https.passphrase = process.env.CLOUDCMS_HTTPS_PASSPHRASE;
+    }
+    if (process.env.CLOUDCMS_HTTPS_REQUEST_CERT === "true") {
+        process.configuration.https.requestCert = true;
+    }
+    if (process.env.CLOUDCMS_HTTPS_CA_FILEPATH) {
+        process.configuration.https.ca = [ fs.readFileSync(process.env.CLOUDCMS_HTTPS_CA_FILEPATH) ];
+    }
+    
+    // if https config is empty, remove it
+    if (Object.keys(process.configuration.https).length === 0) {
+        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;
@@ -618,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 = {};
@@ -1045,8 +1117,17 @@ var startSlave = function(config, afterStartFn)
                                         ////////////////////////////////////////////////////////////////////////////
 
 
-                                        // CORE OBJECTS
-                                        var server = http.Server(app);
+                                        // create the server (either HTTP or HTTPS)
+                                        var server = null;
+                                        if (process.configuration.https) {
+                                            // configure helmet to support auto-upgrade of http->https
+                                            app.use(helmet());
+                                            // create https server
+                                            server = https.createServer(process.configuration.https, app);
+                                        } else {
+                                            // legacy
+                                            server = http.Server(app);
+                                        }
 
                                         // request timeout
                                         var requestTimeout = 30000; // 30 seconds

package/server/standalone.js

@@ -69,6 +69,11 @@ 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");
+    }
 
     console.log("");