cloudcms-server 4.0.0-beta.10 → 4.0.0-beta.14

package/README.md

@@ -116,11 +116,6 @@ This looks like:
             "modules": "hosts_s3fs"
         }
     },
-    "duster": {
-        "fragments": {
-            "cache": true
-        }
-    },
     "virtualHost": {
         "enabled": false
     },

package/index.js

@@ -29,12 +29,45 @@ process.logInfo = process.log = function(text, level)
     systemLogger.log(text, level);
 };
 
+// var debugLog = process.debugLog = function(req, message)
+// {
+//     var text = "[" + req.id + "] URL: " + req.url;
+//     // if (req.headers)
+//     // {
+//     //     text += ", HEADERS: " + JSON.stringify(req.headers);
+//     // }
+//     if (req.query)
+//     {
+//         text += ", QUERY: " + JSON.stringify(req.query);
+//     }
+//     text += ", MESSAGE: " + message;
+//
+//     console.log(text);
+// };
+//
+// var debugMiddleware = process.debugMiddleware = function(message)
+// {
+//     return function(req, res, next)
+//     {
+//         debugLog(req, message);
+//
+//         next();
+//     }
+// };
+
+
 
 // by default, set up Gitana driver so that it limits to five concurrent HTTP requests back to Cloud CMS API at at time
 var Gitana = require("gitana");
 
-// default http timeout
-process.defaultHttpTimeoutMs = 60000;
+// default keep alive (3 minutes)
+process.defaultKeepAliveMs = (3 * 60 * 1000);
+
+// default http timeout (2 minutes)
+process.defaultHttpTimeoutMs = 2 * 60 * 1000;
+
+// default exclusive lock timeout (2 minutes)
+process.defaultExclusiveLockTimeoutMs = 2 * 60 * 1000;
 
 if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
 {
@@ -51,27 +84,37 @@ if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
 // dns fix for Node 17 +
 // see: https://nodejs.org/api/dns.html#dnssetdefaultresultorderorder
 var dns = require("dns");
-dns.setDefaultResultOrder("ipv4first");
+if (typeof(dns.setDefaultResultOrder) !== "undefined") {
+    dns.setDefaultResultOrder("ipv4first");
+}
 
 // default agents
 var HttpKeepAliveAgent = require('agentkeepalive');
 var HttpsKeepAliveAgent = require('agentkeepalive').HttpsAgent;
 http.globalAgent = new HttpKeepAliveAgent({
     keepAlive: true,
-    keepAliveMsecs: 5000,
-    maxSockets: 16000,
+    keepAliveMsecs: process.defaultKeepAliveMs,
+    maxSockets: 1024,
     maxFreeSockets: 256,
     timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 4000
+    freeSocketTimeout: 5000
 });
 https.globalAgent = new HttpsKeepAliveAgent({
     keepAlive: true,
-    keepAliveMsecs: 1000,
-    maxSockets: 16000,
+    keepAliveMsecs: process.defaultKeepAliveMs,
+    maxSockets: 1024,
     maxFreeSockets: 256,
     timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 4000
+    freeSocketTimeout: 5000
+});
+
+// install dns cache
+const CacheableLookup = require("cacheable-lookup");
+const cacheable = new CacheableLookup({
+    // Set any custom options here
 });
+cacheable.install(http.globalAgent);
+cacheable.install(https.globalAgent);
 
 // disable for now
 /*
@@ -141,8 +184,8 @@ exports = module.exports = function()
     // not already specified
     var defaultGitanaProxyScheme = "https";
     var defaultGitanaProxyHost = "api.cloudcms.com";
-    var defaultGitanaProxyPort = 443;
     var defaultGitanaProxyPath = "";
+    var defaultGitanaProxyPort = 443;
 
     var gitanaJsonPath = path.join(process.env.CLOUDCMS_APPSERVER_BASE_PATH, "gitana.json");
     if (fs.existsSync(gitanaJsonPath))
@@ -153,8 +196,8 @@ exports = module.exports = function()
             var parsedUrl = url.parse(gitanaJson.baseURL);
 
             defaultGitanaProxyHost = parsedUrl.hostname;
-            defaultGitanaProxyScheme = parsedUrl.protocol.substring(0, parsedUrl.protocol.length - 1); // remove the :
             defaultGitanaProxyPath = parsedUrl.path;
+            defaultGitanaProxyScheme = parsedUrl.protocol.substring(0, parsedUrl.protocol.length - 1); // remove the :
 
             if (parsedUrl.port)
             {
@@ -178,13 +221,13 @@ exports = module.exports = function()
     if (!process.env.GITANA_PROXY_HOST) {
         process.env.GITANA_PROXY_HOST = defaultGitanaProxyHost;
     }
-    if (!process.env.GITANA_PROXY_PORT) {
-        process.env.GITANA_PROXY_PORT = defaultGitanaProxyPort;
-    }
     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.env.GITANA_PROXY_PATH));
@@ -223,13 +266,11 @@ 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 themes = require("./middleware/themes/themes");
     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');
@@ -469,15 +510,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)
@@ -557,12 +589,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"));
@@ -361,7 +356,7 @@ exports = module.exports = function()
                         };
                     }
 
-                    console.log("Auth Callback failed, err: " + JSON.stringify(err));
+                    console.log("Auth Callback failed, err: " + err + ", err json: " + JSON.stringify(err));
 
                     if (err.message)
                     {
@@ -390,13 +385,19 @@ exports = module.exports = function()
 
                 return function (err, profile, info) {
 
+                    if (err) {
+                        console.log("Caught error on auth callback function: ", err, JSON.stringify(err));
+                    }
+
                     if (err) {
                         return handleFailure(err, res);
                     }
 
                     if (!profile || !info)
                     {
-                        return handleFailure(null, res);
+                        return handleFailure({
+                            "message": "Authentication callback missing both profile and info"
+                        }, res);
                     }
 
                     // store these onto request
@@ -695,11 +696,11 @@ exports = module.exports = function()
         return function(req, res, next) {
 
             // record filter start time
-            var _auth_filter_start_ms = new Date().getTime();
+            var _auth_filter_start_ms = Date.now();
 
             fn(req, res, function(result, authenticator) {
 
-                var _auth_filter_end_ms = new Date().getTime() - _auth_filter_start_ms;
+                var _auth_filter_end_ms = Date.now() - _auth_filter_start_ms;
 
                 util.setHeader(res, "x-cloudcms-auth-filter-ms", _auth_filter_end_ms);
 
@@ -736,8 +737,11 @@ exports = module.exports = function()
                         };
                     }
 
-                    if (result.err && result.err.message) {
-                        req.log("Auth strategy: " + strategyId + " - filter error: " + result.err.message);
+                    if (!result.skip)
+                    {
+                        if (result.err && result.err.message) {
+                            req.log("Auth strategy: " + strategyId + " - filter error: " + result.err.message);
+                        }
                     }
 
                     var providerId = null;
@@ -810,7 +814,31 @@ exports = module.exports = function()
                             }
                             redirectUrl += "requested_url=" + requested_url;
 
-                            return res.redirect(redirectUrl);
+                            res.status(200);
+                            res.type("text/html");
+
+                            // serve back a redirect via html
+                            var html = " \
+                                <html> \
+                                    <head> \
+                                        <script> \
+                                            var _redirectUrl = '" + redirectUrl + "'; \
+                                            var hash = window.location.hash ? window.location.hash : ''; \
+                                            if (hash && hash.indexOf('#') === 0) { \
+                                                hash = hash.substring(1); \
+                                            } \
+                                            if (hash) { \
+                                                _redirectUrl += '&requested_hash=' + hash; \
+                                            } \
+                                            window.location.href = _redirectUrl; \
+                                </script> \
+                                    </head> \
+                                </html> \
+                            ";
+                            res.send(html);
+                            return;
+
+                            //return res.redirect(redirectUrl);
                         }
                         else if (loginHandler)
                         {

package/middleware/authentication/providers/saml.js

@@ -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 = new Date().getTime();
-
-                        // reload context
-                        loadContext(function (err, context) {
-
-                            if (err) {
-                                return _watchLog("Failed to load configuration context: " + err);
-                            }
-
-                            try
-                            {
-                                compileContextToRegistry(context);
-                                registry.reloadContext(context);
-
-                                var t2 = new Date().getTime();
-                                _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,5 +1,4 @@
 var util = require("../../util/util");
-var duster = require("../../duster/index");
 
 /**
  * Deployment middleware.
@@ -299,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,
@@ -348,36 +343,39 @@ exports = module.exports = function()
                 var rootStore = stores.root;
                 rootStore.allocated(function(allocated) {
 
+                    console.log("H2: " + allocated);
                     if (!allocated) {
-                        return callback({
+                        callback({
                             "message": "The application cannot be started because it is not deployed."
                         });
                     }
+                    else
+                    {
+                        rootStore.readFile("descriptor.json", function (err, data) {
 
-                    rootStore.readFile("descriptor.json", function (err, data) {
-
-                        if (err) {
-                            return callback(err);
-                        }
+                            if (err) {
+                                return callback(err);
+                            }
 
-                        data = JSON.parse(data);
+                            data = JSON.parse(data);
 
-                        // is it already started?
-                        if (data.active) {
-                            return callback({
-                                "message": "The application is already started"
-                            });
-                        }
+                            // is it already started?
+                            if (data.active) {
+                                return callback({
+                                    "message": "The application is already started"
+                                });
+                            }
 
-                        data.active = true;
+                            data.active = true;
 
-                        logFn("Starting application: " + data.application.id + " with host: " + host);
+                            logFn("Starting application: " + data.application.id + " with host: " + host);
 
-                        rootStore.writeFile("descriptor.json", JSON.stringify(data, null, "  "), function (err) {
-                            console.log("Start error: "+ err);
-                            callback(err);
+                            rootStore.writeFile("descriptor.json", JSON.stringify(data, null, "  "), function (err) {
+                                console.log("Start error: "+ err);
+                                callback(err);
+                            });
                         });
-                    });
+                    }
                 });
             });
         });

package/middleware/driver/driver.js

@@ -3,6 +3,8 @@ var http = require('http');
 var util = require("../../util/util");
 var async = require("async");
 
+var Loaders = require("../../util/loaders");
+
 var Gitana = require("gitana");
 
 ////////////////////////////////////////////////////////////////////////////
@@ -38,6 +40,27 @@ exports = module.exports = function()
     var r = {};
 
     var doConnect = r.doConnect = function(req, gitanaConfig, callback)
+    {
+        var key = JSON.stringify(gitanaConfig);
+
+        var loader = function(req, gitanaConfig)
+        {
+            return function(cb)
+            {
+                _doConnect(req, gitanaConfig, function(err) {
+                    cb.call(this, err);
+                });
+            }
+        }(req, gitanaConfig);
+
+        var exclusiveLoader = Loaders.exclusive(loader, key, process.defaultExclusiveLockTimeoutMs);
+
+        exclusiveLoader(function(err) {
+            callback.call(this, err);
+        });
+    };
+
+    var _doConnect = function(req, gitanaConfig, callback)
     {
         // either connect anew or re-use an existing connection to Cloud CMS for this application
         Gitana.connect(gitanaConfig, function(err) {
@@ -45,7 +68,7 @@ exports = module.exports = function()
             if (err)
             {
                 // log as much as we can
-                if(process.env.NODE_ENV === "production")
+                if (process.env.NODE_ENV === "production")
                 {
                     console.warn("Error connecting driver (domainHost=" + req.domainHost + ", virtualHost: " + req.virtualHost + ", err: " + JSON.stringify(err));
                 }

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

@@ -406,11 +406,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

@@ -238,15 +238,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");