MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-13 07:53:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

updated cert check and added linux_execv()

Browse Source
This commit is contained in:
Bryan Roe 2021-01-18 16:05:28 -08:00
parent e1804bce97
commit 1df705e5ab
1 changed files with 97 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
agents/recoverycore.js
View File

@ -106,6 +106,81 @@ function pathjoin()
// Replace a string with a number if the string is an exact number // Replace a string with a number if the string is an exact number
function toNumberIfNumber(x) { if ((typeof x == 'string') && (+parseInt(x) === x)) { x = parseInt(x); } return x; } function toNumberIfNumber(x) { if ((typeof x == 'string') && (+parseInt(x) === x)) { x = parseInt(x); } return x; }
function linux_execv(name, agentfilename, sessionid)
{
var libs = require('monitor-info').getLibInfo('libc');
var libc = null;
while (libs.length > 0)
{
try
{
libc = require('_GenericMarshal').CreateNativeProxy(libs.pop().path);
break;
}
catch (e)
{
libc = null;
continue;
}
}
if (libc != null)
{
try
{
libc.CreateMethod('execv');
}
catch (e)
{
libc = null;
}
}
if (libc == null)
{
// Couldn't find libc.so, fallback to using service manager to restart agent
if (sessionid != null) { sendConsoleText('Restarting service via service-manager...', sessionid) }
try
{
// restart service
var s = require('service-manager').manager.getService(name);
s.restart();
}
catch (zz)
{
sendConsoleText('Self Update encountered an error trying to restart service', sessionid);
sendAgentMessage('Self Update encountered an error trying to restart service', 3);
}
return;
}
if (sessionid != null) { sendConsoleText('Restarting service via execv()...', sessionid) }
var i;
var args;
var argarr = [];
var path = require('_GenericMarshal').CreateVariable(process.execPath);
if (require('MeshAgent').getStartupOptions != null)
{
var options = require('MeshAgent').getStartupOptions();
for (i in options)
{
argarr.push('--' + i + '="' + options[i] + '"');
}
}
args = require('_GenericMarshal').CreateVariable((1 + argarr.length) * require('_GenericMarshal').PointerSize);
for (i = 0; i < argarr.length; ++i)
{
var arg = require('_GenericMarshal').CreateVariable(argarr[i]);
arg.pointerBuffer().copy(args.toBuffer(), i * require('_GenericMarshal').PointerSize);
}
libc.execv(path, args);
if (sessionid != null) { sendConsoleText('Self Update failed because execv() failed', sessionid) }
sendAgentMessage('Self Update failed because execv() failed', 3);
}
function bsd_execv(name, agentfilename, sessionid) function bsd_execv(name, agentfilename, sessionid)
{ {
@ -159,6 +234,7 @@ function bsd_execv(name, agentfilename, sessionid)
arg.pointerBuffer().copy(args.toBuffer(), i * require('_GenericMarshal').PointerSize); arg.pointerBuffer().copy(args.toBuffer(), i * require('_GenericMarshal').PointerSize);
} }
if (sessionid != null) { sendConsoleText('Restarting service via service-manager', sessionid) }
libc.execv(path, args); libc.execv(path, args);
if (sessionid != null) { sendConsoleText('Self Update failed because execv() failed', sessionid) } if (sessionid != null) { sendConsoleText('Self Update failed because execv() failed', sessionid) }
sendAgentMessage('Self Update failed because execv() failed', 3); sendAgentMessage('Self Update failed because execv() failed', 3);
@ -251,6 +327,7 @@ function agentUpdate_Start(updateurl, updateoptions)
sendAgentMessage('Self Update failed, because the url cannot be verified', 3); sendAgentMessage('Self Update failed, because the url cannot be verified', 3);
throw new Error('BadCert'); throw new Error('BadCert');
} }
if (certs[0].digest == null) { return; }
if ((checkServerIdentity.servertlshash != null) && (checkServerIdentity.servertlshash.toLowerCase() != certs[0].digest.split(':').join('').toLowerCase())) if ((checkServerIdentity.servertlshash != null) && (checkServerIdentity.servertlshash.toLowerCase() != certs[0].digest.split(':').join('').toLowerCase()))
{ {
sendConsoleText('Self Update failed, because the supplied certificate does not match', sessionid); sendConsoleText('Self Update failed, because the supplied certificate does not match', sessionid);
@ -313,24 +390,27 @@ function agentUpdate_Start(updateurl, updateoptions)
// erase update // erase update
require('fs').unlinkSync(process.cwd() + agentfilename + '.update'); require('fs').unlinkSync(process.cwd() + agentfilename + '.update');
if (sessionid != null) { sendConsoleText('Restarting service...', sessionid); } switch(process.platform)
if (process.platform == 'freebsd')
{ {
bsd_execv(name, agentfilename, sessionid); case 'freebsd':
} bsd_execv(name, agentfilename, sessionid);
else break;
{ case 'linux':
try linux_execv(name, agentfilename, sessionid);
{ break;
// restart service default:
var s = require('service-manager').manager.getService(name); try
s.restart(); {
} // restart service
catch (zz) var s = require('service-manager').manager.getService(name);
{ s.restart();
sendConsoleText('Self Update encountered an error trying to restart service', sessionid); }
sendAgentMessage('Self Update encountered an error trying to restart service', 3); catch (zz)
} {
sendConsoleText('Self Update encountered an error trying to restart service', sessionid);
sendAgentMessage('Self Update encountered an error trying to restart service', 3);
}
break;
} }
} }
}); });