@tiledesk/tiledesk-server 2.2.23 → 2.2.28

package/CHANGELOG.md

@@ -1,4 +1,25 @@
-# 2.2.23 -> PROD
+# untagged
+- Operator.select returns context object that contains the temp request..TEST IT
+- Added Serbian language to the widget
+- Added tag field to the project_user
+- Removed default BCC from email
+- BugFix: Avoid cluster concurrent jobs in multiple nodes
+- Faq template now support blank and example
+- Organizzation support added
+- ipFilter related to the project is now supported
+
+# 2.2.26
+- Tag fix for 2.2.25
+
+# 2.2.25
+- New label prechat form
+- Updated mongodb-runner from 4.8.1 to 4.8.3 to fix ssh key error
+
+# 2.2.24 -> PROD
+- webhook subscription can fetch temmates endpoint
+- Added hasBot and createdAt index to the request model
+
+# 2.2.23 
 - Increased list answers limit from 1000 to 3000
 
 # 2.2.22

package/README.md

@@ -18,6 +18,11 @@ You can find more info here: https://developer.tiledesk.com
 * [Nodejs](https://www.npmjs.com/) and npm installed. Suggested versions are NodeJS 12.20.2 and NPM 6.14.11 
 * [MongoDb](https://www.mongodb.com) installed
 
+# Run Tiledesk with Docker Compose
+
+Do you want to install all the Tiledesk components on your server with just one click?
+Use [Docker Compose Tiledesk installation guide](https://github.com/Tiledesk/tiledesk-deployment/blob/master/docker-compose/README.md)
+
 # Running Tiledesk Server
 
 ## Run locally with npm
@@ -85,3 +90,4 @@ To see how to upgrade tiledesk-server see [here](./docs/upgrading.md)
 # Testing
 Run unit test with `npm test` and integration test with `npm run test:int` 
 
+

package/app.js

@@ -96,6 +96,7 @@ var faqpub = require('./routes/faqpub');
 var labels = require('./routes/labels');
 var fetchLabels = require('./middleware/fetchLabels');
 var cacheUtil = require("./utils/cacheUtil");
+var orgUtil = require("./utils/orgUtil");
 var images = require('./routes/images');
 var files = require('./routes/files');
 var campaigns = require('./routes/campaigns');
@@ -128,6 +129,10 @@ var pubModulesManager = require('./pubmodules/pubModulesManager');
 var channelManager = require('./channels/channelManager');
 channelManager.listen(); 
 
+const ipfilter = require('express-ipfilter').IpFilter
+// const IpDeniedError = require('express-ipfilter').IpDeniedError;
+
+
 var modulesManager = undefined;
 try {
   modulesManager = require('./services/modulesManager');
@@ -233,7 +238,10 @@ if (process.env.ROUTELOGGER_ENABLED==="true") {
 
       var fullUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
       winston.debug("fullUrl:"+ fullUrl);
+      winston.debug(" req.get('host'):"+  req.get('host'));
+     
       winston.debug("req.get('origin'):" + req.get('origin'));
+      winston.debug("req.get('referer'):" + req.get('referer'));
 
       var routerLogger = new RouterLogger({
         origin: req.get('origin'),
@@ -286,12 +294,12 @@ var projectSetter = function (req, res, next) {
 
   if (projectid) {
     Project.findOne({_id: projectid, status: 100})
-      .cache(cacheUtil.defaultTTL, "projects:id:"+projectid)
+      //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "projects:id:"+projectid)
       .exec(function(err, project){
       if (err) {
         winston.warn("Problem getting project with id: " + projectid + " req.originalUrl:  " + req.originalUrl);
       }
-  
+
       winston.debug("projectSetter project:" + project);
       if (!project) {
         winston.warn("ProjectSetter project not found with id: " + projectid);
@@ -311,6 +319,53 @@ var projectSetter = function (req, res, next) {
 }
 
 
+function customDetection (req)  {
+  const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+  winston.info("standard ip: "+ip); // ip address of the user
+  return ip;
+}
+
+
+var projectIpFilter = function (req, res, next) {
+  // var projectIpFilter = function (err, req, res, next) {
+
+    // var ip = require('ip');
+    // winston.info("projectIpFilter ip2: " + ip.address() );
+
+
+    const nextIp = function(err) {
+      winston.info("projectIpFilter next",err);
+
+        if (err && err.name === "IpDeniedError") {
+          winston.info("IpDeniedError");
+          return res.status(401).json({ err: "error project ip filter" });
+          // next(err) 
+        } 
+
+      next();
+
+  }
+
+
+  if (!req.project) {
+    return next();
+  }
+  
+  var projectIpFilterEnabled = req.project.ipFilterEnabled;
+  winston.info("project projectIpFilterEnabled: " +projectIpFilterEnabled)
+
+  var projectIpFilter =  req.project.ipFilter
+  winston.info("project ipFilter: " + projectIpFilter)
+  
+  if (projectIpFilterEnabled === true && projectIpFilter && projectIpFilter.length > 0) {
+    var ip = ipfilter(projectIpFilter, { detectIp: customDetection, mode: 'allow' })
+    // var ip = ipfilter(projectIpFilter, { mode: 'allow' })
+    ip(req, res, nextIp);
+  } else {
+    next();
+  }
+
+}
 
 
 
@@ -322,6 +377,7 @@ var projectSetter = function (req, res, next) {
 // app.post('/oauth/token', oauth2.token);
 
 
+// const ips = ['::1'];
 
 app.use('/auth', auth);
 app.use('/testauth', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtest);
@@ -355,7 +411,7 @@ if (modulesManager) {
 }
 
 
-app.use('/:projectid/', [projectIdSetter, projectSetter]);
+app.use('/:projectid/', [projectIdSetter, projectSetter, projectIpFilter]);
 
 
 app.use('/:projectid/authtestWithRoleCheck', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtestWithRoleCheck);
@@ -447,8 +503,22 @@ app.use(function (err, req, res, next) {
 });*/
 
 
+
+
+
+
+
+
+
 // error handler
 app.use((err, req, res, next) => {
+
+  winston.info("err.name", err.name)
+  if (err.name === "IpDeniedError") {
+    winston.info("IpDeniedError");
+    return res.status(401).json({ err: "error ip filter" });
+  } 
+
   winston.error("General error", err);
   return res.status(500).json({ err: "error" });
 });

package/bin/www

@@ -32,7 +32,10 @@ webSocketServer.init(httpServer);
  * Listen on provided port, on all network interfaces.
  */
 
-var listener = httpServer.listen(port,function(){
+// use ipv4 or ipv6 https://stackoverflow.com/questions/50855419/get-only-ipv4-ips-via-nodejs-express
+// var listener = httpServer.listen(port,'0.0.0.0', function(){      
+
+var listener = httpServer.listen(port, function(){      
     console.log('Listening tiledesk-server ver:'+version+' on port ' + listener.address().port); //Listening on port 8888
 });
 

package/channels/chat21/chat21WebHook.js

@@ -375,7 +375,7 @@ router.post('/', function (req, res) {
               winston.debug('query:'+ projectId);
               
               return Request.findOne(query)
-              .cache(cacheUtil.defaultTTL, projectId+":requests:request_id:"+recipient_id)
+              //@DISABLED_CACHE cacheUtil.defaultTTL, projectId+":requests:request_id:"+recipient_id)
               .exec(function(err, request) {
 
                 if (err) {

package/config/email.js

@@ -2,7 +2,7 @@ module.exports = {
   'host':'smtp.mailgun.org',
   'username': 'postmaster@mg.tiledesk.com',
   'from': 'Tiledesk Notification <postmaster@mg.tiledesk.com>',
-  'bcc': 'tiledesknotification@frontiere21.it',
+  'bcc': '',
   'baseUrl':'https://console.tiledesk.com/v2/dashboard',
   'replyEnabled' : false,
   'inboundDomain': 'tickets.tiledesk.com'

package/config/global.js

@@ -1,3 +1,5 @@
 module.exports = {
   'apiUrl':'http://localhost:3000',
+  'organizationBaseUrl' : 'org.local',
+  'organizationEnabled' : false
 };