Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-11-22 12:52:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where user consent didn't show on some platforms, because the value passed for timeout was incorrect. Also fixed bug, where 'always' could be set on platforms that do not actually support it.

Browse Source
This commit is contained in:
Bryan Roe 2022-08-22 13:32:26 -07:00
parent 7e0648bef9
commit e59f4b4482
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agents/meshcore.js
View File

@ -2471,7 +2471,7 @@ function kvm_consentpromise_rejected(e)
}
function kvm_consentpromise_resolved(always)
{
if (always) { server_set_consentTimer(this.ws.httprequest.userid); }
if (always && process.platform=='win32') { server_set_consentTimer(this.ws.httprequest.userid); }
// Success
this.ws._consentpromise = null;
@ -2542,7 +2542,7 @@ function kvm_consentpromise_resolved(always)
function files_consentpromise_resolved(always)
{
if (always) { server_set_consentTimer(this.ws.httprequest.userid); }
if (always && process.platform == 'win32') { server_set_consentTimer(this.ws.httprequest.userid); }
// Success
this.ws._consentpromise = null;
@ -2698,17 +2698,17 @@ function onTunnelData(data)
});
} else
{
this.httprequest.tpromise._consent = require('message-box').create(consentTitle, consentMessage, this.consentTimeout);
this.httprequest.tpromise._consent = require('message-box').create(consentTitle, consentMessage, this.httprequest.consentTimeout);
}
} else
{
this.httprequest.tpromise._consent = require('message-box').create(consentTitle, consentMessage, this.consentTimeout);
this.httprequest.tpromise._consent = require('message-box').create(consentTitle, consentMessage, this.httprequest.consentTimeout);
}
this.httprequest.tpromise._consent.retPromise = this.httprequest.tpromise;
this.httprequest.tpromise._consent.then(
function (always)
{
if (always) { server_set_consentTimer(this.retPromise.httprequest.userid); }
if (always && process.platform == 'win32') { server_set_consentTimer(this.retPromise.httprequest.userid); }
// Success
MeshServerLogEx(27, null, "Local user accepted remote terminal request (" + this.retPromise.httprequest.remoteaddr + ")", this.retPromise.that.httprequest);
@ -2847,12 +2847,12 @@ function onTunnelData(data)
}
else
{
pr = require('message-box').create(consentTitle, consentMessage, this.consentTimeout, null, tsid);
pr = require('message-box').create(consentTitle, consentMessage, this.httprequest.consentTimeout, null, tsid);
}
}
else
{
pr = require('message-box').create(consentTitle, consentMessage, this.consentTimeout, null, tsid);
pr = require('message-box').create(consentTitle, consentMessage, this.httprequest.consentTimeout, null, tsid);
}
pr.ws = this;
this.pause();
@ -2998,12 +2998,12 @@ function onTunnelData(data)
});
} else
{
pr = require('message-box').create(consentTitle, consentMessage, this.consentTimeout, null);
pr = require('message-box').create(consentTitle, consentMessage, this.httprequest.consentTimeout, null);
}
}
else
{
pr = require('message-box').create(consentTitle, consentMessage, this.consentTimeout, null);
pr = require('message-box').create(consentTitle, consentMessage, this.httprequest.consentTimeout, null);
}
pr.ws = this;
this.pause();