cloudcms-server 3.2.321 → 3.2.324

package/README.md

@@ -3,7 +3,7 @@ cloudcms-server
 
 A Node.js module that provides a framework and server-side functionality for Cloud CMS deployed Node.js applications.  This module provides the backbone capabilities for the application server tier of Cloud CMS as hosted at cloudcms.net.
 
-For more information on Cloud CMS, please visit https://www.cloudcms.com.
+For more information on Cloud CMS, please visit https://gitana.io.
 
 ## Configuration
 
@@ -22,7 +22,6 @@ This looks like:
     "beforeFunctions": [],
     "afterFunctions": [],
     "reportFunctions": [],
-    "dustFunctions": [],
     "initFunctions": [],
     "viewEngine": "handlebars",
     "storeEngines": {
@@ -116,11 +115,6 @@ This looks like:
             "modules": "hosts_s3fs"
         }
     },
-    "duster": {
-        "fragments": {
-            "cache": true
-        }
-    },
     "virtualHost": {
         "enabled": false
     },

package/index.js

@@ -239,12 +239,10 @@ exports = module.exports = function()
     var registration = require("./middleware/registration/registration");
     var resources = require("./middleware/resources/resources");
     var runtime = require("./middleware/runtime/runtime");
-    var serverTags = require("./middleware/server-tags/server-tags");
     var storeService = require("./middleware/stores/stores");
     var templates = require("./middleware/templates/templates");
     var virtualConfig = require("./middleware/virtual-config/virtual-config");
     var virtualFiles = require("./middleware/virtual-files/virtual-files");
-    var wcm = require("./middleware/wcm/wcm");
     var welcome = require("./middleware/welcome/welcome");
     var awareness = require("./middleware/awareness/awareness");
     var userAgent = require('express-useragent');
@@ -484,15 +482,6 @@ exports = module.exports = function()
 
         // supports user-configured dynamic configuration
         app.use(config.remoteConfigInterceptor());
-
-        // tag processing, injection of scripts, etc, kind of a catch all at the moment
-        app.use(serverTags.interceptor(configuration));
-
-        if (includeCloudCMS)
-        {
-            // handles retrieval of content from wcm
-            app.use(wcm.wcmInterceptor());
-        }
     };
 
     r.handlers = function(app, includeCloudCMS)
@@ -566,12 +555,6 @@ exports = module.exports = function()
         // add User-Agent device info to req
         app.use(userAgent.express());
 
-        if (includeCloudCMS)
-        {
-            // handles retrieval of content from wcm
-            app.use(wcm.wcmHandler());
-        }
-
         // handles 404
         app.use(final.finalHandler());
     };

package/middleware/authentication/authentication.js

@@ -315,16 +315,11 @@ exports = module.exports = function()
         registerAdapter("session", require("./adapters/session"));
 
         // providers
-        registerProvider("cas", require("./providers/cas"));
-        registerProvider("facebook", require("./providers/facebook"));
-        registerProvider("github", require("./providers/github"));
         registerProvider("google", require("./providers/google"));
         registerProvider("keycloak", require("./providers/keycloak"));
-        registerProvider("linkedin", require("./providers/linkedin"));
         registerProvider("local", require("./providers/local"));
         registerProvider("saml", require("./providers/saml"));
         registerProvider("trusted", require("./providers/trusted"));
-        registerProvider("twitter", require("./providers/twitter"));
 
         // authenticators
         registerAuthenticator("default", require("./authenticators/default"));

package/middleware/authentication/providers/saml.js

@@ -1,6 +1,6 @@
 //var auth = require("../../../util/auth");
 
-var SamlStrategy = require('passport-saml').Strategy;
+var SamlStrategy = require('@node-saml/passport-saml').Strategy;
 var AbstractProvider = require("./abstract");
 
 if (!process.configuration) {
@@ -57,10 +57,14 @@ class SAMLProvider extends AbstractProvider
             samlConfig.entryPoint = config.entryPoint;
         }
         if (config.cert) {
-            samlConfig.cert = config.cert;
+            samlConfig.idpCert = config.cert;
         }
-        if (config.callbackURL) {
-            samlConfig.callbackUrl = "http://localhost:5000" + config.callbackURL;
+        var callbackUrl = config.callbackURL;
+        if (!callbackUrl) {
+            callbackUrl = config.callbackUrl;
+        }
+        if (callbackUrl) {
+            samlConfig.callbackUrl = "http://localhost:5000" + callbackUrl;
         }
         if (config.issuer) {
             samlConfig.issuer = config.issuer;

package/middleware/config/adapter.js

@@ -359,50 +359,6 @@ module.exports = function(configStore)
 
             // all done
             callback(null, registry);
-
-            var _watchLog = function(text) {
-                process.log("[Configuration Watch] " + text);
-            };
-
-            if (process.env.CLOUDCMS_APPSERVER_CONFIG_WATCH === "true" || process.env.CLOUDCMS_APPSERVER_CONFIG_WATCH === true)
-            {
-                _watchLog("Setting up live watch...");
-
-                // set a watch
-                // watch for changes and when they happen, reload context
-                (function (registry) {
-
-                    configStore.watchDirectory("/", function () {
-
-                        _watchLog("Detected changes on disk - reloading...");
-
-                        var t1 = Date.now();
-
-                        // reload context
-                        loadContext(function (err, context) {
-
-                            if (err) {
-                                return _watchLog("Failed to load configuration context: " + err);
-                            }
-
-                            try
-                            {
-                                compileContextToRegistry(context);
-                                registry.reloadContext(context);
-
-                                var t2 = Date.now();
-                                _watchLog("Reloaded context in: " + (t2 - t1) + " ms");
-                            }
-                            catch (e)
-                            {
-                                _watchLog("Caught error while compiling and reloading context: " + err);
-                            }
-                        });
-                    });
-
-                })(registry);
-            }
-
         });
     };
 

package/middleware/deployment/deployment.js

@@ -1,10 +1,4 @@
-//var path = require('path');
-//var fs = require('fs');
-//var http = require('http');
 var util = require("../../util/util");
-//var uuidv4 = require("uuid/v4");
-//var Gitana = require("gitana");
-var duster = require("../../duster/index");
 
 /**
  * Deployment middleware.
@@ -304,10 +298,6 @@ exports = module.exports = function()
                     logFn("Invalidating application cache for application: " + descriptor.application.id);
                     process.cache.invalidateCacheForApp(descriptor.application.id);
 
-                    // invalidate "duster" cache for this application
-                    logFn("Invalidating duster cache for application: " + descriptor.application.id);
-                    duster.invalidateCacheForApp(descriptor.application.id);
-
                     // invalidate gitana driver for this application
                     process.broadcast.publish("application_invalidation", {
                         "applicationId": descriptor.application.id,

package/middleware/registration/registration.js

@@ -1,9 +1,4 @@
-var path = require('path');
-var fs = require('fs');
-var http = require('http');
 var util = require("../../util/util");
-var Gitana = require("gitana");
-var duster = require("../../duster/index");
 var async = require("async");
 var auth = require("../../util/auth");
 

package/middleware/stores/engines/empty.js

@@ -84,10 +84,6 @@ exports = module.exports = function(engineId, engineType, engineConfig)
         callback(null, null); //data
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         callback(null);

package/middleware/stores/engines/fs-caching-adapter.js

@@ -442,11 +442,6 @@ exports = module.exports = function(remoteStore, settings)
         cacheStore.readFile(filePath, callback);
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        // NOT IMPLEMENTED
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         remoteStore.moveFile(originalFilePath, newFilePath, function(err) {

package/middleware/stores/engines/fs.js

@@ -4,8 +4,6 @@ var http = require('http');
 
 var util = require("../../../util/util");
 
-var watch = require("watch");
-
 var async = require("async");
 
 /**
@@ -217,13 +215,6 @@ exports = module.exports = function(engineConfig)
         });
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        watch.watchTree(toStoragePath(directoryPath), function(f, curr, prev) {
-            onChange(f, curr, prev);
-        });
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         fs.rename(toStoragePath(originalFilePath), newFilePath, function(err) {

package/middleware/stores/engines/s3.js

@@ -408,11 +408,6 @@ exports = module.exports = function(engineConfig)
         });
     };
 
-    // NOT IMPLEMENTED IN S3
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         var originalKey = _toKey(originalFilePath);

package/middleware/stores/engines/s3fs.js

@@ -79,11 +79,6 @@ exports = module.exports = function(engineConfig)
         cachingAdapter.readFile(filePath, callback);
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        cachingAdapter.watchDirectory(directoryPath, onChange);
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         cachingAdapter.moveFile(originalFilePath, newFilePath, callback);

package/middleware/stores/multistore.js

@@ -283,35 +283,6 @@ exports = module.exports = function(originalStores)
         });
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        findFileStores(directoryPath, function(err, stores) {
-
-            if (err) {
-                return;
-            }
-
-            if (stores.length === 0) {
-                return;
-            }
-
-            var fns = [];
-            for (var i = 0; i < stores.length; i++)
-            {
-                var fn = function(s, directoryPath) {
-                    return function(done) {
-                        s.watchDirectory(directoryPath, onChange);
-                        done();
-                    }
-                }(stores[i], directoryPath);
-                fns.push(fn);
-            }
-            async.series(fns, function() {
-                // done
-            });
-        });
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         // TODO: not implemented

package/middleware/stores/store.js

@@ -236,15 +236,6 @@ exports = module.exports = function(engine, engineType, engineId, engineConfigur
         });
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        debugStart("Start store.watchDirectory: " + _enginePath(directoryPath));
-        engine.watchDirectory(_enginePath(directoryPath), function(f, curr, prev) {
-            debugFinish("Finish store.watchDirectory");
-            onChange(f, curr, prev);
-        });
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         debugStart("Start store.moveFile");

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

@@ -165,169 +165,172 @@ exports = module.exports = function()
         // so that only N number of virtual configs are loaded at a time
         enqueueLoadVirtualConfig(function(host, rootStore, logMethod, callback) {
 
-            rootStore.existsFile("gitana.json", function(exists) {
-
-                var loadFromRemote = function(finishedLoading) {
-
-                    // check cache to see if we already tried to load this in the past few minutes and were sorely disappointed
-                    process.cache.read(VCSENTINEL_CACHE_KEY, function (err, doesNotExist) {
+            return function()
+            {
+                rootStore.existsFile("gitana.json", function(exists) {
 
-                        if (doesNotExist) {
-                            return finishedLoading({
-                                "message": "No virtual config found for host (from previous attempt)"
-                            }, null, true);
-                        }
+                    var loadFromRemote = function(finishedLoading) {
 
-                        // load the gitana.json file from Cloud CMS
-                        loadConfigForVirtualHost(host, logMethod, function (err, virtualConfig) {
+                        // check cache to see if we already tried to load this in the past few minutes and were sorely disappointed
+                        process.cache.read(VCSENTINEL_CACHE_KEY, function (err, doesNotExist) {
 
-                            if (err)
-                            {
-                                // something failed, perhaps a network issue
-                                // don't store anything
-                                return finishedLoading(err);
+                            if (doesNotExist) {
+                                return finishedLoading({
+                                    "message": "No virtual config found for host (from previous attempt)"
+                                }, null, true);
                             }
 
-                            if (!virtualConfig)
-                            {
-                                // mark that it failed (30 minute TTL)
-                                return process.cache.write(VCSENTINEL_CACHE_KEY, true, BLACKLIST_TTL_SECONDS, function() {
-                                    finishedLoading({
-                                        "message": "No virtual config found for host: " + host
-                                    });
-                                });
-                            }
+                            // load the gitana.json file from Cloud CMS
+                            loadConfigForVirtualHost(host, logMethod, function (err, virtualConfig) {
 
-                            // populate gitana.json
-                            var gitanaJson = {
-                                "clientKey": virtualConfig.clientKey
-                            };
-                            if (virtualConfig.clientSecret) {
-                                gitanaJson.clientSecret = virtualConfig.clientSecret;
-                            }
-                            if (virtualConfig.username) {
-                                gitanaJson.username = virtualConfig.username;
-                            }
-                            if (virtualConfig.password) {
-                                gitanaJson.password = virtualConfig.password;
-                            }
-                            if (virtualConfig.application) {
-                                gitanaJson.application = virtualConfig.application;
-                            }
-                            if (virtualConfig.baseURL) {
-                                gitanaJson.baseURL = virtualConfig.baseURL;
-                            }
-                            if (!gitanaJson.baseURL)
-                            {
-                                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
-                            gitanaJson._virtual = true;
-
-                            // write the gitana.json file
-                            rootStore.writeFile("gitana.json", JSON.stringify(gitanaJson, null, "   "), function (err) {
-
-                                // if we failed to write the file, then delete and call back with error
                                 if (err)
                                 {
-                                    return rootStore.deleteFile("gitana.json", function() {
-                                        finishedLoading(err);
+                                    // something failed, perhaps a network issue
+                                    // don't store anything
+                                    return finishedLoading(err);
+                                }
+
+                                if (!virtualConfig)
+                                {
+                                    // mark that it failed (30 minute TTL)
+                                    return process.cache.write(VCSENTINEL_CACHE_KEY, true, BLACKLIST_TTL_SECONDS, function() {
+                                        finishedLoading({
+                                            "message": "No virtual config found for host: " + host
+                                        });
                                     });
                                 }
 
-                                // make sure the file wrote successfully
-                                // check stats, ensure non-error and file size > 0
-                                rootStore.fileStats("gitana.json", function(err, stats) {
+                                // populate gitana.json
+                                var gitanaJson = {
+                                    "clientKey": virtualConfig.clientKey
+                                };
+                                if (virtualConfig.clientSecret) {
+                                    gitanaJson.clientSecret = virtualConfig.clientSecret;
+                                }
+                                if (virtualConfig.username) {
+                                    gitanaJson.username = virtualConfig.username;
+                                }
+                                if (virtualConfig.password) {
+                                    gitanaJson.password = virtualConfig.password;
+                                }
+                                if (virtualConfig.application) {
+                                    gitanaJson.application = virtualConfig.application;
+                                }
+                                if (virtualConfig.baseURL) {
+                                    gitanaJson.baseURL = virtualConfig.baseURL;
+                                }
+                                if (!gitanaJson.baseURL)
+                                {
+                                    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
+                                gitanaJson._virtual = true;
+
+                                // write the gitana.json file
+                                rootStore.writeFile("gitana.json", JSON.stringify(gitanaJson, null, "   "), function (err) {
 
-                                    // if we failed to read stats, then delete and call back with error
-                                    if (err || stats.size === 0)
+                                    // if we failed to write the file, then delete and call back with error
+                                    if (err)
                                     {
                                         return rootStore.deleteFile("gitana.json", function() {
-                                            finishedLoading({
-                                                "message": "There was a problem writing the driver configuration file.  Please reload."
-                                            });
+                                            finishedLoading(err);
                                         });
                                     }
 
-                                    finishedLoading(null, gitanaJson);
+                                    // make sure the file wrote successfully
+                                    // check stats, ensure non-error and file size > 0
+                                    rootStore.fileStats("gitana.json", function(err, stats) {
+
+                                        // if we failed to read stats, then delete and call back with error
+                                        if (err || stats.size === 0)
+                                        {
+                                            return rootStore.deleteFile("gitana.json", function() {
+                                                finishedLoading({
+                                                    "message": "There was a problem writing the driver configuration file.  Please reload."
+                                                });
+                                            });
+                                        }
+
+                                        finishedLoading(null, gitanaJson);
+                                    });
                                 });
                             });
                         });
-                    });
-                };
-
-                if (exists)
-                {
-                    // read gitana json and send back
-                    rootStore.readFile("gitana.json", function(err, data) {
+                    };
 
-                        if (err)
-                        {
-                            return callback(err);
-                        }
-
-                        if (!data)
-                        {
-                            return callback({
-                                "message": "The gitana.json data read from disk was null or empty"
-                            })
-                        }
-
-                        // make sure not size 0
-                        rootStore.fileStats("gitana.json", function(err, stats) {
+                    if (exists)
+                    {
+                        // read gitana json and send back
+                        rootStore.readFile("gitana.json", function(err, data) {
 
                             if (err)
                             {
                                 return callback(err);
                             }
 
-                            // if we failed to read stats or file size 0, then delete and call back with error
-                            if (err || stats.size === 0)
+                            if (!data)
                             {
-                                return rootStore.deleteFile("gitana.json", function() {
-                                    callback({
-                                        "message": "There was a problem writing the driver configuration file.  Please reload."
-                                    });
-                                });
+                                return callback({
+                                    "message": "The gitana.json data read from disk was null or empty"
+                                })
                             }
 
-                            // remove vcSentinel if it exists
-                            process.cache.remove(VCSENTINEL_CACHE_KEY);
+                            // make sure not size 0
+                            rootStore.fileStats("gitana.json", function(err, stats) {
 
-                            var gitanaJson = JSON.parse("" + data);
+                                if (err)
+                                {
+                                    return callback(err);
+                                }
 
-                            // auto-upgrade the host?
-                            if (gitanaJson.baseURL)
-                            {
-                                var newBaseURL = util.cleanupURL(gitanaJson.baseURL);
-                                if (newBaseURL !== gitanaJson.baseURL)
+                                // if we failed to read stats or file size 0, then delete and call back with error
+                                if (err || stats.size === 0)
                                 {
-                                    console.log("Auto-upgrade gitana.json from: " + gitanaJson.baseURL + ", to: " + newBaseURL);
+                                    return rootStore.deleteFile("gitana.json", function() {
+                                        callback({
+                                            "message": "There was a problem writing the driver configuration file.  Please reload."
+                                        });
+                                    });
+                                }
 
-                                    gitanaJson.baseURL = newBaseURL;
+                                // remove vcSentinel if it exists
+                                process.cache.remove(VCSENTINEL_CACHE_KEY);
 
-                                    // write the gitana.json file
-                                    rootStore.writeFile("gitana.json", JSON.stringify(gitanaJson, null, "   "), function (err) {
-                                        // nada
-                                    });
+                                var gitanaJson = JSON.parse("" + data);
+
+                                // auto-upgrade the host?
+                                if (gitanaJson.baseURL)
+                                {
+                                    var newBaseURL = util.cleanupURL(gitanaJson.baseURL);
+                                    if (newBaseURL !== gitanaJson.baseURL)
+                                    {
+                                        console.log("Auto-upgrade gitana.json from: " + gitanaJson.baseURL + ", to: " + newBaseURL);
+
+                                        gitanaJson.baseURL = newBaseURL;
+
+                                        // write the gitana.json file
+                                        rootStore.writeFile("gitana.json", JSON.stringify(gitanaJson, null, "   "), function (err) {
+                                            // nada
+                                        });
+                                    }
                                 }
-                            }
 
-                            // otherwise, fine!
-                            callback(null, gitanaJson);
+                                // otherwise, fine!
+                                callback(null, gitanaJson);
+                            });
                         });
-                    });
-                }
-                else
-                {
-                    loadFromRemote(function(err, gitanaJson, doesNotExist) {
-                        callback(err, gitanaJson, doesNotExist);
-                    });
-                }
-            });
+                    }
+                    else
+                    {
+                        loadFromRemote(function(err, gitanaJson, doesNotExist) {
+                            callback(err, gitanaJson, doesNotExist);
+                        });
+                    }
+                });
+            }
 
-        }((host, rootStore, logMethod, callback)));
+        }(host, rootStore, logMethod, callback));
     };
 
     r.interceptor = function()