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

Added support for non-english username and hostname on Windows. Server modifications still needed for hostname display.

Browse Source
This commit is contained in:
Bryan Roe
2019-08-19 13:53:37 -07:00
parent 07cfa46500
commit 8292a609ea
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meshcore/agentcore.c
View File

@@ -1861,6 +1861,13 @@ duk_ret_t ILibDuktape_MeshAgent_forceExit(duk_context *ctx)
exit(code); exit(code);
return(0); return(0);
} }
duk_ret_t ILibDuktape_MeshAgent_hostname(duk_context *ctx)
{
duk_push_this(ctx);
MeshAgentHostContainer *agent = (MeshAgentHostContainer*)Duktape_GetPointerProperty(ctx, -1, MESH_AGENT_PTR);
duk_push_string(ctx, agent->hostname);
return(1);
}
void ILibDuktape_MeshAgent_PUSH(duk_context *ctx, void *chain) void ILibDuktape_MeshAgent_PUSH(duk_context *ctx, void *chain)
{ {
MeshAgentHostContainer *agent; MeshAgentHostContainer *agent;
@@ -1943,6 +1950,7 @@ void ILibDuktape_MeshAgent_PUSH(duk_context *ctx, void *chain)
ILibDuktape_CreateInstanceMethod(ctx, "ExecPowerState", ILibDuktape_MeshAgent_ExecPowerState, DUK_VARARGS); ILibDuktape_CreateInstanceMethod(ctx, "ExecPowerState", ILibDuktape_MeshAgent_ExecPowerState, DUK_VARARGS);
ILibDuktape_CreateInstanceMethod(ctx, "eval", ILibDuktape_MeshAgent_eval, 1); ILibDuktape_CreateInstanceMethod(ctx, "eval", ILibDuktape_MeshAgent_eval, 1);
ILibDuktape_CreateInstanceMethod(ctx, "forceExit", ILibDuktape_MeshAgent_forceExit, DUK_VARARGS); ILibDuktape_CreateInstanceMethod(ctx, "forceExit", ILibDuktape_MeshAgent_forceExit, DUK_VARARGS);
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); 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);
@@ -3671,7 +3679,16 @@ MeshAgentHostContainer* MeshAgent_Create(MeshCommand_AuthInfo_CapabilitiesMask c
retVal->chain = ILibCreateChainEx(3 * sizeof(void*)); retVal->chain = ILibCreateChainEx(3 * sizeof(void*));
retVal->pipeManager = ILibProcessPipe_Manager_Create(retVal->chain); retVal->pipeManager = ILibProcessPipe_Manager_Create(retVal->chain);
retVal->capabilities = capabilities | MeshCommand_AuthInfo_CapabilitiesMask_CONSOLE | MeshCommand_AuthInfo_CapabilitiesMask_JAVASCRIPT; retVal->capabilities = capabilities | MeshCommand_AuthInfo_CapabilitiesMask_CONSOLE | MeshCommand_AuthInfo_CapabilitiesMask_JAVASCRIPT;
#ifdef WIN32
WCHAR whostname[MAX_PATH];
if (GetHostNameW(whostname, MAX_PATH) == 0)
{
WideCharToMultiByte(CP_UTF8, 0, whostname, -1, retVal->hostname, (int)sizeof(retVal->hostname), NULL, NULL);
}
#else
gethostname(retVal->hostname, (int)sizeof(retVal->hostname)); gethostname(retVal->hostname, (int)sizeof(retVal->hostname));
#endif
#ifdef WIN32 #ifdef WIN32
GetSystemPowerStatus(&stats); GetSystemPowerStatus(&stats);

14
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

8
modules/user-sessions.js
View File

@@ -96,7 +96,7 @@ function UserSessions()
{ {
this._wts = this._marshal.CreateNativeProxy('Wtsapi32.dll'); this._wts = this._marshal.CreateNativeProxy('Wtsapi32.dll');
this._wts.CreateMethod('WTSEnumerateSessionsA'); this._wts.CreateMethod('WTSEnumerateSessionsA');
this._wts.CreateMethod('WTSQuerySessionInformationA'); this._wts.CreateMethod('WTSQuerySessionInformationW');
this._wts.CreateMethod('WTSRegisterSessionNotification'); this._wts.CreateMethod('WTSRegisterSessionNotification');
this._wts.CreateMethod('WTSUnRegisterSessionNotification'); this._wts.CreateMethod('WTSUnRegisterSessionNotification');
this._wts.CreateMethod('WTSFreeMemory'); this._wts.CreateMethod('WTSFreeMemory');
@@ -193,12 +193,12 @@ function UserSessions()
var buffer = this._marshal.CreatePointer(); var buffer = this._marshal.CreatePointer();
var bytesReturned = this._marshal.CreateVariable(4); var bytesReturned = this._marshal.CreateVariable(4);
if (this._wts.WTSQuerySessionInformationA(0, sessionId, attr, buffer, bytesReturned).Val == 0) if (this._wts.WTSQuerySessionInformationW(0, sessionId, attr, buffer, bytesReturned).Val == 0)
{ {
throw ('Error calling WTSQuerySessionInformation: ' + this._kernel32.GetLastError.Val); throw ('Error calling WTSQuerySessionInformationW: ' + this._kernel32.GetLastError.Val);
} }
var retVal = buffer.Deref().String; var retVal = buffer.Deref().Wide2UTF8;
this._wts.WTSFreeMemory(buffer.Deref()); this._wts.WTSFreeMemory(buffer.Deref());
return (retVal); return (retVal);