MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-12 22:33:55 +00:00
Code Issues Releases Wiki Activity

1. Added work-around for Zenity timeout support detection for platforms that require DISPLAY to be set in env just to query metadata

Browse Source 
2. Fixed bug where timeout work-around resulted in success instead of timeout
This commit is contained in:
Bryan Roe
2020-04-28 03:03:18 -07:00
parent 7b339e08e0
commit dbbc47e751
2 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
modules/message-box.js
View File

@@ -155,26 +155,62 @@ function linux_messageBox()
if (location == '' && require('fs').existsSync('/usr/local/bin/zenity')) { location = '/usr/local/bin/zenity'; }
if (location == '') { return (null); }
child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = ''; child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write(location + ' --help-all | grep timeout\nexit\n');
child.waitExit();
var ret = { path: location, timeout: child.stdout.str.trim() == '' ? false : true };
Object.defineProperty(ret, "timeout", {
get: function ()
{
var uid, xinfo;
try
{
uid = require('user-sessions').consoleUid();
xinfo = require('monitor-info').getXInfo(uid);
}
catch (e)
{
uid = 0;
xinfo = require('monitor-info').getXInfo(0);
}
if (xinfo == null) { return (false); }
var child = require('child_process').execFile('/bin/sh', ['sh'], { uid: uid, env: { XAUTHORITY: xinfo.xauthority ? xinfo.xauthority : "", DISPLAY: xinfo.display } });
child.stdout.str = ''; child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write(location + ' --help-all | grep timeout\nexit\n');
child.stderr.on('data', function (e) { console.log(e); });
child.waitExit();
return (child.stdout.str.trim() == '' ? false : true);
}
});
child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = ''; child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write(location + ' --version | awk -F. \'{ printf "[%s, %s]\\n", $1, $2; } \'\nexit\n');
child.waitExit();
Object.defineProperty(ret, "version", {
get: function ()
{
var uid, xinfo;
try
{
uid = require('user-sessions').consoleUid();
xinfo = require('monitor-info').getXInfo(uid);
}
catch (e)
{
uid = 0;
xinfo = require('monitor-info').getXInfo(0);
}
if (xinfo == null) { return (false); }
try
{
ret.version = JSON.parse(child.stdout.str.trim());
}
catch(e)
{
ret.version = [2, 16];
}
var child = require('child_process').execFile('/bin/sh', ['sh'], { uid: uid, env: { XAUTHORITY: xinfo.xauthority ? xinfo.xauthority : "", DISPLAY: xinfo.display } });
child.stdout.str = ''; child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write(location + ' --version | awk -F. \'{ printf "[%s, %s]\\n", $1, $2; } \'\nexit\n');
child.waitExit();
try
{
return (JSON.parse(child.stdout.str.trim()));
}
catch (e)
{
return ([2, 16]);
}
}
});
return (ret);
})()
});
@@ -254,6 +290,7 @@ function linux_messageBox()
ret.child = require('child_process').execFile(this.zenity.path, ['zenity', layout == null ? '--question' : '--warning', '--title=' + title, '--text=' + caption], { uid: uid, env: { XAUTHORITY: xinfo.xauthority ? xinfo.xauthority : "", DISPLAY: xinfo.display } });
ret.child.timeout = setTimeout(function (c)
{
c.promise._rej('timeout');
c.timeout = null;
c.kill();
}, timeout * 1000, ret.child);