Update MeshAgents, fixed MeshCmd.js

agents/modules_meshcmd/amt-wsman-duk.js

@@ -30,6 +30,7 @@ function CreateWsmanComm(/*host, port, user, pass, tls, extra*/)
     obj.FailAllError = 0;               // Set this to non-zero to fail all AJAX calls with that error status, 999 causes responses to be silent.
     obj.digest = null;
     obj.RequestCount = 0;
+    obj.requests = {};
 
     if (arguments.length == 1 && typeof(arguments[0] == 'object'))
     {
@@ -89,9 +90,12 @@ function CreateWsmanComm(/*host, port, user, pass, tls, extra*/)
         }
         var request = { protocol: (obj.tls == 1 ? 'https:' : 'http:'), method: 'POST', host: obj.host, path: '/wsman', port: obj.port, rejectUnauthorized: false, checkServerIdentity: function (cert) { console.log('checkServerIdentity', JSON.stringify(cert)); } };
         var req = obj.digest.request(request);
+        req.reqid = obj.RequestCount++;
+        obj.requests[req.reqid] = req; // Keep a reference to the request object so it does not get disposed.
         //console.log('Request ' + (obj.RequestCount++));
-        req.on('error', function (e) { obj.gotNextMessagesError({ status: 600 }, 'error', null, [postdata, callback, tag]); });
+        req.on('error', function (e) { delete obj.requests[this.reqid]; obj.gotNextMessagesError({ status: 600 }, 'error', null, [postdata, callback, tag]); });
         req.on('response', function (response) {
+            response.reqid = this.reqid;
             //console.log('Response: ' + response.statusCode);
             if (response.statusCode != 200) {
                 //console.log('ERR:' + JSON.stringify(response));
@@ -99,7 +103,7 @@ function CreateWsmanComm(/*host, port, user, pass, tls, extra*/)
             } else {
                 response.acc = '';
                 response.on('data', function (data2) { this.acc += data2; });
-                response.on('end', function () { obj.gotNextMessages(response.acc, 'success', { status: response.statusCode }, [postdata, callback, tag]); });
+                response.on('end', function () { delete obj.requests[this.reqid]; obj.gotNextMessages(response.acc, 'success', { status: response.statusCode }, [postdata, callback, tag]); });
             }
         });
 

agents/modules_meshcmd/amt.js

@@ -694,8 +694,8 @@ function AmtStackCreateService(wsmanStack) {
     // TODO: Just put some of them here, but many more still need to be added, helpful link here:
     // https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/default.htm?turl=WordDocuments%2Fsecurityadminevents.htm
     obj.GetAuditLogExtendedDataStr = function (id, data) {
-        if ((id == 1602 || id == 1604) && data[0] == 0) { return data.splice(2, 2 + data[1]).toString(); } // ACL Entry Added/Removed (Digest)
-        if (id == 1603) { if (data[1] == 0) { return data.splice(3).toString(); } return null; } // ACL Entry Modified
+        if ((id == 1602 || id == 1604) && data[0] == 0) { return bufToArray(data).splice(2, 2 + data[1]).toString(); } // ACL Entry Added/Removed (Digest)
+        if (id == 1603) { if (data[1] == 0) { return bufToArray(data).splice(3).toString(); } return null; } // ACL Entry Modified
         if (id == 1605) { return ["Invalid ME access", "Invalid MEBx access"][data[0]]; } // ACL Access with Invalid Credentials
         if (id == 1606) { var r = ["Disabled", "Enabled"][data[0]]; if (data[1] == 0) { r += ", " + data[3]; } return r; } // ACL Entry State
         if (id == 1607) { return "Remote " + ["NoAuth", "ServerAuth", "MutualAuth"][data[0]] + ", Local " + ["NoAuth", "ServerAuth", "MutualAuth"][data[1]]; } // TLS State Changed
@@ -718,6 +718,7 @@ function AmtStackCreateService(wsmanStack) {
     function ReadIntX(v, p) { return (v[p + 3] * 0x1000000) + (v[p + 2] << 16) + (v[p + 1] << 8) + v[p]; }
     function btoa(x) { return Buffer.from(x).toString('base64'); }
     function atob(x) { var z = null; try { z = Buffer.from(x, 'base64').toString(); } catch (e) { console.log(e); } return z; }
+    function bufToArray(buf) { var r = []; for (var i in buf) { r.push(buf[i]); } return r; }
 
     function _GetAuditLog0(stack, name, responses, status, tag) {
         if (status != 200) { tag[0](obj, [], status); return; }

agents/modules_meshcore/amt-wsman-duk.js

@@ -30,6 +30,7 @@ function CreateWsmanComm(/*host, port, user, pass, tls, extra*/)
     obj.FailAllError = 0;               // Set this to non-zero to fail all AJAX calls with that error status, 999 causes responses to be silent.
     obj.digest = null;
     obj.RequestCount = 0;
+    obj.requests = {};
 
     if (arguments.length == 1 && typeof(arguments[0] == 'object'))
     {
@@ -89,9 +90,12 @@ function CreateWsmanComm(/*host, port, user, pass, tls, extra*/)
         }
         var request = { protocol: (obj.tls == 1 ? 'https:' : 'http:'), method: 'POST', host: obj.host, path: '/wsman', port: obj.port, rejectUnauthorized: false, checkServerIdentity: function (cert) { console.log('checkServerIdentity', JSON.stringify(cert)); } };
         var req = obj.digest.request(request);
+        req.reqid = obj.RequestCount++;
+        obj.requests[req.reqid] = req; // Keep a reference to the request object so it does not get disposed.
         //console.log('Request ' + (obj.RequestCount++));
-        req.on('error', function (e) { obj.gotNextMessagesError({ status: 600 }, 'error', null, [postdata, callback, tag]); });
+        req.on('error', function (e) { delete obj.requests[this.reqid]; obj.gotNextMessagesError({ status: 600 }, 'error', null, [postdata, callback, tag]); });
         req.on('response', function (response) {
+            response.reqid = this.reqid;
             //console.log('Response: ' + response.statusCode);
             if (response.statusCode != 200) {
                 //console.log('ERR:' + JSON.stringify(response));
@@ -99,7 +103,7 @@ function CreateWsmanComm(/*host, port, user, pass, tls, extra*/)
             } else {
                 response.acc = '';
                 response.on('data', function (data2) { this.acc += data2; });
-                response.on('end', function () { obj.gotNextMessages(response.acc, 'success', { status: response.statusCode }, [postdata, callback, tag]); });
+                response.on('end', function () { delete obj.requests[this.reqid]; obj.gotNextMessages(response.acc, 'success', { status: response.statusCode }, [postdata, callback, tag]); });
             }
         });
 

agents/modules_meshcore/amt.js

@@ -694,8 +694,8 @@ function AmtStackCreateService(wsmanStack) {
     // TODO: Just put some of them here, but many more still need to be added, helpful link here:
     // https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/default.htm?turl=WordDocuments%2Fsecurityadminevents.htm
     obj.GetAuditLogExtendedDataStr = function (id, data) {
-        if ((id == 1602 || id == 1604) && data[0] == 0) { return data.splice(2, 2 + data[1]).toString(); } // ACL Entry Added/Removed (Digest)
-        if (id == 1603) { if (data[1] == 0) { return data.splice(3).toString(); } return null; } // ACL Entry Modified
+        if ((id == 1602 || id == 1604) && data[0] == 0) { return bufToArray(data).splice(2, 2 + data[1]).toString(); } // ACL Entry Added/Removed (Digest)
+        if (id == 1603) { if (data[1] == 0) { return bufToArray(data).splice(3).toString(); } return null; } // ACL Entry Modified
         if (id == 1605) { return ["Invalid ME access", "Invalid MEBx access"][data[0]]; } // ACL Access with Invalid Credentials
         if (id == 1606) { var r = ["Disabled", "Enabled"][data[0]]; if (data[1] == 0) { r += ", " + data[3]; } return r; } // ACL Entry State
         if (id == 1607) { return "Remote " + ["NoAuth", "ServerAuth", "MutualAuth"][data[0]] + ", Local " + ["NoAuth", "ServerAuth", "MutualAuth"][data[1]]; } // TLS State Changed
@@ -718,6 +718,7 @@ function AmtStackCreateService(wsmanStack) {
     function ReadIntX(v, p) { return (v[p + 3] * 0x1000000) + (v[p + 2] << 16) + (v[p + 1] << 8) + v[p]; }
     function btoa(x) { return Buffer.from(x).toString('base64'); }
     function atob(x) { var z = null; try { z = Buffer.from(x, 'base64').toString(); } catch (e) { console.log(e); } return z; }
+    function bufToArray(buf) { var r = []; for (var i in buf) { r.push(buf[i]); } return r; }
 
     function _GetAuditLog0(stack, name, responses, status, tag) {
         if (status != 200) { tag[0](obj, [], status); return; }

package.json

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

webserver.js

@@ -1196,7 +1196,10 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
 
                 // When data is received from the web socket, forward the data into the associated TCP connection.
                 ws.on('message', function (msg) {
-                    Debug(1, 'TCP relay data to ' + node.host + ', ' + msg.length + ' bytes'); // DEBUG
+                    if (obj.parent.debugLevel >= 1) { // DEBUG
+                        Debug(1, 'TCP relay data to ' + node.host + ', ' + msg.length + ' bytes');
+                        if (obj.parent.debugLevel >= 4) { Debug(4, '  ' + msg.toString('hex')); }
+                    }
                     msg = msg.toString('binary');
                     if (ws.interceptor) { msg = ws.interceptor.processBrowserData(msg); } // Run data thru interceptor
                     ws.forwardclient.write(new Buffer(msg, 'binary')); // Forward data to the associated TCP connection.
@@ -1239,7 +1242,10 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
 
                 // When we receive data on the TCP connection, forward it back into the web socket connection.
                 ws.forwardclient.on('data', function (data) {
-                    Debug(1, 'TCP relay data from ' + node.host + ', ' + data.length + ' bytes.'); // DEBUG
+                    if (obj.parent.debugLevel >= 1) { // DEBUG
+                        Debug(1, 'TCP relay data from ' + node.host + ', ' + data.length + ' bytes.');
+                        if (obj.parent.debugLevel >= 4) { Debug(4, '  ' + new Buffer(data, 'binary').toString('hex')); }
+                    }
                     if (ws.interceptor) { data = ws.interceptor.processAmtData(data); } // Run data thru interceptor
                     try { ws.send(new Buffer(data, 'binary')); } catch (e) { }
                 });