MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-05 18:13:38 +00:00
Code Issues Releases Wiki Activity

Added logic to check PATH on linux to make sure /sbin is included for current process

Browse Source
This commit is contained in:
Bryan Roe
2019-08-22 13:40:20 -07:00
parent b78545514e
commit 5e47259913
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meshcore/agentcore.c
View File

@@ -3923,9 +3923,14 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
}
}
#endif
#ifndef MICROSTACK_NOTLS
// Check the local MacAddresses, to see if we need to reset our NodeId
#if !defined(MICROSTACK_NOTLS) || defined(_POSIX)
duk_context *tmpCtx = ILibDuktape_ScriptContainer_InitializeJavaScriptEngineEx(0, 0, agentHost->chain, NULL, NULL, agentHost->exePath, NULL, NULL, NULL);
duk_peval_string_noresult(tmpCtx, "require('linux-pathfix')();");
#endif
#if !defined(MICROSTACK_NOTLS)
// Check the local MacAddresses, to see if we need to reset our NodeId
if (duk_peval_string(tmpCtx, "(function _getMac() { var ret = ''; var ni = require('os').networkInterfaces(); for (var f in ni) { for (var i in ni[f]) { if(ni[f][i].type == 'ethernet' || ni[f][i].type == 'wireless') {ret += ('[' + ni[f][i].mac + ']');} } } return(ret); })();") == 0)
{
int len;
@@ -4485,6 +4490,11 @@ void MeshAgent_ScriptMode(MeshAgentHostContainer *agentHost, int argc, char **ar
duk_pop(agentHost->meshCoreCtx); // ...
}
#if defined(_POSIX)
duk_peval_string_noresult(agentHost->meshCoreCtx, "require('linux-pathfix')();");
#endif
if (ILibDuktape_ScriptContainer_CompileJavaScriptEx(agentHost->meshCoreCtx, jsFile, jsFileLen, agentHost->meshCoreCtx_embeddedScript == NULL ? scriptArgs[0] : "[embedded].js", 0) != 0 || ILibDuktape_ScriptContainer_ExecuteByteCode(agentHost->meshCoreCtx) != 0)
{
if (strcmp(duk_safe_to_string(agentHost->meshCoreCtx, -1), "Process.exit() forced script termination") != 0)