Skip to content

fix: incorrect SID in logged_in_users table on windows when username … #8486

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
Merged
directionless merged 4 commits into from
Dec 24, 2024
Merged

fix: incorrect SID in logged_in_users table on windows when username … #8486

directionless merged 4 commits into from
Dec 24, 2024

Conversation

@siva1334
Copy link
Contributor

@siva1334 siva1334 commented Nov 28, 2024 •
edited
Loading

Fixes #8472 which is raised by me.

@siva1334 siva1334 requested review from a team as code owners November 28, 2024 10:49
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Nov 28, 2024 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

directionless
directionless previously approved these changes Dec 1, 2024
View reviewed changes
directionless
directionless previously approved these changes Dec 1, 2024
View reviewed changes
@siva1334 siva1334 closed this Dec 5, 2024
@zwass zwass reopened this Dec 17, 2024
@zwass zwass force-pushed the fix-windows-incorrect-SID-in-logged-in-users-table branch from 53fb7a0 to b56fef8 Compare December 17, 2024 18:46
@Smjert
Copy link
Member

Smjert commented Dec 17, 2024

@zwass The input of getSidFromAccountName is a std::wstring (so a UTF16 string), we should not convert the wtsSession->Domain and UserName to UTF8 (which is what wstringToString does), but construct a std::wstring.

I would suggest doing:

std::wstring domainUser = wtsSession->Domain;
domainUser += L"\\";
domainUser += wtsSession->UserName;

and then pass that.

@directionless directionless merged commit 5412e23 into osquery:master Dec 24, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@directionless directionless directionless approved these changes

@Smjert Smjert Awaiting requested review from Smjert

Assignees

No one assigned

Labels

bug virtual tables Windows

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Incorrect SID in logged_in_users table for Windows when Username and Domain/Device Name are the same

5 participants

@siva1334 @Smjert @directionless @zwass @michael-myers