cloudcms-server 3.2.296 → 3.2.298

package/duster/helpers/sample/nyt.js

@@ -1,3 +1,5 @@
+var request = require("../../../util/request");
+
 /**
  * Sample New York Times Events tag for Dust.
  *
@@ -49,7 +51,6 @@ exports = module.exports = function(app, dust, callback)
         return map(chunk, function(chunk) {
             setTimeout(function() {
 
-                var request = require("request");
                 var API_KEY = "3d8d573ec0ae966ea57245357cfcf57f:1:70698955";
 
                 var url = "http://api.nytimes.com/svc/events/v2/listings.json?api-key=" + API_KEY;
@@ -77,17 +78,16 @@ exports = module.exports = function(app, dust, callback)
 
                 //console.log("URL:" + url);
 
-                var request = require("request");
-                request(url, function (error, response, body) {
+                request(url, function (error, response, json) {
 
-                    if (error || response.statusCode !== 200)
+                    if (error || response.status !== 200)
                     {
                         if (error) {
                             console.log("ERROR: " + error);
                         }
 
-                        if (response.statusCode !== 200) {
-                            console.log("STATUS CODE: " + response.statusCode);
+                        if (response.status !== 200) {
+                            console.log("STATUS CODE: " + response.status);
                         }
 
                         chunk.write("There was an error loading this section");
@@ -96,7 +96,6 @@ exports = module.exports = function(app, dust, callback)
                         return;
                     }
 
-                    var json = JSON.parse(body);
                     console.log("BODY: " + JSON.stringify(json, null, "  "));
 
                     var resultObject = {

package/framework/controllers.js

@@ -2,7 +2,6 @@ var http = require("http");
 var path = require("path");
 var fs = require("fs");
 var util = require("../util/util");
-var request = require("request");
 
 var Gitana = require("gitana");
 

package/index.js

@@ -75,6 +75,14 @@ https.globalAgent = new HttpsKeepAliveAgent({
     freeSocketTimeout: 60000
 });
 
+// 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
 /*
 // report http/https socket state every minute

package/insight/insight.js

@@ -1,6 +1,3 @@
-var http = require("http");
-var path = require("path");
-var request = require("request");
 var util = require("../util/util");
 
 /**
@@ -147,7 +144,7 @@ var doSend = function(callback)
     // if it fails, we add it back to the queue
     util.retryGitanaRequest(log, gitana, requestConfig, 1, function(err, response, body) {
 
-        if (response && response.statusCode === 200 && body)
+        if (response && response.status === 200 && body)
         {
             console.log("Insight sync for warehouse: " + warehouseId + " succeeded");
         }

package/middleware/admin/admin.js

@@ -116,7 +116,7 @@ exports = module.exports = function()
 
                     if (!credentials || credentials.name !== configuration.username || credentials.pass !== configuration.password)
                     {
-                        res.statusCode = 401;
+                        res.status(401);
                         util.setHeader(res, 'WWW-Authenticate', 'Basic realm="admin"');
                         res.end('Admin access denied');
                         return;

package/middleware/awareness/plugins/editorial.js

@@ -3,12 +3,9 @@ exports = module.exports = {};
 var util = require("../../../util/util");
 var socketUtil = require("../../../util/socket");
 
-var request = require("request");
+var request = require("../../../util/request");
 
-var http = require("http");
-var https = require("https");
-
-exports.bindSocket = function(socket, provider)
+exports.bindSocket = function(socket, provider, io)
 {
     socketUtil.bindGitana(socket, function() {
 
@@ -63,27 +60,20 @@ exports.bindSocket = function(socket, provider)
                 qs["force"] = true;
             }
 
-            var agent = http.globalAgent;
-            if (process.env.GITANA_PROXY_SCHEME === "https")
-            {
-                agent = https.globalAgent;
-            }
-
             request({
                 "method": "POST",
                 "url": URL,
                 "qs": {},
                 "json": json,
                 "headers": headers,
-                "agent": agent,
                 "timeout": process.defaultHttpTimeoutMs
-            }, function(err, response, body) {
+            }, function(err, response, json) {
 
-                if (err || (response && response.body && response.body.error)) {
+                if (err || (json && json.error)) {
                     return callback(err);
                 }
 
-                callback(null, body._doc, body.branchId);
+                callback(null, json._doc, json.branchId);
             });
         };
     });

package/middleware/driver-config/driver-config.js

@@ -1,10 +1,4 @@
-var path = require('path');
-var http = require('http');
-var request = require('request');
 var util = require("../../util/util");
-var Gitana = require("gitana");
-
-var fs = require("fs");
 
 /**
  * Retrieves local driver configuration for hosts from Cloud CMS.

package/middleware/form/form.js

@@ -1,11 +1,10 @@
-var path = require("path");
-var fs = require("fs");
 var util = require("../../util/util");
-var request = require("request");
 
 var http = require("http");
 var https = require("https");
 
+var request = require("../../util/request");
+
 /**
  * Form middleware.
  *
@@ -126,41 +125,32 @@ exports = module.exports = function()
             var headers = {};
             headers["Authorization"] = req.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
 
-            var agent = http.globalAgent;
-            if (process.env.GITANA_PROXY_SCHEME === "https")
-            {
-                agent = https.globalAgent;
-            }
-
             request({
                 "method": "POST",
                 "url": URL,
                 "qs": {},
                 "json": form,
                 "headers": headers,
-                "agent": agent,
                 "timeout": process.defaultHttpTimeoutMs
-            }, function(err, response, body) {
+            }, function(err, response, json) {
 
                 console.log("Response error: " + JSON.stringify(err));
                 console.log("Response: " + JSON.stringify(response,null,2));
-                console.log("Body: " + JSON.stringify(body,null,2));
+                console.log("Body: " + JSON.stringify(json,null,2));
 
-                if (err || (response && response.body && response.body.error))
+                if (err || (json && json.error))
                 {
                     if (failureUrl)
                     {
                         return res.redirect(failureUrl);
                     }
-                    else
-                    {
-                        res.status(500);
-                        res.json({
-                            "ok": false,
-                            "err": err || response.body.message,
-                            "message": body
-                        });
-                    }
+
+                    res.status(500);
+                    res.json({
+                        "ok": false,
+                        "err": err || json.message,
+                        "message": json
+                    });
 
                     return;
                 }
@@ -199,21 +189,16 @@ exports = module.exports = function()
             var headers = {};
             headers["Authorization"] = req.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
 
-            var agent = http.globalAgent;
-            if (process.env.GITANA_PROXY_SCHEME === "https")
-            {
-                agent = https.globalAgent;
-            }
-
             request({
                 "method": "POST",
                 "url": URL,
                 "qs": {},
                 "json": form,
                 "headers": headers,
-                "agent": agent,
                 "timeout": process.defaultHttpTimeoutMs
-            }).pipe(res);
+            }, function(err, response, json) {
+                response.data.pipe(res);
+            });
 
         });
     };

package/middleware/stores/store.js

@@ -1,10 +1,7 @@
-var request = require('request');
 var path = require('path');
 
 var util = require("../../util/util");
 
-var stores = require("./stores");
-
 /**
  * Helper methods for working with domains, identities and connections.
  *

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

@@ -1,6 +1,3 @@
-//var path = require('path');
-//var http = require('http');
-//var request = require('request');
 var util = require("../../util/util");
 
 /**
@@ -93,9 +90,9 @@ exports = module.exports = function()
 
                 util.retryGitanaRequest(logMethod, gitana, requestConfig, 2, function(err, response, body) {
 
-                    if (response && response.statusCode === 200 && body)
+                    if (response && response.status === 200 && body)
                     {
-                        var config = JSON.parse(body).config;
+                        var config = body.config;
                         if (!config)
                         {
                             // nothing found
@@ -113,9 +110,9 @@ exports = module.exports = function()
                     else
                     {
                         logMethod("Load virtual driver config failed");
-                        if (response && response.statusCode)
+                        if (response && response.status)
                         {
-                            logMethod("Response status code: " + response.statusCode);
+                            logMethod("Response status code: " + response.status);
                         }
                         if (err) {
                             logMethod("Err: " + JSON.stringify(err));
@@ -123,7 +120,10 @@ exports = module.exports = function()
                         if (body) {
                             logMethod("Body: " + body);
                         }
-                        var message = body;
+                        var message = null;
+                        if (body) {
+                            message = JSON.stringify(body);
+                        }
                         if (!message) {
                             message = "Unable to load virtual driver configuration";
                         }

package/middleware/virtual-files/virtual-files.js

@@ -1,6 +1,3 @@
-var path = require('path');
-var http = require('http');
-var request = require('request');
 var util = require("../../util/util");
 
 /**

package/middleware/welcome/welcome.js

@@ -1,7 +1,4 @@
 var path = require('path');
-var fs = require('fs');
-var http = require('http');
-var request = require('request');
 var util = require("../../util/util");
 
 /**

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.296",
+  "version": "3.2.298",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -22,9 +22,11 @@
     "async": "^3.2.3",
     "async-lock": "^1.3.2",
     "aws-sdk": "^2.1208.0",
+    "axios": "^1.5.0",
     "basic-auth": "^2.0.1",
     "body-parser": "^1.20.0",
     "bytes": "^2.5.0",
+    "cacheable-lookup": "^6.1.0",
     "canoe": "^0.3.3",
     "clone": "^2.1.2",
     "connect-flash": "^0.1.1",
@@ -33,17 +35,15 @@
     "consolidate": "^0.14.5",
     "cookie-parser": "^1.4.4",
     "debug": "^2.6.9",
-    "dns-lookup-cache": "^1.0.4",
     "dustjs-helpers": "1.7.4",
     "dustjs-linkedin": "3.0.1",
     "errorhandler": "^1.5.1",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "express-session": "^1.17.3",
     "express-useragent": "^1.0.15",
     "extend-with-super": "^2.0.0",
     "fast-proxy": "^2.2.0",
-    "finalhandler": "^1.2.0",
-    "gitana": "^1.0.322",
+    "gitana": "^1.0.324",
     "handlebars": "^4.4.2",
     "hbs": "^4.0.5",
     "helmet": "^4.6.0",
@@ -77,7 +77,6 @@
     "recursive-readdir": "^2.2.2",
     "redis": "^4.2.0",
     "redlock": "4.2.0",
-    "request": "^2.88.0",
     "request-param": "^1.0.1",
     "response-time": "^2.3.2",
     "semver": "^7.3.7",

package/util/auth.js

@@ -1,25 +1,20 @@
-var path = require('path');
-var fs = require('fs');
 var os = require('os');
 var _util = require("util");
-var util = require("./util");
-var request = require("request");
-var http = require("http");
-var https = require("https");
 var async = require("async");
+var LRUCache = require("lru-cache");
 
-var LRU = require("lru-cache");
+var request = require("./request");
 
 // trusted profile cache size 100
-var TRUSTED_PROFILE_CACHE = new LRU({
+var TRUSTED_PROFILE_CACHE = new LRUCache({
     max:100,
-    ttl: 1000 * 60 * 15 // 15 minutes
+    maxAge: 1000 * 60 * 15 // 15 minutes
 });
 
 // user entry cache size 100
-var USER_ENTRY_CACHE = new LRU({
+var USER_ENTRY_CACHE = new LRUCache({
     max: 100,
-    ttl: 1000 * 60 * 15 // 15 minutes
+    maxAge: 1000 * 60 * 15 // 15 minutes
 });
 
 var Gitana = require("gitana");
@@ -139,15 +134,12 @@ var impersonate = exports.impersonate = function(req, key, targetUser, callback)
         var headers = {};
         headers["Authorization"] = req.gitana.platform().getDriver().getHttpHeaders()["Authorization"];
 
-        var agent = util.getAgent(req.gitanaConfig.baseURL);
-
         request({
             "method": "POST",
             "url": req.gitanaConfig.baseURL + "/auth/impersonate/" + targetUser.getDomainId() + "/" + targetUser.getId(),
             "qs": {},
             "json": {},
             "headers": headers,
-            "agent": agent,
             "timeout": process.defaultHttpTimeoutMs
         }, function(err, response, json) {
 
@@ -336,7 +328,7 @@ var syncProfile = exports.syncProfile = function(req, res, strategy, domainId, p
                     _handleSyncUser(req, strategy, settings, key, domainId, providerId, providerUserId, token, refreshToken, userObject, groupsArray, function (err, gitanaUser) {
 
                         if (err) {
-                            try { releaseLockFn(); } catch (e) { }
+                            releaseLockFn();
                             return callback(err);
                         }
 
@@ -448,8 +440,6 @@ var __handleSyncUser = function(req, strategy, settings, key, domainId, provider
     var headers = {};
     headers["Authorization"] = authorizationHeader;
 
-    var agent = util.getAgent(req.gitanaConfig.baseURL);
-
     if (!userObject) {
         userObject = {};
     }
@@ -475,7 +465,6 @@ var __handleSyncUser = function(req, strategy, settings, key, domainId, provider
         },
         "json": json,
         "headers": headers,
-        "agent": agent,
         "timeout": process.defaultHttpTimeoutMs
     };
 

package/util/cloudcms.js

@@ -1,11 +1,12 @@
 var path = require('path');
-var fs = require('fs');
+//var fs = require('fs');
 var util = require("./util");
-var request = require("request");
 
 var http = require("http");
 var https = require("https");
 
+var request = require("./request");
+
 exports = module.exports = function()
 {
     var toCacheFilePath = function(filePath)
@@ -396,36 +397,36 @@ exports = module.exports = function()
                     "url": URL,
                     "qs": {},
                     "headers": headers,
-                    "timeout": process.defaultHttpTimeoutMs,
-                    "agent": agent
-                }).on('response', function (response) {
-
-                    //process.log("Status Code: " + response.statusCode);
-
-                    if (response.statusCode >= 200 && response.statusCode <= 204)
+                    "responseType": "stream"
+                }, function(err, response) {
+    
+                    if (err) {
+                        closeWriteStream(tempStream);
+                        return cb(err);
+                    }
+    
+                    if (response.status >= 200 && response.status <= 204)
                     {
-                        response.pipe(tempStream).on("close", function (err) {
-
-                            if (err)
-                            {
+                        response.data.pipe(tempStream).on("close", function (err) {
+            
+                            if (err) {
                                 // some went wrong at disk io level?
                                 return failFast(tempStream, err);
                             }
-
+            
                             contentStore.existsFile(filePath, function (exists) {
-
+                
                                 if (exists) {
-
+                    
                                     // write cache file
                                     var cacheInfo = buildCacheInfo(response);
                                     if (!cacheInfo) {
                                         return cb(null, filePath, null);
                                     }
-                                    
+                    
                                     contentStore.writeFile(cacheFilePath, JSON.stringify(cacheInfo, null, "    "), function (err) {
-
-                                        if (err)
-                                        {
+                        
+                                        if (err) {
                                             // failed to write cache file, thus the whole thing is invalid
                                             return safeRemove(contentStore, cacheFilePath, function () {
                                                 failFast(tempStream, {
@@ -433,12 +434,10 @@ exports = module.exports = function()
                                                 });
                                             });
                                         }
-
+                        
                                         cb(null, filePath, cacheInfo);
                                     });
-                                }
-                                else
-                                {
+                                } else {
                                     // for some reason, file wasn't found
                                     // roll back the whole thing
                                     safeRemove(contentStore, cacheFilePath, function () {
@@ -448,7 +447,7 @@ exports = module.exports = function()
                                     });
                                 }
                             });
-
+            
                         }).on("error", function (err) {
                             failFast(tempStream, err);
                         });
@@ -456,54 +455,49 @@ exports = module.exports = function()
                     else
                     {
                         // some kind of http error (usually permission denied or invalid_token)
-
+        
                         var body = "";
-
-                        response.on('data', function (chunk) {
+        
+                        response.data.on('data', function (chunk) {
                             body += chunk;
                         });
-
-                        response.on('end', function () {
-                            
+        
+                        response.data.on('end', function () {
+            
                             var afterCleanup = function () {
-
+                
                                 // see if it is "invalid_token"
                                 // if so, we can automatically retry
                                 var isInvalidToken = false;
-                                try
-                                {
+                                try {
                                     var json = JSON.parse(body);
-                                    if (json && json.error === "invalid_token")
-                                    {
+                                    if (json && json.error === "invalid_token") {
                                         isInvalidToken = true;
                                     }
-                                }
-                                catch (e)
-                                {
+                                } catch (e) {
                                     // swallow
                                 }
-
-                                if (isInvalidToken)
-                                {
+                
+                                if (isInvalidToken) {
                                     // fire for retry
                                     return _refreshAccessTokenAndRetry(contentStore, gitana, uri, filePath, attemptCount, maxAttemptsAllowed, {
                                         "message": "Unable to load asset from remote store",
-                                        "code": response.statusCode,
+                                        "code": response.status,
                                         "body": body
                                     }, cb);
                                 }
-
+                
                                 // otherwise, it's not worth retrying at this time
                                 cb({
                                     "message": "Unable to load asset from remote store",
-                                    "code": response.statusCode,
+                                    "code": response.status,
                                     "body": body
                                 });
                             };
-    
+            
                             // ensure stream is closed
                             closeWriteStream(tempStream);
-    
+            
                             // clean things up
                             safeRemove(contentStore, cacheFilePath, function () {
                                 safeRemove(contentStore, filePath, function () {
@@ -511,18 +505,18 @@ exports = module.exports = function()
                                 });
                             });
                         });
-
+        
                     }
-
-                }).on('error', function (e) {
-                    failFast(tempStream, e);
-    
-                }).on('end', function (e) {
-
-                    // ensure stream is closed
-                    closeWriteStream(tempStream);
-
-                }).end();
+                });
+                // }).on('error', function (e) {
+                //     failFast(tempStream, e);
+                //
+                // }).on('end', function (e) {
+                //
+                //     // ensure stream is closed
+                //     closeWriteStream(tempStream);
+                //
+                // }).end();
 
                 tempStream.on("error", function (e) {
                     process.log("Temp stream errored out");
@@ -561,7 +555,7 @@ exports = module.exports = function()
     var downloadNode = function(contentStore, gitana, repositoryId, branchId, nodeId, attachmentId, nodePath, locale, forceReload, callback)
     {
         // ensure path starts with "/"
-        if (nodePath && nodePath.substring(0, 1) !== "/") {
+        if (nodePath && !nodePath.startsWith("/")) {
             nodePath = "/" + nodePath;
         }
 
@@ -672,7 +666,7 @@ exports = module.exports = function()
         }
 
         // ensure path starts with "/"
-        if (nodePath && nodePath.substring(0, 1) !== "/") {
+        if (nodePath && !nodePath.startsWith("/")) {
             nodePath = "/" + nodePath;
         }