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

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-06-28 14:20:19 -07:00
commit 7ccf0993e9
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
agents/recoverycore.js
View File

@ -7,7 +7,6 @@ var tunnels = {};
var fs = require('fs'); var fs = require('fs');
var needStreamFix = (new Date(process.versions.meshAgent) < new Date('2020-01-21 13:27:45.000-08:00')); var needStreamFix = (new Date(process.versions.meshAgent) < new Date('2020-01-21 13:27:45.000-08:00'));
try try
{ {
Object.defineProperty(Array.prototype, 'find', { Object.defineProperty(Array.prototype, 'find', {
@ -553,15 +552,15 @@ function agentUpdate_Start(updateurl, updateoptions) {
if (process.platform == 'win32') if (process.platform == 'win32')
{ {
// Special Processing for Temporary/Console Mode Agents on Windows // Special Processing for Temporary/Console Mode Agents on Windows
var parms = windows_getCommandLine(); var parms = windows_getCommandLine(); // This uses FFI to fetch the command line parameters that the agent was started with
if (parms.findIndex(function (val) { return (val.toUpperCase() == 'RUN' || val.toUpperCase() == 'CONNECT');})>=0) if (parms.findIndex(function (val) { return (val != null && (val.toUpperCase() == 'RUN' || val.toUpperCase() == 'CONNECT')); }) >= 0)
{ {
// This is a Temporary/Console Mode Agent // This is a Temporary/Console Mode Agent
sendConsoleText('This is a temporary/console agent, checking for conflicts with background services...'); sendConsoleText('This is a temporary/console agent, checking for conflicts with background services...');
// Check to see if our binary conflicts with an installed agent // Check to see if our binary conflicts with an installed agent
var agents = _getPotentialServiceNames(); var agents = _getPotentialServiceNames();
if(_getPotentialServiceNames().length>0) if (_getPotentialServiceNames().length > 0)
{ {
sendConsoleText('Self update cannot continue because the installed agent (' + agents[0] + ') conflicts with the currently running Temp/Console agent...', sessionid); sendConsoleText('Self update cannot continue because the installed agent (' + agents[0] + ') conflicts with the currently running Temp/Console agent...', sessionid);
return; return;
@ -648,11 +647,25 @@ function agentUpdate_Start(updateurl, updateoptions) {
sendAgentMessage('Self Update FAILED because the downloaded agent FAILED hash check (' + agentUpdate_Start._retryCount + '), URL: ' + updateurl, 3); sendAgentMessage('Self Update FAILED because the downloaded agent FAILED hash check (' + agentUpdate_Start._retryCount + '), URL: ' + updateurl, 3);
agentUpdate_Start._selfupdate = null; agentUpdate_Start._selfupdate = null;
try
{
// We are clearing these two properties, becuase some older agents may not cleanup correctly causing problems with the retry
require('https').globalAgent.sockets = {};
require('https').globalAgent.requests = {};
}
catch(z)
{}
if (needStreamFix)
{
sendConsoleText('This is an older agent that may have an httpstream bug. On next retry will try to fetch the update differently...');
needStreamFix = false;
}
if (agentUpdate_Start._retryCount < 4) if (agentUpdate_Start._retryCount < 4)
{ {
// Retry the download again // Retry the download again
sendConsoleText('Self Update will try again in 60 seconds...', sessionid); sendConsoleText('Self Update will try again in 20 seconds...', sessionid);
agentUpdate_Start._timeout = setTimeout(agentUpdate_Start, 60000, updateurl, updateoptions); agentUpdate_Start._timeout = setTimeout(agentUpdate_Start, 20000, updateurl, updateoptions);
} }
else else
{ {
@ -900,7 +913,8 @@ function onTunnelControlData(data, ws) {
} }
require('MeshAgent').AddCommandHandler(function (data) { require('MeshAgent').AddCommandHandler(function (data)
{
if (typeof data == 'object') { if (typeof data == 'object') {
// If this is a console command, parse it and call the console handler // If this is a console command, parse it and call the console handler
switch (data.action) { switch (data.action) {