All JavaScript code is now 'strict'

amtevents.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 // Construct a MeshAgent object, called upon connection
 module.exports.CreateAmtEventsHandler = function (parent) {
     var obj = {};

amtscanner.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 // Construct a Intel AMT Scanner object
 module.exports.CreateAmtScanner = function (parent) {
     var obj = {};
@@ -68,11 +70,10 @@ module.exports.CreateAmtScanner = function (parent) {
         rangeinfo.server.on('listening', () => {
             for (var i = rangeinfo.min; i <= rangeinfo.max; i++) { rangeinfo.server.send(obj.rpacket, 623, obj.IPv4NumToStr(i)); }
         });
-        rangeinfo.timer = setTimeout(function () {
+        rangeinfo.timer = setTimeout(function () { // ************************* USER OF OUTER VARS!!!!!!!!!!!!!!!
             obj.parent.DispatchEvent(['*', userid], obj, { action: 'scanamtdevice', range: rangeinfo.range, results: rangeinfo.results, nolog: 1 });
             rangeinfo.server.close();
             delete rangeinfo.server;
-            delete rangeinfo;
         }, 3000);
         return true;
     }

amtscript.js

@@ -6,6 +6,8 @@
 * @version v0.1.0e
 */
 
+'use strict';
+
 module.exports.CreateAmtScriptEngine = function () {
     var o = {};
 

certoperations.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 module.exports.CertificateOperations = function () {
     var obj = {};
 

common.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 const crypto = require('crypto');
 
 // Binary encoding and decoding functions

db.js

@@ -6,6 +6,8 @@
 * @version v0.0.2
 */
 
+'use strict';
+
 //
 // Construct Meshcentral database object
 //

exeHandler.js

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+'use strict';
+
 const exeJavaScriptGuid = 'B996015880544A19B7F7E9BE44914C18';
 const exeMeshPolicyGuid = 'B996015880544A19B7F7E9BE44914C19';
 

interceptor.js

@@ -6,6 +6,8 @@
 * @version v0.0.3
 */
 
+'use strict';
+
 const crypto = require('crypto');
 const common = require('./common.js');
 

letsEncrypt.js

@@ -6,6 +6,8 @@
 * @version v0.0.2
 */
 
+'use strict';
+
 module.exports.CreateLetsEncrypt = function (parent) {
     try {
         const greenlock = require('greenlock');;

meshaccelerator.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 const crypto = require('crypto');
 var certStore = null;
 

meshagent.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 var AgentConnectCount = 0;
 
 // Construct a MeshAgent object, called upon connection
@@ -423,9 +425,10 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
 
     // Process incoming agent JSON data
     function processAgentData(msg) {
-        var str = msg.toString('utf8');
+        var str = msg.toString('utf8'), command = null;
         if (str[0] == '{') {
-            try { command = JSON.parse(str) } catch (e) { console.log('Unable to parse agent JSON (' + obj.remoteaddr + '): ' + str); return; } // If the command can't be parsed, ignore it.
+            try { command = JSON.parse(str) } catch (ex) { console.log('Unable to parse agent JSON (' + obj.remoteaddr + '): ' + str, ex); return; } // If the command can't be parsed, ignore it.
+            if (typeof command != 'object') { return; }
             switch (command.action) {
                 case 'msg':
                     {

meshcentral.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 // If app metrics is available
 if (process.argv[2] == '--launch') { try { require('appmetrics-dash').monitor({ url: '/', title: 'MeshCentral', port: 88, host: '127.0.0.1' }); } catch (e) { } }
 
@@ -420,7 +422,7 @@ function CreateMeshCentralServer(config, args) {
                 if ((obj.args.nousers == true) && (obj.args.userallowedip == null)) { obj.args.userallowedip = "::1,127.0.0.1"; }
 
                 // Set the session length to 60 minutes if not set and set a random key if needed
-                if ((obj.args.sessiontime == null) || (typeof obj.args.sessiontime != 'number') || (obj.args.sessiontime < 1)) { obj.args.sessiontime = 60; }
+                if ((obj.args.sessiontime != null) && ((typeof obj.args.sessiontime != 'number') || (obj.args.sessiontime < 1))) { delete obj.args.sessiontime; }
                 if (!obj.args.sessionkey) { obj.args.sessionkey = buf.toString('hex').toUpperCase(); }
 
                 // Start eh web server and if needed, the redirection web server.
@@ -594,7 +596,6 @@ function CreateMeshCentralServer(config, args) {
             }
         }
         if ((fromPeerServer == null) && (obj.multiServer != null) && ((typeof event != 'object') || (event.nopeers != 1))) { obj.multiServer.DispatchEvent(ids, source, event); }
-        delete targets;
     }
 
     // Get the connection state of a node
@@ -742,6 +743,7 @@ function CreateMeshCentralServer(config, args) {
 
         if (obj.multiServer == null) {
             // Single server mode
+            var eventConnectChange = 0;
 
             // Remove the agent connection from the nodes connection list
             var state = obj.connectivityByNode[nodeid];
@@ -1082,7 +1084,7 @@ function CreateMeshCentralServer(config, args) {
             if ((name != null) && (meshServerState[name] != val)) { if ((val == null) && (meshServerState[name] != null)) { delete meshServerState[name]; changed = true; } else { if (meshServerState[name] != val) { meshServerState[name] = val; changed = true; } } }
             if (changed == false) return;
         }
-        r = 'time=' + Date.now() + '\r\n';
+        var r = 'time=' + Date.now() + '\r\n';
         for (var i in meshServerState) { r += (i + '=' + meshServerState[i] + '\r\n'); }
         obj.fs.writeFileSync(obj.getConfigFilePath('serverstate.txt'), r);
     }
@@ -1173,7 +1175,6 @@ function InstallModules(modules, func) {
 function InstallModule(modulename, func, tag1, tag2) {
     try {
         var module = require(modulename);
-        delete module;
     } catch (e) {
         console.log('Installing ' + modulename + '...');
         var child_process = require('child_process');

meshmail.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 // Construct a MeshAgent object, called upon connection
 module.exports.CreateMeshMain = function (parent) {
     var obj = {};

meshrelay.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 module.exports.CreateMeshRelay = function (parent, ws, req, domain) {
     var obj = {};
     obj.ws = ws;

meshscanner.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 // Construct a Mesh Scanner object
 // TODO: We need once "server4" and "server6" per interface, or change the default multicast interface as we send.
 module.exports.CreateMeshScanner = function (parent) {
@@ -27,9 +29,9 @@ module.exports.CreateMeshScanner = function (parent) {
         var ipv4 = ['*'], ipv6 = ['*']; // Bind to IN_ADDR_ANY always
         var interfaces = require('os').networkInterfaces();
         for (var i in interfaces) {
-            var interface = interfaces[i];
-            for (var j in interface) {
-                var interface2 = interface[j];
+            var xinterface = interfaces[i];
+            for (var j in xinterface) {
+                var interface2 = xinterface[j];
                 if ((interface2.mac != '00:00:00:00:00:00') && (interface2.internal == false)) {
                     if (interface2.family == 'IPv4') { ipv4.push(interface2.address); }
                     if (interface2.family == 'IPv6') { ipv6.push(interface2.address + '%' + i); }

meshuser.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 // Construct a MeshAgent object, called upon connection
 module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
     var obj = {};

mpsserver.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 // Construct a Intel AMT MPS server object
 module.exports.CreateMpsServer = function (parent, db, args, certificates) {
     var obj = {};

multiserver.js

@@ -6,6 +6,8 @@
 * @version v0.0.1
 */
 
+'use strict';
+
 // Construct a Mesh Multi-Server object. This is used for MeshCentral-to-MeshCentral communication.
 module.exports.CreateMultiServer = function (parent, args) {
     var obj = {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.1.9-q",
+  "version": "0.1.9-r",
   "keywords": [
     "Remote Management",
     "Intel AMT",

pass.js

@@ -1,5 +1,7 @@
 // check out https://github.com/tj/node-pwd
 
+'use strict';
+
 // Module dependencies.
 const crypto = require('crypto');