mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 01:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Driver: fortcout: Prepare Service SID checking

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2024-10-22 18:45:15 +05:00
parent 8c2a70780e
commit 80b3eea0e0
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/driver/fortcout.c
View File

@ -365,7 +365,6 @@ inline static void fort_callout_ale_classify_action(PCFORT_CALLOUT_ARG ca,
} }
} }
#if 0
inline static BOOL fort_callout_ale_fill_path_sid(PCFORT_CALLOUT_ARG ca, PFORT_CALLOUT_ALE_EXTRA cx) inline static BOOL fort_callout_ale_fill_path_sid(PCFORT_CALLOUT_ARG ca, PFORT_CALLOUT_ALE_EXTRA cx)
{ {
const FWP_VALUE0 userIdField = ca->inFixedValues->incomingValue[ca->fi->userId].value; const FWP_VALUE0 userIdField = ca->inFixedValues->incomingValue[ca->fi->userId].value;
@ -377,27 +376,39 @@ inline static BOOL fort_callout_ale_fill_path_sid(PCFORT_CALLOUT_ARG ca, PFORT_C
if (tokenInfo == NULL) if (tokenInfo == NULL)
return FALSE; return FALSE;
const PSID sid = tokenInfo->SidHash->SidAttr->Sid; const PSID_AND_ATTRIBUTES_HASH sidHash = tokenInfo->SidHash;
if (sid == NULL) if (sidHash == NULL)
return FALSE; return FALSE;
WCHAR buffer[256]; const int sidCount = sidHash->SidCount;
UNICODE_STRING sid_str = {
.Length = 0,
.MaximumLength = sizeof(buffer),
.Buffer = buffer,
};
if (NT_SUCCESS(RtlConvertSidToUnicodeString(&sid_str, sid, /*allocate=*/FALSE))) { for (int i = 0; i < sidCount; ++i) {
LOG("TEST> pid=%d sid=%c%c%c%c%c%c%c%c%c%c%c%c\n", cx->process_id, (char) buffer[0], const SID *sid = sidHash->SidAttr[i].Sid;
(char) buffer[1], (char) buffer[2], (char) buffer[3], (char) buffer[4], if (sid == NULL)
(char) buffer[5], (char) buffer[6], (char) buffer[7], (char) buffer[8], continue;
(char) buffer[9], (char) buffer[10], (char) buffer[11]);
if (sid->Revision != 1)
continue;
if (sid->SubAuthorityCount != 6)
continue; // not "Service SID"'s count
const DWORD *subAuth = &sid->SubAuthority[0];
if (*subAuth != 80)
continue; // not "Service SID"'s prefix
const BYTE *idAuth = &sid->IdentifierAuthority.Value[0];
if (idAuth[5] != 5 || idAuth[4] != 0 || *((PUINT32) &idAuth[0]) != 0)
continue; // not "NT Authority"
// Get Service Name by SID
// TODO
return FALSE;
} }
return FALSE; return FALSE;
} }
#endif
inline static void fort_callout_ale_fill_path(PCFORT_CALLOUT_ARG ca, PFORT_CALLOUT_ALE_EXTRA cx) inline static void fort_callout_ale_fill_path(PCFORT_CALLOUT_ARG ca, PFORT_CALLOUT_ALE_EXTRA cx)
{ {
@ -407,12 +418,15 @@ inline static void fort_callout_ale_fill_path(PCFORT_CALLOUT_ARG ca, PFORT_CALLO
- sizeof(WCHAR)); /* chop terminating zero */ - sizeof(WCHAR)); /* chop terminating zero */
real_path->buffer = (PCWSTR) ca->inMetaValues->processPath->data; real_path->buffer = (PCWSTR) ca->inMetaValues->processPath->data;
PFORT_APP_PATH path = &cx->path;
BOOL isSvcHost = FALSE; BOOL isSvcHost = FALSE;
BOOL inherited = FALSE; BOOL inherited = FALSE;
PFORT_APP_PATH path = &cx->path;
if (fort_pstree_get_proc_name( if (fort_pstree_get_proc_name(
&fort_device()->ps_tree, cx->process_id, path, &isSvcHost, &inherited)) { &fort_device()->ps_tree, cx->process_id, path, &isSvcHost, &inherited)
// Check Service SID
|| (isSvcHost && fort_callout_ale_fill_path_sid(ca, cx))) {
if (!inherited) { if (!inherited) {
*real_path = *path; *real_path = *path;
} }

4
src/driver/fortps.c
View File

@ -250,7 +250,7 @@ static BOOL fort_pstree_svchost_path_check(PCUNICODE_STRING path)
return TRUE; return TRUE;
} }
static BOOL fort_pstree_svchost_check(PCUNICODE_STRING commandLine, PUNICODE_STRING serviceName) static BOOL fort_pstree_svchost_name_check(PCUNICODE_STRING commandLine, PUNICODE_STRING serviceName)
{ {
PWCHAR argp = wcsstr(commandLine->Buffer, L"-s "); PWCHAR argp = wcsstr(commandLine->Buffer, L"-s ");
if (argp == NULL) if (argp == NULL)
@ -321,7 +321,7 @@ static void fort_pstree_proc_check_svchost(
proc->flags |= FORT_PSNODE_IS_SVCHOST; proc->flags |= FORT_PSNODE_IS_SVCHOST;
UNICODE_STRING serviceName; UNICODE_STRING serviceName;
if (!fort_pstree_svchost_check(psi->commandLine, &serviceName)) if (!fort_pstree_svchost_name_check(psi->commandLine, &serviceName))
return; return;
PFORT_PSNAME ps_name = fort_pstree_create_service_name(ps_tree, &serviceName); PFORT_PSNAME ps_name = fort_pstree_create_service_name(ps_tree, &serviceName);