cloudcms-server 3.2.322 → 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/old_package.json

@@ -0,0 +1,119 @@
+{
+  "author": {
+    "name": "Gitana Software, Inc.",
+    "email": "info@gitana.io",
+    "url": "https://gitana.io"
+  },
+  "name": "cloudcms-server",
+  "description": "Cloud CMS Application Server Module",
+  "version": "3.2.323",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/gitana/cloudcms-server.git"
+  },
+  "dependencies": {
+    "@socket.io/cluster-adapter": "^0.2.2",
+    "@socket.io/redis-adapter": "^8.3.0",
+    "@socket.io/sticky": "^1.0.4",
+    "accepts": "^1.3.8",
+    "agentkeepalive": "^4.5.0",
+    "alpaca": "^1.5.27",
+    "archiver": "^7.0.1",
+    "async": "^3.2.6",
+    "async-lock": "^1.4.1",
+    "aws-sdk": "^2.1692.0",
+    "axios": "^1.7.9",
+    "basic-auth": "^2.0.1",
+    "body-parser": "^1.20.3",
+    "bytes": "^3.1.2",
+    "cacheable-lookup": "^6.1.0",
+    "canoe": "^0.3.3",
+    "clone": "^2.1.2",
+    "connect-flash": "^0.1.1",
+    "connect-multiparty": "^2.2.0",
+    "connect-redis": "^8.0.1",
+    "cookie-parser": "^1.4.7",
+    "debug": "^4.4.0",
+    "errorhandler": "^1.5.1",
+    "express": "^4.21.2",
+    "express-session": "^1.18.1",
+    "express-useragent": "^1.0.15",
+    "fast-proxy": "^2.2.0",
+    "gitana": "^1.0.330",
+    "handlebars": "^4.7.8",
+    "hbs": "^4.2.0",
+    "helmet": "^8.0.0",
+    "ioredis": "5.4.1",
+    "json5": "^2.2.3",
+    "jsonwebtoken": "^9.0.2",
+    "klaw": "^4.1.0",
+    "lru-cache": "^7.14.0",
+    "marked": "^15.0.4",
+    "memored": "^1.1.1",
+    "memorystore": "^1.6.4",
+    "mime": "^2.4.6",
+    "moment": "^2.30.1",
+    "morgan": "^1.10.0",
+    "object-hash": "^3.0.0",
+    "object-merge": "^2.5.1",
+    "on-headers": "^1.0.2",
+    "passport": "^0.7.0",
+    "passport-cas": "^0.1.1",
+    "passport-facebook": "^3.0.0",
+    "passport-github": "^1.1.0",
+    "passport-google-oauth": "^2.0.0",
+    "passport-linkedin": "^1.0.0",
+    "passport-local": "^1.0.0",
+    "passport-oauth": "^1.0.0",
+    "passport-saml": "^2.2.0",
+    "passport-twitter": "^1.0.4",
+    "random-js": "^2.1.0",
+    "recursive-readdir": "^2.2.3",
+    "redis": "^4.7.0",
+    "redlock": "4.2.0",
+    "request-param": "^1.0.1",
+    "response-time": "^2.3.3",
+    "semver": "^7.6.3",
+    "serve-favicon": "^2.5.0",
+    "session-file-store": "^1.5.0",
+    "sha1": "^1.1.1",
+    "socket.io": "^4.8.1",
+    "ssl-root-cas": "^1.3.1",
+    "stomp-client": "^0.9.0",
+    "targz": "^1.0.1",
+    "temp": "^0.9.4",
+    "uuid": "^11.0.3",
+    "vm2": "^3.9.19",
+    "watch": "^1.0.2",
+    "winston": "^3.17.0"
+  },
+  "contributors": [
+    {
+      "name": "Michael Uzquiano",
+      "email": "uzi@cloudcms.com"
+    },
+    {
+      "name": "Harry Moore",
+      "email": "harry.moore@cloudcms.com"
+    }
+  ],
+  "keywords": [
+    "wcm",
+    "web",
+    "cloudcms",
+    "cms",
+    "content",
+    "json",
+    "rest",
+    "mobile",
+    "content management",
+    "javascript",
+    "nodejs",
+    "api",
+    "jsoncms",
+    "baas",
+    "caching",
+    "renditions"
+  ],
+  "main": "index"
+}

package/package.json

@@ -6,92 +6,81 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.322",
+  "version": "3.2.324",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
   },
   "dependencies": {
-    "@socket.io/cluster-adapter": "^0.2.0",
-    "@socket.io/redis-adapter": "^7.2.0",
-    "@socket.io/sticky": "^1.0.1",
+    "@socket.io/cluster-adapter": "^0.2.2",
+    "@socket.io/redis-adapter": "^8.3.0",
+    "@socket.io/sticky": "^1.0.4",
     "accepts": "^1.3.8",
     "agentkeepalive": "^4.5.0",
     "alpaca": "^1.5.27",
-    "archiver": "^1.3.0",
-    "async": "^3.2.3",
+    "archiver": "^7.0.1",
+    "async": "^3.2.6",
     "async-lock": "^1.4.1",
-    "aws-sdk": "^2.1208.0",
-    "axios": "^1.5.0",
+    "aws-sdk": "^2.1692.0",
+    "axios": "^1.7.9",
     "basic-auth": "^2.0.1",
-    "body-parser": "^1.20.0",
-    "bytes": "^2.5.0",
+    "body-parser": "^1.20.3",
+    "bytes": "^3.1.2",
     "cacheable-lookup": "^6.1.0",
     "canoe": "^0.3.3",
     "clone": "^2.1.2",
     "connect-flash": "^0.1.1",
     "connect-multiparty": "^2.2.0",
-    "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": "3.0.1",
+    "connect-redis": "^8.0.1",
+    "cookie-parser": "^1.4.7",
+    "debug": "^4.4.0",
     "errorhandler": "^1.5.1",
-    "express": "^4.18.2",
-    "express-session": "^1.17.3",
+    "express": "^4.21.2",
+    "express-session": "^1.18.1",
     "express-useragent": "^1.0.15",
-    "extend-with-super": "^2.0.0",
     "fast-proxy": "^2.2.0",
-    "gitana": "^1.0.326",
-    "handlebars": "^4.4.2",
-    "hbs": "^4.0.5",
-    "helmet": "^4.6.0",
-    "ioredis": "4.28.5",
-    "json5": "^1.0.1",
-    "jsonwebtoken": "^8.5.1",
-    "klaw": "^1.3.1",
+    "gitana": "^1.0.330",
+    "handlebars": "^4.7.8",
+    "hbs": "^4.2.0",
+    "helmet": "^8.0.0",
+    "ioredis": "5.4.1",
+    "isolated-vm": "5.0.3",
+    "json5": "^2.2.3",
+    "jsonwebtoken": "^9.0.2",
+    "klaw": "^4.1.0",
     "lru-cache": "^7.14.0",
-    "marked": "^4.0.14",
+    "marked": "^15.0.4",
     "memored": "^1.1.1",
-    "memorystore": "^1.6.1",
-    "mime": "^1.6.0",
-    "mkdirp": "^0.5.1",
-    "moment": "^2.24.0",
-    "morgan": "^1.9.1",
-    "object-hash": "^1.3.1",
+    "memorystore": "^1.6.4",
+    "mime": "^2.4.6",
+    "moment": "^2.30.1",
+    "morgan": "^1.10.0",
+    "object-hash": "^3.0.0",
     "object-merge": "^2.5.1",
     "on-headers": "^1.0.2",
-    "passport": "^0.4.0",
-    "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": "^0.7.0",
+    "passport-google-oauth": "^2.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
-    "passport-saml": "^2.2.0",
-    "passport-twitter": "^0.1.5",
-    "pkginfo": "^0.4.1",
-    "random-js": "^1.0.8",
-    "recursive-readdir": "^2.2.2",
-    "redis": "^4.2.0",
+    "@node-saml/passport-saml": "5.0.0",
+    "random-js": "^2.1.0",
+    "recursive-readdir": "^2.2.3",
+    "redis": "^4.7.0",
     "redlock": "4.2.0",
     "request-param": "^1.0.1",
-    "response-time": "^2.3.2",
-    "semver": "^7.3.7",
+    "response-time": "^2.3.3",
+    "semver": "^7.6.3",
     "serve-favicon": "^2.5.0",
-    "session-file-store": "^0.2.2",
+    "session-file-store": "^1.5.0",
     "sha1": "^1.1.1",
-    "socket.io": "^4.5.1",
+    "socket.io": "^4.8.1",
     "ssl-root-cas": "^1.3.1",
     "stomp-client": "^0.9.0",
     "targz": "^1.0.1",
-    "temp": "^0.8.3",
-    "uuid": "^3.3.2",
-    "vm2": "^3.8.4",
-    "watch": "^0.13.0",
-    "winston": "^3.3.3"
+    "temp": "^0.9.4",
+    "uuid": "^11.0.3",
+    "underscore": "^1.13.7",
+    "winston": "^3.17.0"
   },
   "contributors": [
     {