Implement dns_lookup_events table on Windows #8553
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zwass
commented
Feb 20, 2025
| } | ||
| } | ||
|
|
||
| void EtwPublisherProcesses::initializeHardVolumeConversions() { |
Member
Author
There was a problem hiding this comment.
Refactored to parent class.
Comment on lines
-412
to
-472
| void EtwPublisherProcesses::updateHardVolumeWithLogicalDrive( | ||
| std::string& path) { | ||
| // Updating the hardvolume entries with logical volume data | ||
| for (const auto& [hardVolume, logicalDrive] : hardVolumeDrives_) { | ||
| size_t pos = 0; | ||
| if ((pos = path.find(hardVolume, pos)) != std::string::npos) { | ||
| path.replace(pos, hardVolume.length(), logicalDrive); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void EtwPublisherProcesses::updateUserInfo(const std::string& userSid, | ||
| std::string& username) { | ||
| // Updating user information using gathered user SIDs as input | ||
| auto usernameIt = usernamesBySIDs_.find(userSid); | ||
| if (usernameIt != usernamesBySIDs_.end()) { | ||
| auto cachedUsername = usernameIt->second; | ||
| username.assign(cachedUsername); | ||
| } else { | ||
| PSID pSid = nullptr; | ||
|
|
||
| if (!ConvertStringSidToSidA(userSid.c_str(), &pSid) || pSid == nullptr) { | ||
| // Inserting empty username to avoid the lookup logic to be called again | ||
| usernamesBySIDs_.insert({userSid, ""}); | ||
| return; | ||
| } | ||
|
|
||
| std::vector<char> domainNameStr(MAX_PATH - 1, 0x0); | ||
| std::vector<char> userNameStr(MAX_PATH - 1, 0x0); | ||
| DWORD domainNameSize = MAX_PATH; | ||
| DWORD userNameSize = MAX_PATH; | ||
| SID_NAME_USE sidType = SID_NAME_USE::SidTypeInvalid; | ||
|
|
||
| if (!LookupAccountSidA(NULL, | ||
| pSid, | ||
| userNameStr.data(), | ||
| &userNameSize, | ||
| domainNameStr.data(), | ||
| &domainNameSize, | ||
| &sidType) || | ||
| strlen(domainNameStr.data()) == 0 || | ||
| strlen(domainNameStr.data()) >= MAX_PATH || | ||
| strlen(userNameStr.data()) == 0 || | ||
| strlen(userNameStr.data()) >= MAX_PATH || | ||
| sidType == SID_NAME_USE::SidTypeInvalid) { | ||
| // Inserting empty username to avoid the lookup logic to be called again | ||
| usernamesBySIDs_.insert({userSid, ""}); | ||
| LocalFree(pSid); | ||
| return; | ||
| } | ||
|
|
||
| LocalFree(pSid); | ||
|
|
||
| username.append(domainNameStr.data()); | ||
| username.append("\\"); | ||
| username.append(userNameStr.data()); | ||
|
|
||
| usernamesBySIDs_.insert({userSid, username}); | ||
| } | ||
| } |
Member
Author
There was a problem hiding this comment.
Refactored to parent class
zwass
commented
Mar 25, 2025
| } else { | ||
| PSID pSid = nullptr; | ||
|
|
||
| if (!ConvertStringSidToSidA(userSid.c_str(), &pSid) || pSid == nullptr) { |
Member
Author
There was a problem hiding this comment.
Addressing this in a separate PR as it will affect both the existing process events table and this one.
| DWORD userNameSize = MAX_PATH; | ||
| SID_NAME_USE sidType = SID_NAME_USE::SidTypeInvalid; | ||
|
|
||
| if (!LookupAccountSidA(NULL, |
20 tasks
directionless
previously approved these changes
Mar 29, 2025
Member
directionless
left a comment
There was a problem hiding this comment.
Didn't test, seems fine.
directionless
previously approved these changes
Apr 8, 2025
Member
Author
|
@directionless I fixed up the remaining test issues. Please re-review, thanks! |
sharvilshah
approved these changes
Apr 10, 2025
Member
sharvilshah
left a comment
There was a problem hiding this comment.
Haven't tested it, but looks good
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uses ETW events to get DNS lookups.
Includes some refactors to move shared functionality into the parent class for ETW publishers.
Tested manually and includes integration test.