Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bug: Processes name correctly displays uid for domain users #3574

Merged
merged 1 commit into from
Aug 19, 2017
Merged

bug: Processes name correctly displays uid for domain users #3574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 25 additions & 6 deletions osquery/core/windows/process_ops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include "osquery/core/process.h"
#include "osquery/core/windows/wmi.h"
#include "osquery/core/conversions.h"

namespace osquery {

Expand Down Expand Up @@ -59,12 +60,23 @@ int getUidFromSid(PSID sid) {
// USER_INFO_3 struct contains the RID (uid) of our user
unsigned long userInfoLevel = 3;
unsigned char* userBuff = nullptr;
unsigned long uid = -1;
ret = NetUserGetInfo(nullptr, uname.data(), userInfoLevel, &userBuff);
if (ret != NERR_Success && ret != NERR_UserNotFound) {
return uid;
}

if (ret != NERR_Success || userBuff == nullptr) {
return -1;
// SID belongs to a domain user, so we return the relative identifier (RID)
if (ret == NERR_UserNotFound) {
LPTSTR sidString;
ConvertSidToStringSid(sid, &sidString);
auto toks = osquery::split(sidString, "-");
safeStrtoul(toks.at(toks.size() - 1), 10, uid);
LocalFree(sidString);
} else if (ret == NERR_Success) {
uid = LPUSER_INFO_3(userBuff)->usri3_user_id;
}
auto uid = LPUSER_INFO_3(userBuff)->usri3_user_id;

NetApiBufferFree(userBuff);
return uid;
}
Expand Down Expand Up @@ -93,12 +105,19 @@ int getGidFromSid(PSID sid) {
// USER_INFO_3 struct contains the RID (uid) of our user
unsigned long userInfoLevel = 3;
unsigned char* userBuff = nullptr;
unsigned long gid = -1;
ret = NetUserGetInfo(nullptr, uname.data(), userInfoLevel, &userBuff);

if (ret != NERR_Success || userBuff == nullptr) {
return -1;
if (ret == NERR_UserNotFound) {
LPTSTR sidString;
ConvertSidToStringSid(sid, &sidString);
auto toks = osquery::split(sidString, "-");
safeStrtoul(toks.at(toks.size() - 1), 10, gid);
LocalFree(sidString);
} else if (ret == NERR_Success) {
gid = LPUSER_INFO_3(userBuff)->usri3_primary_group_id;
}
auto gid = LPUSER_INFO_3(userBuff)->usri3_primary_group_id;

NetApiBufferFree(userBuff);
return gid;
}
Expand Down