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

Fixed edge case with child-container, where if exit is called before child connects, could result in hung client, or stale server.

Browse Source
This commit is contained in:
Bryan Roe
2022-08-21 15:33:01 -07:00
parent 7905caa745
commit ad03c83c22
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
microscript/ILibDuktape_HttpStream.c
View File

@@ -4717,6 +4717,8 @@ void ILibDuktape_httpStream_webSocket_DecodedResumeSink_Chain(void *chain, void
}
void ILibDuktape_httpStream_webSocket_DecodedResumeSink(ILibDuktape_DuplexStream *sender, void *user)
{
if (!ILibMemory_CanaryOK(user)) { return; }
ILibDuktape_WebSocket_State *state = (ILibDuktape_WebSocket_State*)user;
if (state->encodedStream->writableStream->pipedReadable_native != NULL && state->encodedStream->writableStream->pipedReadable_native->ResumeHandler != NULL)
{

2
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

35
modules/child-container.js
View File

@@ -39,10 +39,18 @@ function childContainer()
this.send({ command: 'message', value: msg });
})
.addMethod('exit', function (code)
{
try
{
this.send({ command: 'exit', value: code });
}
catch(z)
{
// IPC is not connected, so we need to shutdown the IPC Server, to prevent the child from hanging
this._ipc.close();
}
})
.addMethod('send', function (obj)
.addMethod('send', function child_container_send2(obj)
{
if (!this._client) { throw ('Not Connected'); }
var d, h = Buffer.alloc(4);
@@ -130,7 +138,27 @@ function childContainer()
// Spawn the child
if(options.user && process.platform == 'win32')
{
// Use Task Scheduler
try
{
// First try to use Win-Task
var u = options.user;
if (u[0] == '"') { u = u.substring(1, u.length - 1); }
var tokens = u.split('\\');
if (tokens.length != 2) { throw ('invalid user format'); }
user = tokens[1];
domain = tokens[0];
var task = { name: 'MeshUserTask', user: user, domain: domain, execPath: process.execPath, arguments: ['-b64exec ' + script] };
require('win-tasks').addTask(task);
require('win-tasks').getTask({ name: 'MeshUserTask' }).run();
require('win-tasks').deleteTask('MeshUserTask');
return (ret);
}
catch(z)
{
}
// Use Task Scheduler, as failover
var parms = '/C SCHTASKS /CREATE /F /TN MeshUserTask /SC ONCE /ST 00:00 ';
parms += ('/RU ' + options.user + ' ');
parms += ('/TR "\\"' + process.execPath + '\\" -b64exec ' + script + '"');
@@ -198,7 +226,7 @@ function childContainer()
{
this.send({ command: 'message', value: msg });
})
.addMethod('send', function (data)
.addMethod('send', function child_container_send1(data)
{
if (!this._ipcClient) { throw ('Not Connected'); }
var d, h = Buffer.alloc(4);
@@ -209,6 +237,7 @@ function childContainer()
this._ipcClient.write(d);
});
Object.defineProperty(this, 'child', { value: true });
this._ipcClient.on('error', function () { console.log('ERROR/EXITING'); process._exit(); }); // If the child can't connect to the parent, we must exit, because otherwise we will just hang around forever.
this._ipcClient.on('connect', function ()
{
this.on('close', function () { process._exit(0); });