MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-19 17:53:28 +00:00
Code Issues Releases Wiki Activity

Updated agent-installer

Browse Source
This commit is contained in:
Bryan Roe
2020-02-14 23:03:56 -08:00
parent 0555a14b7f
commit 69808283be
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meshcore/agentcore.c
View File

@@ -3770,6 +3770,14 @@ void MeshAgent_AgentMode_Core_ServerTimeout(duk_context *ctx, void ** args, int
} }
} }
void MeshAgent_AgentInstallerCTX_Finalizer(duk_context *ctx, void *user)
{
if (ILibIsChainBeingDestroyed(user) == 0)
{
ILibStopChain(user);
}
}
int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **param, int parseCommands) int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **param, int parseCommands)
{ {
int resetNodeId = 0; int resetNodeId = 0;
@@ -3878,7 +3886,7 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
{ {
int bufLen = 0; int bufLen = 0;
char *buf; char *buf;
duk_context *ctxx = ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx(0, 0, agentHost->chain, NULL, NULL, agentHost->exePath, NULL, NULL, NULL); duk_context *ctxx = ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx(0, 0, agentHost->chain, NULL, NULL, agentHost->exePath, NULL, MeshAgent_AgentInstallerCTX_Finalizer, agentHost->chain);
duk_eval_string(ctxx, "require('user-sessions').isRoot();"); duk_eval_string(ctxx, "require('user-sessions').isRoot();");
if (!duk_get_boolean(ctxx, -1)) if (!duk_get_boolean(ctxx, -1))
{ {
@@ -3890,19 +3898,22 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
switch (installFlag) switch (installFlag)
{ {
case 1: case 1:
bufLen = ILibSimpleDataStore_Cached_GetJSONEx(agentHost->masterDb, NULL, 0); bufLen = ILibSimpleDataStore_Cached_GetJSONEx(agentHost->masterDb, NULL, 0);
buf = (char*)ILibMemory_SmartAllocate(bufLen); buf = (char*)ILibMemory_SmartAllocate(bufLen);
bufLen = ILibSimpleDataStore_Cached_GetJSONEx(agentHost->masterDb, buf, bufLen); bufLen = ILibSimpleDataStore_Cached_GetJSONEx(agentHost->masterDb, buf, bufLen);
duk_eval_string(ctxx, "require('agent-installer');");
duk_get_prop_string(ctxx, -1, "fullInstall");
duk_swap_top(ctxx, -2);
duk_push_string(ctxx, buf);
if (duk_pcall_method(ctxx, 1) != 0)
{
printf("%s\n", duk_safe_to_string(ctxx, -1));
}
duk_pop(ctxx);
ILibMemory_Free(buf); ILibMemory_Free(buf);
return(1);
break; break;
default: default:
break; break;

5
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long