cloudcms-server 0.9.244 → 0.9.249

package/.last_command

@@ -0,0 +1,7 @@
+{
+  "command": {
+    "group": "server",
+    "name": "start"
+  },
+  "arguments": {}
+}

package/index.js

@@ -34,7 +34,7 @@ process.logInfo = process.log = function(text, level)
 var Gitana = require("gitana");
 
 // default http timeout
-process.defaultHttpTimeoutMs = 120000; // 2 minutes
+process.defaultHttpTimeoutMs = 60000;
 
 if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
 {
@@ -54,20 +54,18 @@ var HttpsKeepAliveAgent = require('agentkeepalive').HttpsAgent;
 http.globalAgent = new HttpKeepAliveAgent({
     keepAlive: true,
     keepAliveMsecs: 1000,
-    keepAliveTimeout: 30000,
+    maxSockets: 16000,
+    maxFreeSockets: 256,
     timeout: process.defaultHttpTimeoutMs,
-    maxSockets: 200,
-    maxFreeSockets: 40,
-    rejectUnauthorized: false
+    freeSocketTimeout: 30000
 });
 https.globalAgent = new HttpsKeepAliveAgent({
     keepAlive: true,
     keepAliveMsecs: 1000,
-    keepAliveTimeout: 30000,
+    maxSockets: 16000,
+    maxFreeSockets: 256,
     timeout: process.defaultHttpTimeoutMs,
-    maxSockets: 200,
-    maxFreeSockets: 40,
-    rejectUnauthorized: false
+    freeSocketTimeout: 30000
 });
 
 // disable for now
@@ -138,6 +136,7 @@ exports = module.exports = function()
     // not already specified
     var defaultGitanaProxyScheme = "https";
     var defaultGitanaProxyHost = "api.cloudcms.com";
+    var defaultGitanaProxyPath = "";
     var defaultGitanaProxyPort = 443;
 
     var gitanaJsonPath = path.join(process.env.CLOUDCMS_APPSERVER_BASE_PATH, "gitana.json");
@@ -149,6 +148,7 @@ exports = module.exports = function()
             var parsedUrl = url.parse(gitanaJson.baseURL);
 
             defaultGitanaProxyHost = parsedUrl.hostname;
+            defaultGitanaProxyPath = parsedUrl.path;
             defaultGitanaProxyScheme = parsedUrl.protocol.substring(0, parsedUrl.protocol.length - 1); // remove the :
 
             if (parsedUrl.port)
@@ -173,13 +173,16 @@ exports = module.exports = function()
     if (!process.env.GITANA_PROXY_HOST) {
         process.env.GITANA_PROXY_HOST = defaultGitanaProxyHost;
     }
+    if (!process.env.GITANA_PROXY_PATH) {
+        process.env.GITANA_PROXY_PATH = defaultGitanaProxyPath;
+    }
     if (!process.env.GITANA_PROXY_PORT) {
         process.env.GITANA_PROXY_PORT = defaultGitanaProxyPort;
     }
 
     if (cluster.isMaster)
     {
-        process.log("Gitana Proxy pointed to: " + util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT));
+        process.log("Gitana Proxy pointed to: " + util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH));
     }
 
     // all web modules are included by default

package/insight/insight.js

@@ -131,7 +131,7 @@ var doSend = function(callback)
     }
 
     // url over to cloud cms
-    var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/warehouses/" + warehouseId + "/interactions/_create";
+    var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/warehouses/" + warehouseId + "/interactions/_create";
     var requestConfig = {
         "url": URL,
         "qs": {},

package/middleware/awareness/plugins/editorial.js

@@ -43,7 +43,7 @@ exports.bindSocket = function(socket, provider)
         var acquireEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, force, callback)
         {
             // send an HTTP command to acquire an editorial session for this repository and branch
-            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/acquire";
+            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/session/acquire";
 
             var headers = {};
             //headers["Authorization"] = socket.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
@@ -101,7 +101,7 @@ exports.bindSocket = function(socket, provider)
     var releaseEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
         // send an HTTP command to release the session
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/release";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/session/release";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -152,7 +152,7 @@ exports.bindSocket = function(socket, provider)
      */
     var commitEditorialSession = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/commit";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/session/commit";
 
         var json = {};
         json.repositoryId = repositoryId;
@@ -202,7 +202,7 @@ exports.bindSocket = function(socket, provider)
      */
     var editorialSessionInfo = function(socket, provider, sessionKey, repositoryId, branchId, callback)
     {
-        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/oneteam/editorial/session/info";
+        var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/oneteam/editorial/session/info";
 
         var json = {};
         json.repositoryId = repositoryId;

package/middleware/form/form.js

@@ -121,7 +121,7 @@ exports = module.exports = function()
             }
 
             // post form to Cloud CMS using public method
-            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + url;
+            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + url;
 
             var headers = {};
             headers["Authorization"] = req.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
@@ -194,7 +194,7 @@ exports = module.exports = function()
 
             var url = branch.getUri() + "/alpaca/datasource";
 
-            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + url;
+            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + url;
 
             var headers = {};
             headers["Authorization"] = req.gitana.platform().getDriver().getHttpHeaders()["Authorization"];

package/middleware/proxy/proxy.js

@@ -215,8 +215,7 @@ exports = module.exports = function()
                 contentStore.writeFile(filePath + ".cache", JSON.stringify(cacheInfo), function() {
                     _end.call(res, data, encoding);
                 });
-
-            };
+``            };
 
             callback();
         });

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

@@ -83,7 +83,7 @@ exports = module.exports = function()
 
                 var URL = configuration.virtualDriver.baseURL;
                 if (!URL) {
-                    URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT);
+                    URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH);
                 }
                 URL += "/virtual/driver/config";
                 var requestConfig = {
@@ -217,7 +217,7 @@ exports = module.exports = function()
                         }
                         if (!gitanaJson.baseURL)
                         {
-                            gitanaJson.baseURL = util.cleanupURL(util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT));
+                            gitanaJson.baseURL = util.cleanupURL(util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH));
                         }
 
                         // mark as retrieved from virtual driver
@@ -340,7 +340,7 @@ exports = module.exports = function()
             // defaults
             if (!configuration.baseURL)
             {
-                configuration.baseURL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT);
+                configuration.baseURL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH);
             }
             if (!configuration.key) {
                 configuration.key = "virtual";

package/package.json

@@ -6,14 +6,14 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "0.9.244",
+  "version": "0.9.249",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
   },
   "dependencies": {
     "accepts": "^1.3.7",
-    "agentkeepalive": "^2.2.0",
+    "agentkeepalive": "^4.1.3",
     "alpaca": "^1.5.27",
     "archiver": "^1.3.0",
     "async": "^1.5.2",
@@ -39,12 +39,13 @@
     "gitana": "^1.0.315",
     "handlebars": "^4.4.2",
     "hbs": "^4.0.5",
-    "http-proxy": "^1.18.0",
+    "helmet": "^4.6.0",
+    "http-proxy": "^1.18.1",
     "json5": "^1.0.1",
     "jsonwebtoken": "^8.5.1",
     "klaw": "^1.3.1",
     "lru-cache": "^4.1.5",
-    "marked": "^0.3.19",
+    "marked": "^1.2.8",
     "memorystore": "^1.6.1",
     "mime": "^1.6.0",
     "mkdirp": "^0.5.1",
@@ -55,14 +56,14 @@
     "object-merge": "^2.5.1",
     "on-headers": "^1.0.2",
     "passport": "^0.4.0",
-    "passport-cas": "^0.1.1",
+    "passport-cas": "^0.0.3",
     "passport-facebook": "^2.1.1",
     "passport-github": "^1.1.0",
     "passport-google-oauth": "^1.0.0",
     "passport-linkedin": "^1.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
-    "passport-saml": "^0.33.0",
+    "passport-saml": "^2.0.4",
     "passport-twitter": "^1.0.4",
     "pkginfo": "^0.4.1",
     "q": "^1.5.1",
@@ -85,13 +86,11 @@
     "targz": "^1.0.1",
     "temp": "^0.8.3",
     "toobusy-js": "^0.5.1",
-    "uuid": "^3.3.3",
+    "uuid": "^3.3.2",
     "vm2": "^3.8.4",
     "watch": "^1.0.2",
     "winston": "^3.3.3"
   },
-  "devDependencies": {},
-  "optionalDependencies": {},
   "contributors": [
     {
       "name": "Michael Uzquiano",

package/server/index.js

@@ -37,6 +37,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 +587,39 @@ 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;
+    }
+    
 
     // session store
     var initializedSession = null;
@@ -1045,8 +1080,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

@@ -45,6 +45,7 @@ server.report(function(callback) {
     console.log("Server Base Path: " + process.env.CLOUDCMS_APPSERVER_BASE_PATH);
     console.log("Gitana Scheme: " + process.env.GITANA_PROXY_SCHEME);
     console.log("Gitana Host: " + process.env.GITANA_PROXY_HOST);
+    console.log("Gitana Path: " + process.env.GITANA_PROXY_PATH);
     console.log("Gitana Port: " + process.env.GITANA_PROXY_PORT);
     console.log("CPU Count: " + cpuCount);
 
@@ -68,6 +69,10 @@ 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);
+    
+    if (process.configuration.https) {
+        console.log("Server is configured to use HTTPS");
+    }
 
     console.log("");
 

package/util/cloudcms.js

@@ -382,7 +382,7 @@ exports = module.exports = function()
                     agent = https.globalAgent;
                 }
 
-                var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + uri;
+                var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + uri;
                 request({
                     "method": "GET",
                     "url": URL,
@@ -536,8 +536,8 @@ exports = module.exports = function()
                     // ensure stream is closed
                     closeWriteStream(tempStream);
 
-                    process.log("_writeToDisk request timed out");
-                    process.log(e)
+                    //process.log("_writeToDisk request timed out");
+                    //process.log(e)
                 }).on('end', function (e) {
 
                     // ensure stream is closed

package/util/proxy-factory.js

@@ -100,12 +100,22 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
 
     // error handling
     proxyServer.on("error", function(err, req, res) {
-        process.log(err);
-        res.writeHead(500, {
-            'Content-Type': 'text/plain'
-        });
+        console.log("A proxy error was caught: " + err + ", json: " + JSON.stringify(err) + ", path: " + req.path);
 
-        res.end('Something went wrong while proxying the request.');
+        // do our best to send something back
+        try
+        {
+            res.writeHead(500, {
+                'Content-Type': 'text/plain'
+            });
+        }
+        catch (e) { }
+
+        try
+        {
+            res.end('Something went wrong while proxying the request.');
+        }
+        catch (e) { }
     });
 
     // if we're using auth credentials that are picked up in SSO chain, then we listen for a 401

package/util/renditions.js

@@ -61,7 +61,7 @@ exports = module.exports = function()
 
         var syncRows = function(rows, callback)
         {
-            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT) + "/bulk/pagerenditions";
+            var URL = util.asURL(process.env.GITANA_PROXY_SCHEME, process.env.GITANA_PROXY_HOST, process.env.GITANA_PROXY_PORT, process.env.GITANA_PROXY_PATH) + "/bulk/pagerenditions";
 
             var agent = http.globalAgent;
             if (process.env.GITANA_PROXY_SCHEME === "https")

package/util/util.js

@@ -1787,7 +1787,7 @@ var zip = exports.zip = function(directoryPath, writableStream)
  *
  * @type {Function}
  */
-var asURL = exports.asURL = function(protocol, host, port)
+var asURL = exports.asURL = function(protocol, host, port, path)
 {
     // protocol lower case
     protocol = protocol.toLowerCase();
@@ -1813,6 +1813,19 @@ var asURL = exports.asURL = function(protocol, host, port)
         }
     }
 
+    // include url "path" if defined
+    if (path) {
+        path = '/' + path;
+        path = path.replace(/\/+/g, '/'); // ensure no extra '/' characters
+        if (path.endsWith('/')) {
+            // remove trailing '/' character
+            path = path.substring(0, path.length - 1);
+        }
+        if (path) {
+            url += path;                
+        }
+    }
+
     return url;
 };