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

1. Updated enumerability of some properties on MeshAgent

Browse Source 
2. Updated selftest, and fixed a related crash
This commit is contained in:
Bryan Roe
2021-02-09 11:54:27 -08:00
parent ca7cff61ff
commit ff034714c2
3 changed files with 300 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meshcore/agentcore.c
View File

@@ -1915,12 +1915,12 @@ void ILibDuktape_MeshAgent_PUSH(duk_context *ctx, void *chain)
ILibDuktape_CreateInstanceMethod(ctx, "hostname", ILibDuktape_MeshAgent_hostname, 0);
Duktape_CreateEnum(ctx, "ContainerPermissions", (char*[]) { "DEFAULT", "NO_AGENT", "NO_MARSHAL", "NO_PROCESS_SPAWNING", "NO_FILE_SYSTEM_ACCESS", "NO_NETWORK_ACCESS" }, (int[]) { 0x00, 0x10000000, 0x08000000, 0x04000000, 0x00000001, 0x00000002 }, 6);
duk_push_string(ctx, agent->displayName); ILibDuktape_CreateReadonlyProperty(ctx, "displayName");
duk_push_string(ctx, agent->displayName); ILibDuktape_CreateReadonlyProperty_SetEnumerable(ctx, "displayName",1);
if (agent->JSRunningAsService)
{
duk_push_string(ctx, agent->meshServiceName);
ILibDuktape_CreateReadonlyProperty(ctx, "serviceName");
ILibDuktape_CreateReadonlyProperty_SetEnumerable(ctx, "serviceName", 1);
}
@@ -1930,13 +1930,13 @@ void ILibDuktape_MeshAgent_PUSH(duk_context *ctx, void *chain)
#else
duk_push_false(ctx);
#endif
ILibDuktape_CreateReadonlyProperty(ctx, "isService");
ILibDuktape_CreateReadonlyProperty_SetEnumerable(ctx, "isService",1);
#else
#ifndef __APPLE__
// Determine if we're running as service on Linux
if (duk_peval_string(ctx, "require('service-manager').manager.getService('meshagent').isMe();") == 0)
{
ILibDuktape_CreateReadonlyProperty(ctx, "isService");
ILibDuktape_CreateReadonlyProperty_SetEnumerable(ctx, "isService",1);
}
else
{