MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-06 10:34:09 +00:00
Code Issues Releases Wiki Activity

1. Fixed -resetnodeid for Windows Service

Browse Source 
2. Updated PE Parser
This commit is contained in:
Bryan Roe
2022-06-03 01:19:47 -07:00
parent d5e0582dbc
commit 39150e1c27
5 changed files with 170 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meshcore/agentcore.c
View File

@@ -4853,26 +4853,7 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
ILibRemoteLogging_printf(ILibChainGetLogger(agentHost->chain), ILibRemoteLogging_Modules_Microstack_Generic, ILibRemoteLogging_Flags_VerbosityLevel_1, "agentcore: argv[0] = %s", param[0]);
#if defined(_WINSERVICE)
// If running as a windows services, check the "ResetNodeId" key.
{
HKEY hKey;
DWORD len = 0;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Open Source\\MeshAgent2"), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
{
if (RegQueryValueExA(hKey, TEXT("ResetNodeId"), NULL, NULL, NULL, &len) == ERROR_SUCCESS && len > 0)
{
if (RegDeleteValue(hKey, TEXT("ResetNodeId")) == ERROR_SUCCESS)
{
// Force certificate reset
ILIBLOGMESSAGEX("NodeID will reset, because ResetNodeID key was found in registry");
resetNodeId = 1;
}
}
RegCloseKey(hKey);
}
}
#else
#if !defined(_WINSERVICE)
// If running in console mode, check the --resetnodeid command switch
if (parseCommands != 0)
{
@@ -4960,6 +4941,22 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
}
#endif
}
#if defined(_WINSERVICE)
duk_push_sprintf(tmpCtx, "require('_agentNodeId').checkResetNodeId('%s');", agentHost->meshServiceName);
if (duk_peval(tmpCtx) == 0)
{
if (duk_is_boolean(tmpCtx, -1) && duk_get_boolean(tmpCtx, -1) != 0)
{
resetNodeId = 1;
ILIBLOGMESSAGEX("NodeID will reset, because ResetNodeId was set in the registry");
}
}
else
{
char *tmp = (char*)duk_safe_to_string(tmpCtx, -1);
ILIBLOGMESSAGEX("Error checking ResetNodeId in registry: %s", tmp);
}
#endif
#endif
#if !defined(MICROSTACK_NOTLS)