From 1673acf424f763d665a0a0740ec5297253f348f1 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Sat, 9 Mar 2019 14:53:46 -0800
Subject: [PATCH] Server crash fix in MeshUser.js

---
 meshuser.js  | 22 ++++++++++++----------
 package.json |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/meshuser.js b/meshuser.js
index 716867fc..2f0c9e13 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -464,10 +464,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                     if (user.siteadmin != 0xFFFFFFFF) break;
 
                     var r = '';
-                    var args = splitArgs(command.value);
-                    if (args.length == 0) break;
-                    const cmd = args[0].toLowerCase();
-                    args = parseArgs(args);
+                    var cmdargs = splitArgs(command.value);
+                    if (cmdargs.length == 0) break;
+                    const cmd = cmdargs[0].toLowerCase();
+                    cmdargs = parseArgs(cmdargs);
 
                     switch (cmd) {
                         case 'help': {
@@ -495,7 +495,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                             break;
                         }
                         case 'args': {
-                            r = cmd + ': ' + JSON.stringify(args);
+                            r = cmd + ': ' + JSON.stringify(cmdargs);
                             break;
                         }
                         case 'usersessions': {
@@ -528,10 +528,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                             break;
                         }
                         case 'setmaxtasks': {
-                            if ((args["_"].length != 1) || (parseInt(args["_"][0]) < 1) || (parseInt(args["_"][0]) > 1000)) {
+                            if ((cmdargs["_"].length != 1) || (parseInt(cmdargs["_"][0]) < 1) || (parseInt(cmdargs["_"][0]) > 1000)) {
                                 r = 'Usage: setmaxtasks [1 to 1000]';
                             } else {
-                                parent.parent.taskLimiter.maxTasks = parseInt(args["_"][0]);
+                                parent.parent.taskLimiter.maxTasks = parseInt(cmdargs["_"][0]);
                                 r = 'MaxTasks set to ' + parent.parent.taskLimiter.maxTasks + '.';
                             }
                             break;
@@ -990,7 +990,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                         if (args.lanonly == true) { return; } // User-to-device chat is not support in LAN-only mode yet. We need the agent to replace the IP address of the server??
 
                         // Create the server url
-                        var httpsPort = ((parent.args.aliasport == null) ? parent.args.port : parent.args.aliasport); // Use HTTPS alias port is specified
+                        var httpsPort = ((args.aliasport == null) ? args.port : args.aliasport); // Use HTTPS alias port is specified
                         var xdomain = (domain.dns == null) ? domain.id : '';
                         if (xdomain != '') xdomain += "/";
                         var url = "http" + (args.notls ? '' : 's') + "://" + parent.getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "messenger?id=meshmessenger/" + encodeURIComponent(command.nodeid) + "/" + encodeURIComponent(user._id) + "&title=" + encodeURIComponent(user.name);
@@ -1243,7 +1243,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                     if ((command.amttls != 1) && (command.amttls != 0)) break;
 
                     // If we are in WAN-only mode, hostname is not used
-                    if ((parent.parent.args.wanonly == true) && (command.hostname)) { delete command.hostname; }
+                    if ((args.wanonly == true) && (command.hostname)) { delete command.hostname; }
 
                     // Get the mesh
                     mesh = parent.meshes[command.meshid];
@@ -1557,7 +1557,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                             event.msg = ": ";
 
                             // If we are in WAN-only mode, host is not used
-                            if ((parent.parent.args.wanonly == true) && (command.host)) { delete command.host; }
+                            if ((args.wanonly == true) && (command.host)) { delete command.host; }
 
                             // Look for a change
                             if (command.icon && (command.icon != node.icon)) { change = 1; node.icon = command.icon; changes.push('icon'); }
@@ -1846,6 +1846,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                 }
             case 'otp-hkey-get':
                 {
+
+
                     // Check is 2-step login is supported
                     const twoStepLoginSupported = ((domain.auth != 'sspi') && (parent.parent.certificates.CommonName.indexOf('.') != -1) && (args.lanonly !== true) && (args.nousers !== true));
                     if (twoStepLoginSupported == false) break;
diff --git a/package.json b/package.json
index 909fe21d..d7a2b43b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.2.9-z",
+  "version": "0.3.0-b",
   "keywords": [
     "Remote Management",
     "Intel AMT",