Allow reordering tabs when UAC is disabled #11221
Merged
Conversation
This file contains 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
ghost
added
Area-TerminalControl
This comment has been minimized.
This comment has been minimized.
carlos-zamora
approved these changes
Sep 14, 2021
miniksa
reviewed
Sep 14, 2021
Comment on lines
146
to
148
| OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken); | ||
| GetTokenInformation(hToken.get(), TokenElevationType, &elevationType, sizeof(elevationType), &dwSize); | ||
| GetTokenInformation(hToken.get(), TokenElevation, &elevationState, sizeof(elevationState), &dwSize); |
DHowett
reviewed
Sep 15, 2021
Comment on lines
141
to
148
| DWORD dwSize; | ||
| wil::unique_handle hToken; | ||
| TOKEN_ELEVATION_TYPE elevationType; | ||
| TOKEN_ELEVATION elevationState{ 0 }; | ||
|
|
||
| OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken); | ||
| THROW_IF_WIN32_BOOL_FALSE(GetTokenInformation(hToken.get(), TokenElevationType, &elevationType, sizeof(elevationType), &dwSize)); | ||
| THROW_IF_WIN32_BOOL_FALSE(GetTokenInformation(hToken.get(), TokenElevation, &elevationState, sizeof(elevationState), &dwSize)); |
There was a problem hiding this comment.
You're gonna think this is crazy, but... check this out.
I think you can do this with WIL, and I believe that you can even use the pseudotokens that do not need lifetime management.
Suggested change
| DWORD dwSize; | |
| wil::unique_handle hToken; | |
| TOKEN_ELEVATION_TYPE elevationType; | |
| TOKEN_ELEVATION elevationState{ 0 }; | |
| OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken); | |
| THROW_IF_WIN32_BOOL_FALSE(GetTokenInformation(hToken.get(), TokenElevationType, &elevationType, sizeof(elevationType), &dwSize)); | |
| THROW_IF_WIN32_BOOL_FALSE(GetTokenInformation(hToken.get(), TokenElevation, &elevationState, sizeof(elevationState), &dwSize)); | |
| auto elevationType = wil::get_token_information<TOKEN_ELEVATION_TYPE>(GetCurrentProcessToken()); | |
| auto elevationState = wil::get_token_information<TOKEN_ELEVATION>(GetCurrentProcessToken()); |
There was a problem hiding this comment.
Make sure to include token_helpers.h somewhere
DHowett
reviewed
Sep 15, 2021
Comment on lines
160
to
162
| SID_IDENTIFIER_AUTHORITY ntAuthority{ SECURITY_NT_AUTHORITY }; | ||
| wil::unique_sid adminGroupSid{}; | ||
| THROW_IF_WIN32_BOOL_FALSE(AllocateAndInitializeSid(&ntAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &adminGroupSid)); |
There was a problem hiding this comment.
holy f---
wil has an automatic helper for this too. wil::test_token_membership. It takes a list of SIDs and Authorities.
https://github.com/microsoft/wil/wiki/Token-Helpers#wiltest_token_membership
There was a problem hiding this comment.
If you don't want to do these, I will gladly come by in a followup PR and just do 'em. 😄
DHowett
approved these changes
Sep 15, 2021
zadjii-msft
added
the
AutoMerge
|
Hello @zadjii-msft! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
ghost
merged commit
|
🎉 Handy links: |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When we're elevated, we disable drag/dropping tabs when elevated, because of a platform limitation that causes the app to crash (see #4874). However, if the user has UAC disabled, this actually works alright. So I'm adding it back in that case.
I'm not positive if this is the best way to check if UAC is disabled, but normally, you'll get a
TokenElevationTypeFullwhen elevated, notTokenElevationTypeDefault. If the app is elevated, but there's not a split token, that kinda implies there's no user account separation. If I'm wrong, it's just code, let's replace this with something that does work.Validation Steps Performed
Booted up a Win10 VM, set
enableLUAto0, rebooted, and checked if this exploded. It didn't.References #4874
References #3581
Work done in pursuit of #11096
Closes #7754