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

Fixed edge case bug in getXInfo() where xauth was truncated

Browse Source
This commit is contained in:
Bryan Roe
2022-03-16 19:28:48 -07:00
parent 952b331498
commit fb0ae1221d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitor-info.js
View File

@@ -565,18 +565,18 @@ function monitorinfo()
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = '';
child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write("ps " + (process.platform == 'freebsd' ? "-ax " : "") + "-e -o user" + (process.platform == 'linux' ? ":999" : "") + " -o tty -o command | grep X | ");
child.stdin.write("ps " + (process.platform == 'freebsd' ? "-ax " : "") + "-e -o uid -o tty -o command | grep X | ");
child.stdin.write("awk '{ ");
child.stdin.write(' display="";');
child.stdin.write(' if($4~/^:/)');
child.stdin.write(' {');
child.stdin.write(' display=$4;');
child.stdin.write(' }');
child.stdin.write(' split($0, a, "-auth");');
child.stdin.write(' split(a[2], b, " ");');
child.stdin.write(' if($1=="' + uname + '" && b[1]!="")');
child.stdin.write(' match($0, /-auth .+/,arg);');
child.stdin.write(' _auth = substr($0,RSTART+6,RLENGTH-6);');
child.stdin.write(' if($1=="' + consoleuid + '" && _auth!="")');
child.stdin.write(" {");
child.stdin.write(" printf \"%s,%s,%s,%s\",$1,$2,b[1],display;");
child.stdin.write(" printf \"%s,%s,%s,%s\",$1,$2,_auth,display;");
child.stdin.write(" }");
child.stdin.write(" }'\nexit\n");