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

Addressed CodeQL analysis

Browse Source
This commit is contained in:
Bryan Roe
2020-07-08 21:46:53 -07:00
parent 4728330c5e
commit de4ee73ae6
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meshcore/agentcore.c
View File

@@ -3492,7 +3492,7 @@ void MeshServer_ConnectEx(MeshAgentHostContainer *agent)
void MeshServer_DbWarning(ILibSimpleDataStore db, uint64_t size, void *user) void MeshServer_DbWarning(ILibSimpleDataStore db, uint64_t size, void *user)
{ {
MeshAgentHostContainer *agent = (MeshAgentHostContainer*)user; MeshAgentHostContainer *agent = (MeshAgentHostContainer*)user;
MeshAgent_sendConsoleText(agent->meshCoreCtx, "Database Size Warning: [%u bytes]", size); MeshAgent_sendConsoleText(agent->meshCoreCtx, "Database Size Warning: [%llu bytes]", size);
} }
void MeshServer_Connect(MeshAgentHostContainer *agent) void MeshServer_Connect(MeshAgentHostContainer *agent)
{ {

22
meshcore/meshinfo.c
View File

@@ -366,47 +366,47 @@ int info_GetLocalInterfaces(char* data, int maxdata)
if (ioctl(sockfd, SIOCGIFFLAGS, ifr)) continue; // Failed if (ioctl(sockfd, SIOCGIFFLAGS, ifr)) continue; // Failed
if (memcmp(ifr->ifr_name, "lo", 3) == 0) continue; // Loopback if (memcmp(ifr->ifr_name, "lo", 3) == 0) continue; // Loopback
if (adapterCount > 0) { ptr += snprintf(data + ptr, maxdata - ptr, ","); } if (adapterCount > 0) { ptr += sprintf_s(data + ptr, maxdata - ptr, ","); }
ptr += snprintf(data + ptr, maxdata - ptr, "{"); ptr += sprintf_s(data + ptr, maxdata - ptr, "{");
// Get the name of the interface // Get the name of the interface
ptr += snprintf(data + ptr, maxdata - ptr, "\"name\":\"%s\"", ifr->ifr_name); ptr += sprintf_s(data + ptr, maxdata - ptr, "\"name\":\"%s\"", ifr->ifr_name);
// Get the FQDN (DNS Suffix) // Get the FQDN (DNS Suffix)
j = info_GetDefaultFqdn(ifr->ifr_name, &gateway); j = info_GetDefaultFqdn(ifr->ifr_name, &gateway);
if (j > 0) { ptr += snprintf(data + ptr, maxdata - ptr, ",\"dnssuffix\":\"%s\"", gateway); } if (j > 0) { ptr += sprintf_s(data + ptr, maxdata - ptr, ",\"dnssuffix\":\"%s\"", gateway); }
if (gateway != NULL) { free(gateway); gateway = NULL; } if (gateway != NULL) { free(gateway); gateway = NULL; }
// Get the Default Gateway IP address // Get the Default Gateway IP address
j = info_GetDefaultGateway(ifr->ifr_name, &gateway); j = info_GetDefaultGateway(ifr->ifr_name, &gateway);
if (j == 4) { ILibInet_ntop(AF_INET, gateway, temp, 1024); ptr += snprintf(data + ptr, maxdata - ptr, ",\"v4gateway\":\"%s\"", temp); } if (j == 4) { ILibInet_ntop(AF_INET, gateway, temp, 1024); ptr += sprintf_s(data + ptr, maxdata - ptr, ",\"v4gateway\":\"%s\"", temp); }
if (gateway != NULL) { free(gateway); gateway = NULL; } if (gateway != NULL) { free(gateway); gateway = NULL; }
// Get the Default Gateway MAC address // Get the Default Gateway MAC address
j = info_GetHwAddress(temp, strlen(temp), &gateway); j = info_GetHwAddress(temp, strlen(temp), &gateway);
if (j == 6) { ptr += snprintf(data + ptr, maxdata - ptr, ",\"gatewaymac\":\"%02x%02x%02x%02x%02x%02x\"", (unsigned char)gateway[0], (unsigned char)gateway[1], (unsigned char)gateway[2], (unsigned char)gateway[3], (unsigned char)gateway[4], (unsigned char)gateway[5]); } if (j == 6) { ptr += sprintf_s(data + ptr, maxdata - ptr, ",\"gatewaymac\":\"%02x%02x%02x%02x%02x%02x\"", (unsigned char)gateway[0], (unsigned char)gateway[1], (unsigned char)gateway[2], (unsigned char)gateway[3], (unsigned char)gateway[4], (unsigned char)gateway[5]); }
if (gateway != NULL) free(gateway); if (gateway != NULL) free(gateway);
// Attempt to figure out the interface type // Attempt to figure out the interface type
j = 0; j = 0;
if (strlen(ifr->ifr_name) > 3 && memcmp(ifr->ifr_name, "eth", 3) == 0) { j = 6; } if (strlen(ifr->ifr_name) > 3 && memcmp(ifr->ifr_name, "eth", 3) == 0) { j = 6; }
//if (strlen(ifr->ifr_name) > 2 && memcmp(ifr->ifr_name, "wl", 2) == 0) { j = 6; } // TODO: Wireless //if (strlen(ifr->ifr_name) > 2 && memcmp(ifr->ifr_name, "wl", 2) == 0) { j = 6; } // TODO: Wireless
if (j > 0) { ptr += snprintf(data + ptr, maxdata - ptr, ",\"type\":\"%d\"", j); } if (j > 0) { ptr += sprintf_s(data + ptr, maxdata - ptr, ",\"type\":\"%d\"", j); }
// Get the hardware MAC address // Get the hardware MAC address
if (ioctl(sockfd, SIOCGIFHWADDR, ifr) == 0) { if (ioctl(sockfd, SIOCGIFHWADDR, ifr) == 0) {
if (ifr->ifr_hwaddr.sa_family == 1) { if (ifr->ifr_hwaddr.sa_family == 1) {
ptr += snprintf(data + ptr, maxdata - ptr, ",\"mac\":\"%02x%02x%02x%02x%02x%02x\"", (unsigned char)ifr->ifr_hwaddr.sa_data[0], (unsigned char)ifr->ifr_hwaddr.sa_data[1], (unsigned char)ifr->ifr_hwaddr.sa_data[2], (unsigned char)ifr->ifr_hwaddr.sa_data[3], (unsigned char)ifr->ifr_hwaddr.sa_data[4], (unsigned char)ifr->ifr_hwaddr.sa_data[5]); ptr += sprintf_s(data + ptr, maxdata - ptr, ",\"mac\":\"%02x%02x%02x%02x%02x%02x\"", (unsigned char)ifr->ifr_hwaddr.sa_data[0], (unsigned char)ifr->ifr_hwaddr.sa_data[1], (unsigned char)ifr->ifr_hwaddr.sa_data[2], (unsigned char)ifr->ifr_hwaddr.sa_data[3], (unsigned char)ifr->ifr_hwaddr.sa_data[4], (unsigned char)ifr->ifr_hwaddr.sa_data[5]);
} }
} }
// Get the IP address // Get the IP address
if (ioctl(sockfd, SIOCGIFADDR, ifr) == 0) { ptr += snprintf(data + ptr, maxdata - ptr, ",\"v4addr\":\"%s\"", inet_ntoa(((struct sockaddr_in*)(&(ifr->ifr_addr)))->sin_addr)); } if (ioctl(sockfd, SIOCGIFADDR, ifr) == 0) { ptr += sprintf_s(data + ptr, maxdata - ptr, ",\"v4addr\":\"%s\"", inet_ntoa(((struct sockaddr_in*)(&(ifr->ifr_addr)))->sin_addr)); }
// Get the subnet mask // Get the subnet mask
if (ioctl(sockfd, SIOCGIFNETMASK, ifr) == 0) { ptr += snprintf(data + ptr, maxdata - ptr, ",\"v4mask\":\"%s\"", inet_ntoa(((struct sockaddr_in*)(&(ifr->ifr_addr)))->sin_addr)); } if (ioctl(sockfd, SIOCGIFNETMASK, ifr) == 0) { ptr += sprintf_s(data + ptr, maxdata - ptr, ",\"v4mask\":\"%s\"", inet_ntoa(((struct sockaddr_in*)(&(ifr->ifr_addr)))->sin_addr)); }
ptr += snprintf(data + ptr, maxdata - ptr, "}"); ptr += sprintf_s(data + ptr, maxdata - ptr, "}");
adapterCount++; adapterCount++;
} }

6
microscript/ILibDuktape_GenericMarshal.c
View File

@@ -1389,7 +1389,7 @@ duk_ret_t ILibDuktape_GenericMarshal_MethodInvokeAsync_thread_id(duk_context *ct
if (!ILibMemory_CanaryOK(data)) { return(ILibDuktape_Error(ctx, "FFI Object was already freed")); } if (!ILibMemory_CanaryOK(data)) { return(ILibDuktape_Error(ctx, "FFI Object was already freed")); }
char tmp[255]; char tmp[255];
sprintf_s(tmp, sizeof(tmp), "%ul", data->workerThreadId); sprintf_s(tmp, sizeof(tmp), "%llu", (uint64_t)data->workerThreadId);
duk_push_string(ctx, tmp); duk_push_string(ctx, tmp);
return(1); return(1);
@@ -1561,7 +1561,7 @@ void ILibDuktape_GlobalGenericCallback_ProcessEx(void *chain, void *user)
if (!ILibMemory_CanaryOK(data->emitter)) { return; } if (!ILibMemory_CanaryOK(data->emitter)) { return; }
char tmp[255]; char tmp[255];
sprintf_s(tmp, sizeof(tmp), "%ul", data->callingThread); sprintf_s(tmp, sizeof(tmp), "%llu", (uint64_t)data->callingThread);
duk_push_heapptr(data->emitter->ctx, data->emitter->object); // [obj] duk_push_heapptr(data->emitter->ctx, data->emitter->object); // [obj]
duk_push_string(data->emitter->ctx, tmp); // [obj][str] duk_push_string(data->emitter->ctx, tmp); // [obj][str]
duk_put_prop_string(data->emitter->ctx, -2, ILibDuktape_GenericMarshal_GlobalCallback_ThreadID); // [obj] duk_put_prop_string(data->emitter->ctx, -2, ILibDuktape_GenericMarshal_GlobalCallback_ThreadID); // [obj]
@@ -2121,7 +2121,7 @@ duk_ret_t ILibDuktape_GenericMarshal_GetCurrentThread(duk_context *ctx)
#if defined(WIN32) #if defined(WIN32)
sprintf_s(tmp, sizeof(tmp), "%ul", GetCurrentThreadId()); sprintf_s(tmp, sizeof(tmp), "%ul", GetCurrentThreadId());
#else #else
sprintf_s(tmp, sizeof(tmp), "%ul", pthread_self()); sprintf_s(tmp, sizeof(tmp), "%llu", pthread_self());
#endif #endif
duk_push_string(ctx, tmp); duk_push_string(ctx, tmp);
return(1); return(1);

2
microscript/ILibDuktape_HttpStream.c
View File

@@ -4390,7 +4390,7 @@ duk_ret_t ILibDuktape_http_generateNonce(duk_context *ctx)
} }
else else
{ {
return(ILibDuktape_Error(ctx, "Specified length is too long. Please Specify a value < %d", sizeof(ILibScratchPad))); return(ILibDuktape_Error(ctx, "Specified length is too long. Please Specify a value < %llu", (uint64_t)sizeof(ILibScratchPad)));
} }
} }

2
microscript/ILibDuktape_SHA256.c
View File

@@ -303,7 +303,7 @@ void ILibDuktape_VERIFIER_EndSink(ILibDuktape_WritableStream *stream, void *user
// Error // Error
duk_get_prop_string(data->ctx, -1, "_rej"); // [promise][rejector] duk_get_prop_string(data->ctx, -1, "_rej"); // [promise][rejector]
duk_swap_top(data->ctx, -2); // [rejector][this] duk_swap_top(data->ctx, -2); // [rejector][this]
duk_push_sprintf(data->ctx, "EVP_VerifyFinal(): Returned error (%d) ", ERR_get_error()); // [rejector][this][error] duk_push_sprintf(data->ctx, "EVP_VerifyFinal(): Returned error (%llu) ", (uint64_t)ERR_get_error()); // [rejector][this][error]
duk_call_method(data->ctx, 1); // [...] duk_call_method(data->ctx, 1); // [...]
break; break;
} }

2
microscript/ILibDuktape_fs.c
View File

@@ -414,7 +414,7 @@ duk_ret_t ILibDuktape_fs_readSync(duk_context *ctx)
int bytesRead; int bytesRead;
FILE *f = ILibDuktape_fs_getFilePtr(ctx, duk_require_int(ctx, 0)); FILE *f = ILibDuktape_fs_getFilePtr(ctx, duk_require_int(ctx, 0));
if (length > (int)bufferSize) { return(ILibDuktape_Error(ctx, "fs.readSync(): Buffer of size: %d bytes, but attempting to read %d bytes", bufferSize, length)); } if (length > (int)bufferSize) { return(ILibDuktape_Error(ctx, "fs.readSync(): Buffer of size: %llu bytes, but attempting to read %d bytes", (uint64_t)bufferSize, length)); }
if (f != NULL) if (f != NULL)
{ {