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 selfupdate for Alpine

Browse Source
This commit is contained in:
Bryan Roe 2021-01-28 21:32:59 -08:00
parent b6ebca0bd4
commit 9bad51196b
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
agents/meshcore.js
View File

@ -3841,16 +3841,37 @@ function closeDescriptors(libc, descriptors)
} }
} }
} }
function linux_execv(name, agentfilename, sessionid) { function linux_execv(name, agentfilename, sessionid)
{
var libs = require('monitor-info').getLibInfo('libc'); var libs = require('monitor-info').getLibInfo('libc');
var libc = null; var libc = null;
while (libs.length > 0) { if ((libs.length == 0 || libs.length == null) && require('MeshAgent').ARCHID == 33)
try { {
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
child.stderr.str = ''; child.stderr.on('data', function (c) { this.str += c.toString(); });
child.stdin.write("ls /lib/libc.* | tr '\\n' '`' | awk -F'`' '{ " + ' printf "["; DEL=""; for(i=1;i<NF;++i) { printf "%s{\\"path\\":\\"%s\\"}",DEL,$i; DEL=""; } printf "]"; }\'\nexit\n');
child.waitExit();
try
{
libs = JSON.parse(child.stdout.str.trim());
}
catch(e)
{
}
}
while (libs.length > 0)
{
try
{
libc = require('_GenericMarshal').CreateNativeProxy(libs.pop().path); libc = require('_GenericMarshal').CreateNativeProxy(libs.pop().path);
break; break;
} }
catch (e) { catch (e)
{
libc = null; libc = null;
continue; continue;
} }

23
agents/recoverycore.js
View File

@ -174,11 +174,30 @@ function closeDescriptors(libc, descriptors)
} }
} }
function linux_execv(name, agentfilename, sessionid) { function linux_execv(name, agentfilename, sessionid)
{
var libs = require('monitor-info').getLibInfo('libc'); var libs = require('monitor-info').getLibInfo('libc');
var libc = null; var libc = null;
while (libs.length > 0) { if ((libs.length == 0 || libs.length == null) && require('MeshAgent').ARCHID == 33)
{
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
child.stderr.str = ''; child.stderr.on('data', function (c) { this.str += c.toString(); });
child.stdin.write("ls /lib/libc.* | tr '\\n' '`' | awk -F'`' '{ " + ' printf "["; DEL=""; for(i=1;i<NF;++i) { printf "%s{\\"path\\":\\"%s\\"}",DEL,$i; DEL=""; } printf "]"; }\'\nexit\n');
child.waitExit();
try
{
libs = JSON.parse(child.stdout.str.trim());
}
catch(e)
{
}
}
while (libs.length > 0)
{
try { try {
libc = require('_GenericMarshal').CreateNativeProxy(libs.pop().path); libc = require('_GenericMarshal').CreateNativeProxy(libs.pop().path);
break; break;