From ec08f90db8ce163b77bee40fe003c517a54c437d Mon Sep 17 00:00:00 2001 From: jsastriawan Date: Thu, 20 Aug 2020 18:13:18 -0700 Subject: [PATCH] Fix MeshCentral redir and undefined exception --- amt-redir-node-0.1.0.js | 1 + index.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/amt-redir-node-0.1.0.js b/amt-redir-node-0.1.0.js index a3c1532..63c5515 100644 --- a/amt-redir-node-0.1.0.js +++ b/amt-redir-node-0.1.0.js @@ -97,6 +97,7 @@ var CreateAmtRedirect = function (module) { obj.xxOnSocketData = function (data) { if (!data || obj.connectstate == -1) return; + if (typeof(data)=='string') {data = new Buffer(data,'binary')} // Redirection tracing if (urlvars && urlvars['redirtrace']) { var datastr = arrToStr(new Uint8Array(data)); diff --git a/index.html b/index.html index 9e32cef..a3a547c 100644 --- a/index.html +++ b/index.html @@ -5461,7 +5461,7 @@ // ###END###{Desktop} // Intel AMT user Consent - if ((amtversion > 5) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined)) { + if ((amtversion > 5) && (amtsysstate != null && amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined)) { features = "Unknown state"; var optinrequired = amtsysstate['IPS_OptInService'].response['OptInRequired']; if (optinrequired == 0) { features = "Not Required"; } @@ -8202,7 +8202,7 @@ connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending. if (desktop.State == 0) { // Check if user consent is needed - if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) { + if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) { connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM. } // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib