MeshCentral/MeshCommander
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCommander synced 2025-12-06 06:03:20 +00:00
Code Issues Releases Wiki Activity

Merge pull request #30 from jsastriawan/kvmovermc

Browse Source 
Fix MeshCentral redir and undefined exception
This commit is contained in:
Ylian Saint-Hilaire
2020-08-26 20:29:49 -07:00
committed by GitHub
parent 5e67b1d9e4 ec08f90db8
commit 84ee72d723
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
amt-redir-node-0.1.0.js
View File

@@ -98,6 +98,7 @@ var CreateAmtRedirect = function (module) {
obj.xxOnSocketData = function (data) { obj.xxOnSocketData = function (data) {
if (!data || obj.connectstate == -1) return; if (!data || obj.connectstate == -1) return;
if (typeof(data)=='string') {data = new Buffer(data,'binary')}
// Redirection tracing // Redirection tracing
if (urlvars && urlvars['redirtrace']) { if (urlvars && urlvars['redirtrace']) {
var datastr = arrToStr(new Uint8Array(data)); var datastr = arrToStr(new Uint8Array(data));

4
index.html
View File

@@ -5479,7 +5479,7 @@
// ###END###{Desktop} // ###END###{Desktop}
// Intel AMT user Consent // 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"; features = "Unknown state";
var optinrequired = amtsysstate['IPS_OptInService'].response['OptInRequired']; var optinrequired = amtsysstate['IPS_OptInService'].response['OptInRequired'];
if (optinrequired == 0) { features = "Not Required"; } if (optinrequired == 0) { features = "Not Required"; }
@@ -8222,7 +8222,7 @@
connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending. connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
if (desktop.State == 0) { if (desktop.State == 0) {
// Check if user consent is needed // 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. 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 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib