Ros-diffs May 2022

ros-diffs@reactos.org

31 participants
165 discussions

[reactos] 04/21: [WINLOGON] Refactor the security management part

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f96c39f6b08fe37f6f0fd… commit f96c39f6b08fe37f6f0fd48a43387865f47ef6d7 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Apr 2 18:16:40 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri May 6 10:09:49 2022 +0200 [WINLOGON] Refactor the security management part Refactor the security related code of Winlogon and move it to its own dedicated place, security.c. This includes code for preparation of security descriptors for window station and desktop objects when their created, helper functions which give allow access to such objects for the logged in user and whatnot. ==== DO NOTE ==== Currently new desktop security assignment fails because for whatever reason the system thinks the application desktop has no prior security even though a descriptor has been created for it before. See the FIXME comment on code for information. --- base/system/winlogon/CMakeLists.txt | 1 + base/system/winlogon/sas.c | 88 +-- base/system/winlogon/security.c | 1314 +++++++++++++++++++++++++++++++++++ base/system/winlogon/winlogon.h | 43 +- base/system/winlogon/wlx.c | 336 ++------- 5 files changed, 1410 insertions(+), 372 deletions(-) diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt index 64d3fef8b57..06ff9241c91 100644 --- a/base/system/winlogon/CMakeLists.txt +++ b/base/system/winlogon/CMakeLists.txt @@ -11,6 +11,7 @@ list(APPEND SOURCE rpcserver.c sas.c screensaver.c + security.c setup.c shutdown.c winlogon.c diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 20298e84b90..a78733b7771 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -428,87 +428,6 @@ PlayLogonSound( CloseHandle(hThread); } -static BOOL -AllowWinstaAccess(PWLSESSION Session) -{ - BOOL bSuccess = FALSE; - DWORD dwIndex; - DWORD dwLength = 0; - PTOKEN_GROUPS ptg = NULL; - PSID psid; - TOKEN_STATISTICS Stats; - DWORD cbStats; - DWORD ret; - - // Get required buffer size and allocate the TOKEN_GROUPS buffer. - - if (!GetTokenInformation(Session->UserToken, - TokenGroups, - ptg, - 0, - &dwLength)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - return FALSE; - - ptg = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); - if (ptg == NULL) - return FALSE; - } - - // Get the token group information from the access token. - if (!GetTokenInformation(Session->UserToken, - TokenGroups, - ptg, - dwLength, - &dwLength)) - { - goto Cleanup; - } - - // Loop through the groups to find the logon SID. - - for (dwIndex = 0; dwIndex < ptg->GroupCount; dwIndex++) - { - if ((ptg->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) - == SE_GROUP_LOGON_ID) - { - psid = ptg->Groups[dwIndex].Sid; - break; - } - } - - dwLength = GetLengthSid(psid); - - if (!GetTokenInformation(Session->UserToken, - TokenStatistics, - &Stats, - sizeof(TOKEN_STATISTICS), - &cbStats)) - { - WARN("Couldn't get Authentication id from user token!\n"); - goto Cleanup; - } - - AddAceToWindowStation(Session->InteractiveWindowStation, psid); - - ret = SetWindowStationUser(Session->InteractiveWindowStation, - &Stats.AuthenticationId, - psid, - dwLength); - TRACE("SetWindowStationUser returned 0x%x\n", ret); - - bSuccess = TRUE; - -Cleanup: - - // Free the buffer for the token groups. - if (ptg != NULL) - HeapFree(GetProcessHeap(), 0, (LPVOID)ptg); - - return bSuccess; -} - static VOID RestoreAllConnections(PWLSESSION Session) @@ -633,7 +552,12 @@ HandleLogon( goto cleanup; } - AllowWinstaAccess(Session); + /* Allow winsta and desktop access for this session */ + if (!AllowAccessOnSession(Session)) + { + WARN("WL: AllowAccessOnSession() failed to give winsta & desktop access for this session\n"); + goto cleanup; + } /* Connect remote resources */ RestoreAllConnections(Session); diff --git a/base/system/winlogon/security.c b/base/system/winlogon/security.c new file mode 100644 index 00000000000..26d3935fe2e --- /dev/null +++ b/base/system/winlogon/security.c @@ -0,0 +1,1314 @@ +/* + * PROJECT: ReactOS Winlogon + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security utility infrastructure implementation of Winlogon + * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include "winlogon.h" + +/* DEFINES ******************************************************************/ + +#define DESKTOP_ALL (DESKTOP_READOBJECTS | DESKTOP_CREATEWINDOW | \ + DESKTOP_CREATEMENU | DESKTOP_HOOKCONTROL | DESKTOP_JOURNALRECORD | \ + DESKTOP_JOURNALPLAYBACK | DESKTOP_ENUMERATE | DESKTOP_WRITEOBJECTS | \ + DESKTOP_SWITCHDESKTOP | STANDARD_RIGHTS_REQUIRED) + +#define DESKTOP_ADMINS_LIMITED (DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS | \ + DESKTOP_CREATEWINDOW | DESKTOP_CREATEMENU | DESKTOP_ENUMERATE) + +#define DESKTOP_INTERACTIVE_LIMITED (STANDARD_RIGHTS_READ | DESKTOP_ENUMERATE | \ + DESKTOP_READOBJECTS | DESKTOP_CREATEWINDOW) + +#define DESKTOP_WINLOGON_ADMINS_LIMITED (STANDARD_RIGHTS_REQUIRED | DESKTOP_ENUMERATE) + +#define WINSTA_ALL (WINSTA_ENUMDESKTOPS | WINSTA_READATTRIBUTES | \ + WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | \ + WINSTA_WRITEATTRIBUTES | WINSTA_ACCESSGLOBALATOMS | \ + WINSTA_EXITWINDOWS | WINSTA_ENUMERATE | WINSTA_READSCREEN | \ + STANDARD_RIGHTS_REQUIRED) + +#define WINSTA_ADMINS_LIMITED (WINSTA_READATTRIBUTES | WINSTA_ENUMERATE) + +#define GENERIC_ACCESS (GENERIC_READ | GENERIC_WRITE | \ + GENERIC_EXECUTE | GENERIC_ALL) + +/* GLOBALS ******************************************************************/ + +static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + +/* FUNCTIONS ****************************************************************/ + +/** + * @brief + * Converts an absolute security descriptor to a self-relative + * format. + * + * @param[in] AbsoluteSd + * A pointer to an absolute security descriptor to be + * converted. + * + * @return + * Returns a pointer to a converted security descriptor in + * self-relative format. If the function fails, NULL is returned + * otherwise. + * + * @remarks + * The function allocates the security descriptor buffer in memory + * heap, the caller is entirely responsible for freeing such buffer + * from when it's no longer needed. + */ +PSECURITY_DESCRIPTOR +ConvertToSelfRelative( + _In_ PSECURITY_DESCRIPTOR AbsoluteSd) +{ + PSECURITY_DESCRIPTOR RelativeSd; + DWORD DescriptorLength = 0; + + /* Determine the size for our buffer to allocate */ + if (!MakeSelfRelativeSD(AbsoluteSd, NULL, &DescriptorLength) && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + ERR("ConvertToSelfRelative(): Unexpected error code (error code %lu -- must be ERROR_INSUFFICIENT_BUFFER)\n", GetLastError()); + return NULL; + } + + /* Allocate the buffer now */ + RelativeSd = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DescriptorLength); + if (RelativeSd == NULL) + { + ERR("ConvertToSelfRelative(): Failed to allocate buffer for relative SD!\n"); + return NULL; + } + + /* Convert the security descriptor now */ + if (!MakeSelfRelativeSD(AbsoluteSd, RelativeSd, &DescriptorLength)) + { + ERR("ConvertToSelfRelative(): Failed to convert the security descriptor to a self relative format (error code %lu)\n", GetLastError()); + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + return NULL; + } + + return RelativeSd; +} + +/** + * @brief + * Creates a security descriptor for the default + * window station upon its creation. + * + * @param[out] WinstaSd + * A pointer to a created security descriptor for + * the window station. + * + * @return + * Returns TRUE if the function has successfully + * created the security descriptor, FALSE otherwise. + */ +BOOL +CreateWinstaSecurity( + _Out_ PSECURITY_DESCRIPTOR *WinstaSd) +{ + BOOL Success = FALSE; + SECURITY_DESCRIPTOR AbsoluteSd; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + PSID WinlogonSid = NULL, AdminsSid = NULL; + DWORD DaclSize; + PACL Dacl; + + /* Create the Winlogon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, 0, 0, 0, 0, 0, 0, + &WinlogonSid)) + { + ERR("CreateWinstaSecurity(): Failed to create the Winlogon SID (error code %lu)\n", GetLastError()); + return FALSE; + } + + /* Create the admins SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid)) + { + ERR("CreateWinstaSecurity(): Failed to create the admins SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* + * Build up the DACL size. This includes a number + * of four ACEs of two different SIDs. The first two + * ACEs give both window station and generic access + * to Winlogon, the last two give limited window station + * and desktop access to admins. + */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(WinlogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(WinlogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(AdminsSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(AdminsSid); + + /* Allocate the DACL now */ + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + ERR("CreateWinstaSecurity(): Failed to allocate memory buffer for DACL!\n"); + goto Quit; + } + + /* Initialize it */ + if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION)) + { + ERR("CreateWinstaSecurity(): Failed to initialize DACL (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* First ACE -- give full winsta access to Winlogon */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + NO_PROPAGATE_INHERIT_ACE, + WINSTA_ALL, + WinlogonSid)) + { + ERR("CreateWinstaSecurity(): Failed to set ACE for Winlogon (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Second ACE -- give full generic access to Winlogon */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE, + GENERIC_ACCESS, + WinlogonSid)) + { + ERR("CreateWinstaSecurity(): Failed to set ACE for Winlogon (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Third ACE -- give limited winsta access to admins */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + NO_PROPAGATE_INHERIT_ACE, + WINSTA_ADMINS_LIMITED, + AdminsSid)) + { + ERR("CreateWinstaSecurity(): Failed to set ACE for admins (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Fourth ACE -- give limited desktop access to admins */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE, + DESKTOP_ADMINS_LIMITED, + AdminsSid)) + { + ERR("CreateWinstaSecurity(): Failed to set ACE for admins (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Initialize the security descriptor */ + if (!InitializeSecurityDescriptor(&AbsoluteSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("CreateWinstaSecurity(): Failed to initialize absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Set the DACL to the descriptor */ + if (!SetSecurityDescriptorDacl(&AbsoluteSd, TRUE, Dacl, FALSE)) + { + ERR("CreateWinstaSecurity(): Failed to set up DACL to absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Convert it to self-relative format */ + RelativeSd = ConvertToSelfRelative(&AbsoluteSd); + if (RelativeSd == NULL) + { + ERR("CreateWinstaSecurity(): Failed to convert security descriptor to self relative format!\n"); + goto Quit; + } + + /* Give the descriptor to the caller */ + *WinstaSd = RelativeSd; + Success = TRUE; + +Quit: + if (WinlogonSid != NULL) + { + FreeSid(WinlogonSid); + } + + if (AdminsSid != NULL) + { + FreeSid(AdminsSid); + } + + if (Dacl != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (Success == FALSE) + { + if (RelativeSd != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + } + } + + return Success; +} + +/** + * @brief + * Creates a security descriptor for the default + * application desktop upon its creation. + * + * @param[out] ApplicationDesktopSd + * A pointer to a created security descriptor for + * the application desktop. + * + * @return + * Returns TRUE if the function has successfully + * created the security descriptor, FALSE otherwise. + */ +BOOL +CreateApplicationDesktopSecurity( + _Out_ PSECURITY_DESCRIPTOR *ApplicationDesktopSd) +{ + BOOL Success = FALSE; + SECURITY_DESCRIPTOR AbsoluteSd; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + PSID WinlogonSid = NULL, AdminsSid = NULL; + DWORD DaclSize; + PACL Dacl; + + /* Create the Winlogon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, 0, 0, 0, 0, 0, 0, + &WinlogonSid)) + { + ERR("CreateApplicationDesktopSecurity(): Failed to create the Winlogon SID (error code %lu)\n", GetLastError()); + return FALSE; + } + + /* Create the admins SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid)) + { + ERR("CreateApplicationDesktopSecurity(): Failed to create the admins SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* + * Build up the DACL size. This includes a number + * of two ACEs of two different SIDs. The first ACE + * gives full access to Winlogon, the last one gives + * limited desktop access to admins. + */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(WinlogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(AdminsSid); + + /* Allocate the DACL now */ + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + ERR("CreateApplicationDesktopSecurity(): Failed to allocate memory buffer for DACL!\n"); + goto Quit; + } + + /* Initialize it */ + if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION)) + { + ERR("CreateApplicationDesktopSecurity(): Failed to initialize DACL (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* First ACE -- Give full desktop power to Winlogon */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_ALL, + WinlogonSid)) + { + ERR("CreateApplicationDesktopSecurity(): Failed to set ACE for Winlogon (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Second ACE -- Give limited desktop power to admins */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_ADMINS_LIMITED, + AdminsSid)) + { + ERR("CreateApplicationDesktopSecurity(): Failed to set ACE for admins (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Initialize the security descriptor */ + if (!InitializeSecurityDescriptor(&AbsoluteSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("CreateApplicationDesktopSecurity(): Failed to initialize absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Set the DACL to the descriptor */ + if (!SetSecurityDescriptorDacl(&AbsoluteSd, TRUE, Dacl, FALSE)) + { + ERR("CreateApplicationDesktopSecurity(): Failed to set up DACL to absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Conver it to self-relative format */ + RelativeSd = ConvertToSelfRelative(&AbsoluteSd); + if (RelativeSd == NULL) + { + ERR("CreateApplicationDesktopSecurity(): Failed to convert security descriptor to self relative format!\n"); + goto Quit; + } + + /* Give the descriptor to the caller */ + *ApplicationDesktopSd = RelativeSd; + Success = TRUE; + +Quit: + if (WinlogonSid != NULL) + { + FreeSid(WinlogonSid); + } + + if (AdminsSid != NULL) + { + FreeSid(AdminsSid); + } + + if (Dacl != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (Success == FALSE) + { + if (RelativeSd != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + } + } + + return Success; +} + +/** + * @brief + * Creates a security descriptor for the default + * Winlogon desktop. This descriptor serves as a + * security measure for the winlogon desktop so + * that only Winlogon itself (and admins) can + * interact with it. + * + * @param[out] WinlogonDesktopSd + * A pointer to a created security descriptor for + * the Winlogon desktop. + * + * @return + * Returns TRUE if the function has successfully + * created the security descriptor, FALSE otherwise. + */ +BOOL +CreateWinlogonDesktopSecurity( + _Out_ PSECURITY_DESCRIPTOR *WinlogonDesktopSd) +{ + BOOL Success = FALSE; + SECURITY_DESCRIPTOR AbsoluteSd; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + PSID WinlogonSid = NULL, AdminsSid = NULL; + DWORD DaclSize; + PACL Dacl; + + /* Create the Winlogon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, 0, 0, 0, 0, 0, 0, + &WinlogonSid)) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to create the Winlogon SID (error code %lu)\n", GetLastError()); + return FALSE; + } + + /* Create the admins SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid)) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to create the admins SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* + * Build up the DACL size. This includes a number + * of two ACEs of two different SIDs. The first ACE + * gives full access to Winlogon, the last one gives + * limited desktop access to admins. + */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(WinlogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(AdminsSid); + + /* Allocate the DACL now */ + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to allocate memory buffer for DACL!\n"); + goto Quit; + } + + /* Initialize it */ + if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION)) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to initialize DACL (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* First ACE -- Give full desktop access to Winlogon */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_ALL, + WinlogonSid)) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to set ACE for Winlogon (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Second ACE -- Give limited desktop access to admins */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_WINLOGON_ADMINS_LIMITED, + AdminsSid)) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to set ACE for admins (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Initialize the security descriptor */ + if (!InitializeSecurityDescriptor(&AbsoluteSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to initialize absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Set the DACL to the descriptor */ + if (!SetSecurityDescriptorDacl(&AbsoluteSd, TRUE, Dacl, FALSE)) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to set up DACL to absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Conver it to self-relative format */ + RelativeSd = ConvertToSelfRelative(&AbsoluteSd); + if (RelativeSd == NULL) + { + ERR("CreateWinlogonDesktopSecurity(): Failed to convert security descriptor to self relative format!\n"); + goto Quit; + } + + /* Give the descriptor to the caller */ + *WinlogonDesktopSd = RelativeSd; + Success = TRUE; + +Quit: + if (WinlogonSid != NULL) + { + FreeSid(WinlogonSid); + } + + if (AdminsSid != NULL) + { + FreeSid(AdminsSid); + } + + if (Dacl != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (Success == FALSE) + { + if (RelativeSd != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + } + } + + return Success; +} + +/** + * @brief + * Creates a security descriptor for the screen + * saver desktop. + * + * @param[out] ScreenSaverDesktopSd + * A pointer to a created security descriptor for + * the screen-saver desktop. + * + * @return + * Returns TRUE if the function has successfully + * created the security descriptor, FALSE otherwise. + */ +BOOL +CreateScreenSaverSecurity( + _Out_ PSECURITY_DESCRIPTOR *ScreenSaverDesktopSd) +{ + BOOL Success = FALSE; + SECURITY_DESCRIPTOR AbsoluteSd; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + PSID WinlogonSid = NULL, AdminsSid = NULL, InteractiveSid = NULL; + DWORD DaclSize; + PACL Dacl; + + /* Create the Winlogon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, 0, 0, 0, 0, 0, 0, + &WinlogonSid)) + { + ERR("CreateScreenSaverSecurity(): Failed to create the Winlogon SID (error code %lu)\n", GetLastError()); + return FALSE; + } + + /* Create the admins SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid)) + { + ERR("CreateScreenSaverSecurity(): Failed to create the admins SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Create the interactive logon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_INTERACTIVE_RID, + 0, 0, 0, 0, 0, 0, 0, + &InteractiveSid)) + { + ERR("CreateScreenSaverSecurity(): Failed to create the interactive SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* + * Build up the DACL size. This includes a number + * of three ACEs of three different SIDs. The first ACE + * gives full access to Winlogon, the second one gives + * limited desktop access to admins and the last one + * gives full desktop access to users who have logged in + * interactively. + */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(WinlogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(AdminsSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(InteractiveSid); + + /* Allocate the DACL now */ + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + ERR("CreateScreenSaverSecurity(): Failed to allocate memory buffer for DACL!\n"); + goto Quit; + } + + /* Initialize it */ + if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION)) + { + ERR("CreateScreenSaverSecurity(): Failed to initialize DACL (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* First ACE -- Give full desktop access to Winlogon */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_ALL, + WinlogonSid)) + { + ERR("CreateScreenSaverSecurity(): Failed to set ACE for Winlogon (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Second ACE -- Give limited desktop access to admins */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + NO_PROPAGATE_INHERIT_ACE, + DESKTOP_ADMINS_LIMITED, + AdminsSid)) + { + ERR("CreateScreenSaverSecurity(): Failed to set ACE for admins (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Third ACE -- Give full desktop access to interactive logon users */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + NO_PROPAGATE_INHERIT_ACE, + DESKTOP_INTERACTIVE_LIMITED, + InteractiveSid)) + { + ERR("CreateScreenSaverSecurity(): Failed to set ACE for interactive SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Initialize the security descriptor */ + if (!InitializeSecurityDescriptor(&AbsoluteSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("CreateScreenSaverSecurity(): Failed to initialize absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Set the DACL to the descriptor */ + if (!SetSecurityDescriptorDacl(&AbsoluteSd, TRUE, Dacl, FALSE)) + { + ERR("CreateScreenSaverSecurity(): Failed to set up DACL to absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Conver it to self-relative format */ + RelativeSd = ConvertToSelfRelative(&AbsoluteSd); + if (RelativeSd == NULL) + { + ERR("CreateScreenSaverSecurity(): Failed to convert security descriptor to self relative format!\n"); + goto Quit; + } + + /* Give the descriptor to the caller */ + *ScreenSaverDesktopSd = RelativeSd; + Success = TRUE; + +Quit: + if (WinlogonSid != NULL) + { + FreeSid(WinlogonSid); + } + + if (AdminsSid != NULL) + { + FreeSid(AdminsSid); + } + + if (InteractiveSid != NULL) + { + FreeSid(InteractiveSid); + } + + if (Dacl != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (Success == FALSE) + { + if (RelativeSd != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + } + } + + return Success; +} + +/** + * @brief + * Assigns access to the specific logon user to + * the default window station. Such access is + * given to the user when it has logged in. + * + * @param[in] WinSta + * A handle to a window station where the + * user is given access to it. + * + * @param[in] LogonSid + * A pointer to a logon SID that represents + * the logged in user in question. + * + * @return + * Returns TRUE if the function has successfully + * assigned access to the user, FALSE otherwise. + */ +BOOL +AllowWinstaAccessToUser( + _In_ HWINSTA WinSta, + _In_ PSID LogonSid) +{ + BOOL Success = FALSE; + SECURITY_DESCRIPTOR AbsoluteSd; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + PSID WinlogonSid = NULL, AdminsSid = NULL, InteractiveSid = NULL; + SECURITY_INFORMATION SecurityInformation; + DWORD DaclSize; + PACL Dacl; + + /* Create the Winlogon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, 0, 0, 0, 0, 0, 0, + &WinlogonSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to create the Winlogon SID (error code %lu)\n", GetLastError()); + return FALSE; + } + + /* Create the admins SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to create the admins SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Create the interactive logon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_INTERACTIVE_RID, + 0, 0, 0, 0, 0, 0, 0, + &InteractiveSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to create the interactive SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* + * Build up the DACL size. This includes a number + * of eight ACEs of four different SIDs. The first ACE + * gives full winsta access to Winlogon, the second one gives + * generic access to Winlogon. Such approach is the same + * for both interactive logon users and logon user as well. + * Only admins are given limited powers. + */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(WinlogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(WinlogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(AdminsSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(AdminsSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(InteractiveSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(InteractiveSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(LogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(LogonSid); + + /* Allocate the DACL now */ + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + ERR("AllowWinstaAccessToUser(): Failed to allocate memory buffer for DACL!\n"); + goto Quit; + } + + /* Initialize it */ + if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION)) + { + ERR("AllowWinstaAccessToUser(): Failed to initialize DACL (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* First ACE -- Give full winsta access to Winlogon */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + NO_PROPAGATE_INHERIT_ACE, + WINSTA_ALL, + WinlogonSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to set ACE for Winlogon (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Second ACE -- Give generic access to Winlogon */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE, + GENERIC_ACCESS, + WinlogonSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to set ACE for Winlogon (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Third ACE -- Give limited winsta access to admins */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + NO_PROPAGATE_INHERIT_ACE, + WINSTA_ADMINS_LIMITED, + AdminsSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to set ACE for admins (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Fourth ACE -- Give limited desktop access to admins */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE, + DESKTOP_ADMINS_LIMITED, + AdminsSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to set ACE for admins (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Fifth ACE -- Give full winsta access to interactive logon users */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + NO_PROPAGATE_INHERIT_ACE, + WINSTA_ALL, + InteractiveSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to set ACE for interactive SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Sixth ACE -- Give generic access to interactive logon users */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE, + GENERIC_ACCESS, + InteractiveSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to set ACE for interactive SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Seventh ACE -- Give full winsta access to logon user */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + NO_PROPAGATE_INHERIT_ACE, + WINSTA_ALL, + LogonSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to set ACE for logon user SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Eighth ACE -- Give generic access to logon user */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE, + GENERIC_ACCESS, + LogonSid)) + { + ERR("AllowWinstaAccessToUser(): Failed to set ACE for logon user SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Initialize the security descriptor */ + if (!InitializeSecurityDescriptor(&AbsoluteSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("AllowWinstaAccessToUser(): Failed to initialize absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Set the DACL to descriptor */ + if (!SetSecurityDescriptorDacl(&AbsoluteSd, TRUE, Dacl, FALSE)) + { + ERR("AllowWinstaAccessToUser(): Failed to set up DACL to absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Convert it to self-relative format */ + RelativeSd = ConvertToSelfRelative(&AbsoluteSd); + if (RelativeSd == NULL) + { + ERR("AllowWinstaAccessToUser(): Failed to convert security descriptor to self relative format!\n"); + goto Quit; + } + + /* Set new winsta security based on this descriptor */ + SecurityInformation = DACL_SECURITY_INFORMATION; + if (!SetUserObjectSecurity(WinSta, &SecurityInformation, RelativeSd)) + { + ERR("AllowWinstaAccessToUser(): Failed to set window station security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + Success = TRUE; + +Quit: + if (WinlogonSid != NULL) + { + FreeSid(WinlogonSid); + } + + if (AdminsSid != NULL) + { + FreeSid(AdminsSid); + } + + if (InteractiveSid != NULL) + { + FreeSid(InteractiveSid); + } + + if (Dacl != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (RelativeSd != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + } + + return Success; +} + +/** + * @brief + * Assigns access to the specific logon user to + * the default desktop. Such access is given to + * the user when it has logged in. + * + * @param[in] Desktop + * A handle to a desktop where the user + * is given access to it. + * + * @param[in] LogonSid + * A pointer to a logon SID that represents + * the logged in user in question. + * + * @return + * Returns TRUE if the function has successfully + * assigned access to the user, FALSE otherwise. + */ +BOOL +AllowDesktopAccessToUser( + _In_ HDESK Desktop, + _In_ PSID LogonSid) +{ + BOOL Success = FALSE; + SECURITY_DESCRIPTOR AbsoluteSd; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + PSID WinlogonSid = NULL, AdminsSid = NULL, InteractiveSid = NULL; + SECURITY_INFORMATION SecurityInformation; + DWORD DaclSize; + PACL Dacl; + + /* Create the Winlogon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, 0, 0, 0, 0, 0, 0, + &WinlogonSid)) + { + ERR("AllowDesktopAccessToUser(): Failed to create the Winlogon SID (error code %lu)\n", GetLastError()); + return FALSE; + } + + /* Create the admins SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid)) + { + ERR("AllowDesktopAccessToUser(): Failed to create the admins SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Create the interactive logon SID */ + if (!AllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_INTERACTIVE_RID, + 0, 0, 0, 0, 0, 0, 0, + &InteractiveSid)) + { + ERR("AllowDesktopAccessToUser(): Failed to create the interactive SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* + * Build up the DACL size. This includes a number + * of four ACEs of four different SIDs. The first ACE + * gives full desktop access to Winlogon, the second one gives + * generic limited desktop access to admins. The last two give + * full power to both interactive logon users and logon user as + * well. + */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(WinlogonSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(AdminsSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(InteractiveSid) + + sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + GetLengthSid(LogonSid); + + /* Allocate the DACL now */ + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + ERR("AllowDesktopAccessToUser(): Failed to allocate memory buffer for DACL!\n"); + goto Quit; + } + + /* Initialize it */ + if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION)) + { + ERR("AllowDesktopAccessToUser(): Failed to initialize DACL (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* First ACE -- Give full desktop access to Winlogon */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_ALL, + WinlogonSid)) + { + ERR("AllowDesktopAccessToUser(): Failed to set ACE for Winlogon (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Second ACE -- Give limited desktop access to admins */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_ADMINS_LIMITED, + AdminsSid)) + { + ERR("AllowDesktopAccessToUser(): Failed to set ACE for admins (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Third ACE -- Give full desktop access to interactive logon users */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_ALL, + InteractiveSid)) + { + ERR("AllowDesktopAccessToUser(): Failed to set ACE for interactive SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Fourth ACE -- Give full desktop access to logon user */ + if (!AddAccessAllowedAceEx(Dacl, + ACL_REVISION, + 0, + DESKTOP_ALL, + LogonSid)) + { + ERR("AllowDesktopAccessToUser(): Failed to set ACE for logon user SID (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Initialize the security descriptor */ + if (!InitializeSecurityDescriptor(&AbsoluteSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("AllowDesktopAccessToUser(): Failed to initialize absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Set the DACL to the descriptor */ + if (!SetSecurityDescriptorDacl(&AbsoluteSd, TRUE, Dacl, FALSE)) + { + ERR("AllowDesktopAccessToUser(): Failed to set up DACL to absolute security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Conver it to self-relative format */ + RelativeSd = ConvertToSelfRelative(&AbsoluteSd); + if (RelativeSd == NULL) + { + ERR("AllowDesktopAccessToUser(): Failed to convert security descriptor to self relative format!\n"); + goto Quit; + } + + /* Assign new security to desktop based on this descriptor */ + SecurityInformation = DACL_SECURITY_INFORMATION; + if (!SetUserObjectSecurity(Desktop, &SecurityInformation, RelativeSd)) + { + ERR("AllowDesktopAccessToUser(): Failed to set desktop security descriptor (error code %lu)\n", GetLastError()); + goto Quit; + } + + Success = TRUE; + +Quit: + if (WinlogonSid != NULL) + { + FreeSid(WinlogonSid); + } + + if (AdminsSid != NULL) + { + FreeSid(AdminsSid); + } + + if (InteractiveSid != NULL) + { + FreeSid(InteractiveSid); + } + + if (Dacl != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (RelativeSd != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + } + + return Success; +} + +/** + * @brief + * Assigns both window station and desktop access + * to the specific session currently active on the + * system. + * + * @param[in] Session + * A pointer to an active session. + * + * @return + * Returns TRUE if the function has successfully + * assigned access to the current session, FALSE otherwise. + */ +BOOL +AllowAccessOnSession( + _In_ PWLSESSION Session) +{ + BOOL Success = FALSE; + DWORD Index, SidLength, GroupsLength = 0; + PTOKEN_GROUPS TokenGroup = NULL; + PSID LogonSid; + + /* Get required buffer size and allocate the TOKEN_GROUPS buffer */ + if (!GetTokenInformation(Session->UserToken, + TokenGroups, + TokenGroup, + 0, + &GroupsLength)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + ERR("AllowAccessOnSession(): Unexpected error code returned, must be ERROR_INSUFFICIENT_BUFFER (error code %lu)\n", GetLastError()); + return FALSE; + } + + TokenGroup = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, GroupsLength); + if (TokenGroup == NULL) + { + ERR("AllowAccessOnSession(): Failed to allocate memory buffer for token group!\n"); + return FALSE; + } + } + + /* Get the token group information from the access token */ + if (!GetTokenInformation(Session->UserToken, + TokenGroups, + TokenGroup, + GroupsLength, + &GroupsLength)) + { + ERR("AllowAccessOnSession(): Failed to retrieve the token group information (error code %lu)\n", GetLastError()); + goto Quit; + } + + /* Loop through the groups to find the logon SID */ + for (Index = 0; Index < TokenGroup->GroupCount; Index++) + { + if ((TokenGroup->Groups[Index].Attributes & SE_GROUP_LOGON_ID) + == SE_GROUP_LOGON_ID) + { + LogonSid = TokenGroup->Groups[Index].Sid; + break; + } + } + + /* Allow window station access to this user within this session */ + if (!AllowWinstaAccessToUser(Session->InteractiveWindowStation, LogonSid)) + { + ERR("AllowAccessOnSession(): Failed to allow winsta access to the logon user!\n"); + goto Quit; + } + +/* + * FIXME: Desktop security management is broken. The application desktop gets created + * with CreateDesktopW() API call with an initial and defined security descriptor for it yet + * when we are giving access to the logged in user, SetUserObjectSecurity() API call fails to set + * new security because the desktop in question has no prior security descriptor (when it's + * been assigned even before!!!). This chunk of code must be enabled when this gets fixed. + */ +#if 0 + /* Allow application desktop access to this user within this session */ + if (!AllowDesktopAccessToUser(Session->ApplicationDesktop, LogonSid)) + { + ERR("AllowAccessOnSession(): Failed to allow application desktop access to the logon user!\n"); + goto Quit; + } +#endif + + /* Get the length of this logon SID */ + SidLength = GetLengthSid(LogonSid); + + /* Assign the window station to this logged in user */ + if (!SetWindowStationUser(Session->InteractiveWindowStation, + &Session->LogonId, + LogonSid, + SidLength)) + { + ERR("AllowAccessOnSession(): Failed to assign the window station to the logon user!\n"); + goto Quit; + } + + Success = TRUE; + +Quit: + if (TokenGroup != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, TokenGroup); + } + + return Success; +} + +/* EOF */ diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index 07f803a20d8..668fd3e0ad2 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -320,6 +320,41 @@ InitializeScreenSaver(IN OUT PWLSESSION Session); VOID StartScreenSaver(IN PWLSESSION Session); +/* security.c */ +PSECURITY_DESCRIPTOR +ConvertToSelfRelative( + _In_ PSECURITY_DESCRIPTOR AbsoluteSd); + +BOOL +CreateWinstaSecurity( + _Out_ PSECURITY_DESCRIPTOR *WinstaSd); + +BOOL +CreateApplicationDesktopSecurity( + _Out_ PSECURITY_DESCRIPTOR *ApplicationDesktopSd); + +BOOL +CreateWinlogonDesktopSecurity( + _Out_ PSECURITY_DESCRIPTOR *WinlogonDesktopSd); + +BOOL +CreateScreenSaverSecurity( + _Out_ PSECURITY_DESCRIPTOR *ScreenSaverDesktopSd); + +BOOL +AllowWinstaAccessToUser( + _In_ HWINSTA WinSta, + _In_ PSID LogonSid); + +BOOL +AllowDesktopAccessToUser( + _In_ HDESK Desktop, + _In_ PSID LogonSid); + +BOOL +AllowAccessOnSession( + _In_ PWLSESSION Session); + /* setup.c */ DWORD GetSetupType(VOID); @@ -364,12 +399,8 @@ BOOL GinaInit(IN OUT PWLSESSION Session); BOOL -AddAceToWindowStation( - IN HWINSTA WinSta, - IN PSID Sid); - -BOOL -CreateWindowStationAndDesktops(IN OUT PWLSESSION Session); +CreateWindowStationAndDesktops( + _Inout_ PWLSESSION Session); VOID WINAPI WlxUseCtrlAltDel(HANDLE hWlx); diff --git a/base/system/winlogon/wlx.c b/base/system/winlogon/wlx.c index 89289c08a99..5b719e0c70f 100644 --- a/base/system/winlogon/wlx.c +++ b/base/system/winlogon/wlx.c @@ -12,20 +12,6 @@ #include "winlogon.h" -#define DESKTOP_ALL (DESKTOP_READOBJECTS | DESKTOP_CREATEWINDOW | \ - DESKTOP_CREATEMENU | DESKTOP_HOOKCONTROL | DESKTOP_JOURNALRECORD | \ - DESKTOP_JOURNALPLAYBACK | DESKTOP_ENUMERATE | DESKTOP_WRITEOBJECTS | \ - DESKTOP_SWITCHDESKTOP | STANDARD_RIGHTS_REQUIRED) - -#define WINSTA_ALL (WINSTA_ENUMDESKTOPS | WINSTA_READATTRIBUTES | \ - WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | \ - WINSTA_WRITEATTRIBUTES | WINSTA_ACCESSGLOBALATOMS | \ - WINSTA_EXITWINDOWS | WINSTA_ENUMERATE | WINSTA_READSCREEN | \ - STANDARD_RIGHTS_REQUIRED) - -#define GENERIC_ACCESS (GENERIC_READ | GENERIC_WRITE | \ - GENERIC_EXECUTE | GENERIC_ALL) - typedef struct _DIALOG_LIST_ENTRY { LIST_ENTRY Entry; @@ -938,293 +924,59 @@ GinaInit( &Session->Gina.Context); } -BOOL -AddAceToWindowStation( - IN HWINSTA WinSta, - IN PSID Sid) -{ - DWORD AclSize; - SECURITY_INFORMATION SecurityInformation; - PACL pDefaultAcl = NULL; - PSECURITY_DESCRIPTOR WinstaSd = NULL; - PACCESS_ALLOWED_ACE Ace = NULL; - BOOL Ret = FALSE; - - /* Allocate space for an ACL */ - AclSize = sizeof(ACL) - + 2 * (FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(Sid)); - pDefaultAcl = HeapAlloc(GetProcessHeap(), 0, AclSize); - if (!pDefaultAcl) - { - ERR("WL: HeapAlloc() failed\n"); - goto cleanup; - } - - /* Initialize it */ - if (!InitializeAcl(pDefaultAcl, AclSize, ACL_REVISION)) - { - ERR("WL: InitializeAcl() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Initialize new security descriptor */ - WinstaSd = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); - if (!InitializeSecurityDescriptor(WinstaSd, SECURITY_DESCRIPTOR_REVISION)) - { - ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Allocate memory for access allowed ACE */ - Ace = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACCESS_ALLOWED_ACE)+ - GetLengthSid(Sid) - sizeof(DWORD)); - - /* Create the first ACE for the window station */ - Ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; - Ace->Header.AceFlags = CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE; - Ace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(Sid) - sizeof(DWORD); - Ace->Mask = GENERIC_ACCESS; - - /* Copy the sid */ - if (!CopySid(GetLengthSid(Sid), &Ace->SidStart, Sid)) - { - ERR("WL: CopySid() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Add the first ACE */ - if (!AddAce(pDefaultAcl, ACL_REVISION, MAXDWORD, (LPVOID)Ace, Ace->Header.AceSize)) - { - ERR("WL: AddAce() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Add the second ACE to the end of ACL */ - Ace->Header.AceFlags = NO_PROPAGATE_INHERIT_ACE; - Ace->Mask = WINSTA_ALL; - if (!AddAce(pDefaultAcl, ACL_REVISION, MAXDWORD, (LPVOID)Ace, Ace->Header.AceSize)) - { - ERR("WL: AddAce() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Add ACL to winsta's security descriptor */ - if (!SetSecurityDescriptorDacl(WinstaSd, TRUE, pDefaultAcl, FALSE)) - { - ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Apply security to the window station */ - SecurityInformation = DACL_SECURITY_INFORMATION; - if (!SetUserObjectSecurity(WinSta, &SecurityInformation, WinstaSd)) - { - ERR("WL: SetUserObjectSecurity() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Indicate success */ - Ret = TRUE; - -cleanup: - /* Free allocated stuff */ - if (pDefaultAcl) HeapFree(GetProcessHeap(), 0, pDefaultAcl); - if (WinstaSd) HeapFree(GetProcessHeap(), 0, WinstaSd); - if (Ace) HeapFree(GetProcessHeap(), 0, Ace); - - return Ret; -} - -BOOL -AddAceToDesktop( - IN HDESK Desktop, - IN PSID WinlogonSid, - IN PSID UserSid) -{ - DWORD AclSize; - SECURITY_INFORMATION SecurityInformation; - PACL Acl = NULL; - PSECURITY_DESCRIPTOR DesktopSd = NULL; - BOOL Ret = FALSE; - - /* Allocate ACL */ - AclSize = sizeof(ACL) - + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(WinlogonSid); - - /* Take user's sid into account */ - if (UserSid) - AclSize += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(UserSid); - - Acl = HeapAlloc(GetProcessHeap(), 0, AclSize); - if (!Acl) - { - ERR("WL: HeapAlloc() failed\n"); - goto cleanup; - } - - /* Initialize ACL */ - if (!InitializeAcl(Acl, AclSize, ACL_REVISION)) - { - ERR("WL: InitializeAcl() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Add full desktop access ACE for winlogon */ - if (!AddAccessAllowedAce(Acl, ACL_REVISION, DESKTOP_ALL, WinlogonSid)) - { - ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Add full desktop access ACE for a user (if provided) */ - if (UserSid && !AddAccessAllowedAce(Acl, ACL_REVISION, DESKTOP_ALL, UserSid)) - { - ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Initialize new security descriptor */ - DesktopSd = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); - if (!InitializeSecurityDescriptor(DesktopSd, SECURITY_DESCRIPTOR_REVISION)) - { - ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Add ACL to the security descriptor */ - if (!SetSecurityDescriptorDacl(DesktopSd, TRUE, Acl, FALSE)) - { - ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Apply security to the window station */ - SecurityInformation = DACL_SECURITY_INFORMATION; - if (!SetUserObjectSecurity(Desktop, &SecurityInformation, DesktopSd)) - { - ERR("WL: SetUserObjectSecurity() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - /* Indicate success */ - Ret = TRUE; - -cleanup: - /* Free allocated stuff */ - if (Acl) HeapFree(GetProcessHeap(), 0, Acl); - if (DesktopSd) HeapFree(GetProcessHeap(), 0, DesktopSd); - - return Ret; -} - BOOL CreateWindowStationAndDesktops( - IN OUT PWLSESSION Session) + _Inout_ PWLSESSION Session) { - BYTE LocalSystemBuffer[SECURITY_MAX_SID_SIZE]; - BYTE InteractiveBuffer[SECURITY_MAX_SID_SIZE]; - PSID pLocalSystemSid = (PSID)&LocalSystemBuffer; - PSID pInteractiveSid = (PSID)InteractiveBuffer; - DWORD SidSize, AclSize; - PACL pDefaultAcl = NULL; - PACL pUserDesktopAcl = NULL; - SECURITY_DESCRIPTOR DefaultSecurityDescriptor; - SECURITY_ATTRIBUTES DefaultSecurity; - SECURITY_DESCRIPTOR UserDesktopSecurityDescriptor; - SECURITY_ATTRIBUTES UserDesktopSecurity; + SECURITY_ATTRIBUTES WinstaSecurity; + SECURITY_ATTRIBUTES ApplicationDesktopSecurity; + SECURITY_ATTRIBUTES WinlogonDesktopSecurity; + SECURITY_ATTRIBUTES ScreenSaverDesktopSecurity; + PSECURITY_DESCRIPTOR WlWinstaSecurityDescriptor; + PSECURITY_DESCRIPTOR WlApplicationDesktopSecurityDescriptor; + PSECURITY_DESCRIPTOR WlWinlogonDesktopSecurityDescriptor; + PSECURITY_DESCRIPTOR WlScreenSaverDesktopSecurityDescriptor; BOOL ret = FALSE; - /* - * Prepare information for ACLs we will apply - */ - SidSize = SECURITY_MAX_SID_SIZE; - if (!CreateWellKnownSid(WinLocalSystemSid, NULL, pLocalSystemSid, &SidSize)) - { - ERR("WL: CreateWellKnownSid() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - SidSize = SECURITY_MAX_SID_SIZE; - if (!CreateWellKnownSid(WinInteractiveSid, NULL, pInteractiveSid, &SidSize)) - { - ERR("WL: CreateWellKnownSid() failed (error %lu)\n", GetLastError()); - goto cleanup; - } - - AclSize = sizeof(ACL) - + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(pLocalSystemSid) - + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(pInteractiveSid); - pDefaultAcl = HeapAlloc(GetProcessHeap(), 0, AclSize); - pUserDesktopAcl = HeapAlloc(GetProcessHeap(), 0, AclSize); - if (!pDefaultAcl || !pUserDesktopAcl) - { - ERR("WL: HeapAlloc() failed\n"); - goto cleanup; - } - - if (!InitializeAcl(pDefaultAcl, AclSize, ACL_REVISION) - || !InitializeAcl(pUserDesktopAcl, AclSize, ACL_REVISION)) + if (!CreateWinstaSecurity(&WlWinstaSecurityDescriptor)) { - ERR("WL: InitializeAcl() failed (error %lu)\n", GetLastError()); - goto cleanup; + ERR("WL: Failed to create winsta security!\n"); + return ret; } - /* - * Create default ACL (window station, winlogon desktop, screen saver desktop) - */ - if (!AddAccessAllowedAce(pDefaultAcl, ACL_REVISION, GENERIC_ALL, pLocalSystemSid) - || !AddAccessAllowedAce(pDefaultAcl, ACL_REVISION, GENERIC_READ, pInteractiveSid)) - { - ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); - goto cleanup; - } + WinstaSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); + WinstaSecurity.lpSecurityDescriptor = WlWinstaSecurityDescriptor; + WinstaSecurity.bInheritHandle = TRUE; - /* - * Create the default security descriptor - */ - if (!InitializeSecurityDescriptor(&DefaultSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) + if (!CreateApplicationDesktopSecurity(&WlApplicationDesktopSecurityDescriptor)) { - ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); + ERR("WL: Failed to create application desktop security!\n"); goto cleanup; } - if (!SetSecurityDescriptorDacl(&DefaultSecurityDescriptor, TRUE, pDefaultAcl, FALSE)) - { - ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); - goto cleanup; - } + ApplicationDesktopSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); + ApplicationDesktopSecurity.lpSecurityDescriptor = WlApplicationDesktopSecurityDescriptor; + ApplicationDesktopSecurity.bInheritHandle = TRUE; - DefaultSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); - DefaultSecurity.lpSecurityDescriptor = &DefaultSecurityDescriptor; - DefaultSecurity.bInheritHandle = TRUE; - - /* - * Create user desktop ACL - */ - if (!AddAccessAllowedAce(pUserDesktopAcl, ACL_REVISION, GENERIC_ALL, pLocalSystemSid) - || !AddAccessAllowedAce(pUserDesktopAcl, ACL_REVISION, GENERIC_ALL, pInteractiveSid)) + if (!CreateWinlogonDesktopSecurity(&WlWinlogonDesktopSecurityDescriptor)) { - ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); + ERR("WL: Failed to create winlogon desktop security!\n"); goto cleanup; } - /* - * Create the user desktop security descriptor - */ - if (!InitializeSecurityDescriptor(&UserDesktopSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) - { - ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); - goto cleanup; - } + WinlogonDesktopSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); + WinlogonDesktopSecurity.lpSecurityDescriptor = WlWinlogonDesktopSecurityDescriptor; + WinlogonDesktopSecurity.bInheritHandle = FALSE; - if (!SetSecurityDescriptorDacl(&UserDesktopSecurityDescriptor, TRUE, pUserDesktopAcl, FALSE)) + if (!CreateScreenSaverSecurity(&WlScreenSaverDesktopSecurityDescriptor)) { - ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); + ERR("WL: Failed to create winlogon desktop security!\n"); goto cleanup; } - UserDesktopSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); - UserDesktopSecurity.lpSecurityDescriptor = &UserDesktopSecurityDescriptor; - UserDesktopSecurity.bInheritHandle = TRUE; + ScreenSaverDesktopSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); + ScreenSaverDesktopSecurity.lpSecurityDescriptor = WlScreenSaverDesktopSecurityDescriptor; + ScreenSaverDesktopSecurity.bInheritHandle = TRUE; /* * Create the interactive window station @@ -1234,12 +986,13 @@ CreateWindowStationAndDesktops( Session->InteractiveWindowStationName, 0, MAXIMUM_ALLOWED, - &DefaultSecurity); + &WinstaSecurity); if (!Session->InteractiveWindowStation) { ERR("WL: Failed to create window station (%lu)\n", GetLastError()); goto cleanup; } + if (!SetProcessWindowStation(Session->InteractiveWindowStation)) { ERR("WL: SetProcessWindowStation() failed (error %lu)\n", GetLastError()); @@ -1255,7 +1008,7 @@ CreateWindowStationAndDesktops( NULL, 0, /* FIXME: Add DF_ALLOWOTHERACCOUNTHOOK flag? */ MAXIMUM_ALLOWED, - &UserDesktopSecurity); + &ApplicationDesktopSecurity); if (!Session->ApplicationDesktop) { ERR("WL: Failed to create Default desktop (%lu)\n", GetLastError()); @@ -1271,7 +1024,7 @@ CreateWindowStationAndDesktops( NULL, 0, MAXIMUM_ALLOWED, - &DefaultSecurity); // FIXME: Must use restricted Winlogon-only security!! + &WinlogonDesktopSecurity); if (!Session->WinlogonDesktop) { ERR("WL: Failed to create Winlogon desktop (%lu)\n", GetLastError()); @@ -1287,7 +1040,7 @@ CreateWindowStationAndDesktops( NULL, 0, MAXIMUM_ALLOWED, - &DefaultSecurity); + &ScreenSaverDesktopSecurity); if(!Session->ScreenSaverDesktop) { ERR("WL: Failed to create Screen-Saver desktop (%lu)\n", GetLastError()); @@ -1332,8 +1085,23 @@ cleanup: CloseWindowStation(Session->InteractiveWindowStation); Session->InteractiveWindowStation = NULL; } + if (WlWinstaSecurityDescriptor) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, WlWinstaSecurityDescriptor); + } + if (WlApplicationDesktopSecurityDescriptor) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, WlApplicationDesktopSecurityDescriptor); + } + if (WlWinlogonDesktopSecurityDescriptor) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, WlWinlogonDesktopSecurityDescriptor); + } + if (WlScreenSaverDesktopSecurityDescriptor) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, WlScreenSaverDesktopSecurityDescriptor); + } } - HeapFree(GetProcessHeap(), 0, pDefaultAcl); - HeapFree(GetProcessHeap(), 0, pUserDesktopAcl); + return ret; }

2 years, 7 months

[reactos] 03/21: [USER32] Capture the security descriptor from the caller when creating a window station

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65a72fb527a2f8e0b5bef… commit 65a72fb527a2f8e0b5bef3aad8f46ebaa2a526fd Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Mar 27 20:01:19 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri May 6 10:09:48 2022 +0200 [USER32] Capture the security descriptor from the caller when creating a window station When creating a window station with CreateWindowStationW, the function ignores the security descriptor provided by the caller and instead it uses whatever descriptor the system can find. --- win32ss/user/user32/misc/winsta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/misc/winsta.c b/win32ss/user/user32/misc/winsta.c index 7308ad14619..111d7dec37a 100644 --- a/win32ss/user/user32/misc/winsta.c +++ b/win32ss/user/user32/misc/winsta.c @@ -104,7 +104,7 @@ CreateWindowStationW( lpwinsta ? &WindowStationName : NULL, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, hWindowStationsDir, - NULL); + lpsa ? lpsa->lpSecurityDescriptor : NULL); /* Check if the handle should be inheritable */ if (lpsa && lpsa->bInheritHandle)

2 years, 7 months

[reactos] 02/21: [WIN32K:NTUSER] Implement security infrastructure for NTUSER component

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=878c2f4444445c66aa8bb… commit 878c2f4444445c66aa8bb52b0baaf7f0f9c0d383 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Mar 16 21:03:56 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri May 6 10:09:48 2022 +0200 [WIN32K:NTUSER] Implement security infrastructure for NTUSER component Implement a base security infrastructure with code that sets up a security descriptor for the service that we're going to connect through it. Such service is based upon a desktop and a window station. === DOCUMENTATION REMARKS === The authenticated user, represented by an access token that describes its security context, is the main holder and has ultimate power against the default created desktop and window station objects in USER. The authenticated user in question is the actual logged in user, this is the case when the server is impersonating a client. Administrators on the other hand have some share of power against default desktop but their power in question is extremely limited against the default window station as admins can only just enumerate the available and valid handle stations within a desktop. --- win32ss/CMakeLists.txt | 1 + win32ss/gdi/ntgdi/gdidbg.c | 1 + win32ss/pch.h | 1 + win32ss/user/ntuser/desktop.c | 30 ++- win32ss/user/ntuser/desktop.h | 26 -- win32ss/user/ntuser/security.c | 493 ++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/security.h | 92 +++++++ win32ss/user/ntuser/win32kdebug.h | 1 + win32ss/user/ntuser/winsta.h | 27 +-- win32ss/win32kp.h | 1 + 10 files changed, 617 insertions(+), 56 deletions(-) diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt index a5efa7f9f16..0a7dd1492de 100644 --- a/win32ss/CMakeLists.txt +++ b/win32ss/CMakeLists.txt @@ -144,6 +144,7 @@ list(APPEND SOURCE user/ntuser/prop.c user/ntuser/scrollbar.c user/ntuser/scrollex.c + user/ntuser/security.c user/ntuser/session.c user/ntuser/shutdown.c user/ntuser/simplecall.c diff --git a/win32ss/gdi/ntgdi/gdidbg.c b/win32ss/gdi/ntgdi/gdidbg.c index 51de52670b8..2dbe30e69d5 100644 --- a/win32ss/gdi/ntgdi/gdidbg.c +++ b/win32ss/gdi/ntgdi/gdidbg.c @@ -87,6 +87,7 @@ DBG_CHANNEL DbgChannels[DbgChCount] = { {L"UserProcess", DbgChUserProcess}, {L"UserProp", DbgChUserProp}, {L"UserScrollbar", DbgChUserScrollbar}, + {L"UserSecurity", DbgChUserSecurity}, {L"UserShutdown", DbgChUserShutdown}, {L"UserSysparams", DbgChUserSysparams}, {L"UserTimer", DbgChUserTimer}, diff --git a/win32ss/pch.h b/win32ss/pch.h index 40fd8a7f861..60bdb37a8d6 100644 --- a/win32ss/pch.h +++ b/win32ss/pch.h @@ -25,6 +25,7 @@ #include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> +#include <ndk/sefuncs.h> #include <ndk/rtlfuncs.h> #include <ntstrsafe.h> #include <ntintsafe.h> diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 4b82da31ce9..fb8d6ed96cd 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -555,6 +555,7 @@ IntResolveDesktop( LUID ProcessLuid; USHORT StrSize; SIZE_T MemSize; + PSECURITY_DESCRIPTOR ServiceSD = NULL; POBJECT_ATTRIBUTES ObjectAttributes = NULL; PUNICODE_STRING ObjectName; UNICODE_STRING WinStaName, DesktopName; @@ -1012,16 +1013,29 @@ IntResolveDesktop( } ObjectName->Length = (USHORT)(wcslen(ObjectName->Buffer) * sizeof(WCHAR)); + /* + * Set up a security descriptor for the service. + * A service is generally based upon a desktop + * and a window station. The newly created window + * station and desktop will get this security descriptor + * if such objects weren't created before. + */ + Status = IntCreateServiceSecurity(&ServiceSD); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create a security descriptor for default window station, Status 0x%08lx\n", Status); + goto Quit; + } + /* * Create or open the non-interactive window station. * NOTE: The non-interactive window station handle is never inheritable. */ - // FIXME: Set security! InitializeObjectAttributes(ObjectAttributes, ObjectName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, NULL, - NULL); + ServiceSD); Status = IntCreateWindowStation(&hWinSta, ObjectAttributes, @@ -1054,8 +1068,11 @@ IntResolveDesktop( } ObjectName->Length = (USHORT)(wcslen(ObjectName->Buffer) * sizeof(WCHAR)); - /* NOTE: The non-interactive desktop handle is never inheritable. */ - // FIXME: Set security! + /* + * NOTE: The non-interactive desktop handle is never inheritable. + * The security descriptor is inherited from the newly created + * window station for the desktop. + */ InitializeObjectAttributes(ObjectAttributes, ObjectName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, @@ -1175,6 +1192,8 @@ Quit: { *phWinSta = hWinSta; *phDesktop = hDesktop; + + IntFreeSecurityBuffer(ServiceSD); return STATUS_SUCCESS; } else @@ -1191,6 +1210,9 @@ Quit: if (hWinSta) ObCloseHandle(hWinSta, UserMode); + if (ServiceSD) + IntFreeSecurityBuffer(ServiceSD); + SetLastNtError(Status); return Status; } diff --git a/win32ss/user/ntuser/desktop.h b/win32ss/user/ntuser/desktop.h index 5a7f4bca500..169cca1819e 100644 --- a/win32ss/user/ntuser/desktop.h +++ b/win32ss/user/ntuser/desktop.h @@ -55,32 +55,6 @@ typedef struct _DESKTOP #define DT_GWL_PROCESSID 0 #define DT_GWL_THREADID 4 -#define DESKTOP_READ STANDARD_RIGHTS_READ | \ - DESKTOP_ENUMERATE | \ - DESKTOP_READOBJECTS - -#define DESKTOP_WRITE STANDARD_RIGHTS_WRITE | \ - DESKTOP_CREATEMENU | \ - DESKTOP_CREATEWINDOW | \ - DESKTOP_HOOKCONTROL | \ - DESKTOP_JOURNALPLAYBACK | \ - DESKTOP_JOURNALRECORD | \ - DESKTOP_WRITEOBJECTS - -#define DESKTOP_EXECUTE STANDARD_RIGHTS_EXECUTE | \ - DESKTOP_SWITCHDESKTOP - -#define DESKTOP_ALL_ACCESS STANDARD_RIGHTS_REQUIRED | \ - DESKTOP_CREATEMENU | \ - DESKTOP_CREATEWINDOW | \ - DESKTOP_ENUMERATE | \ - DESKTOP_HOOKCONTROL | \ - DESKTOP_JOURNALPLAYBACK | \ - DESKTOP_JOURNALRECORD | \ - DESKTOP_READOBJECTS | \ - DESKTOP_SWITCHDESKTOP | \ - DESKTOP_WRITEOBJECTS - extern PDESKTOP gpdeskInputDesktop; extern PCLS DesktopWindowClass; extern HDC ScreenDeviceContext; diff --git a/win32ss/user/ntuser/security.c b/win32ss/user/ntuser/security.c new file mode 100644 index 00000000000..0286a76f5e3 --- /dev/null +++ b/win32ss/user/ntuser/security.c @@ -0,0 +1,493 @@ +/* + * PROJECT: ReactOS Win32k subsystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security infrastructure of NTUSER component of Win32k + * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +DBG_DEFAULT_CHANNEL(UserSecurity); + +/* FUNCTIONS *****************************************************************/ + +/** + * @brief + * Opens an access token that represents the effective security + * context of the caller. The purpose of this function is to query + * the authenticated user that is associated with the security + * context. + * + * @return + * Returns a handle to an opened access token that represents the + * security context of the authenticated user, otherwise NULL. + */ +HANDLE +IntGetCurrentAccessToken(VOID) +{ + NTSTATUS Status; + HANDLE TokenHandle; + + /* + * Try acquiring the security context by opening + * the current thread (or so called impersonation) + * token. Such token represents the effective caller. + * Otherwise if the current thread does not have a + * token (hence no impersonation occurs) then open + * the token of main calling process instead. + */ + Status = ZwOpenThreadToken(ZwCurrentThread(), + TOKEN_QUERY, + FALSE, + &TokenHandle); + if (!NT_SUCCESS(Status)) + { + /* + * We might likely fail to open the thread + * token if the process isn't impersonating + * a client. In scenarios where the server + * isn't impersonating, open the main process + * token. + */ + if (Status == STATUS_NO_TOKEN) + { + TRACE("IntGetCurrentAccessToken(): The thread doesn't have a token, trying to open the process one...\n"); + Status = ZwOpenProcessToken(ZwCurrentProcess(), + TOKEN_QUERY, + &TokenHandle); + if (!NT_SUCCESS(Status)) + { + /* We failed opening process token as well, bail out... */ + ERR("IntGetCurrentAccessToken(): Failed to capture security context, couldn't open the process token (Status 0x%08lx)\n", Status); + return NULL; + } + + /* Return the opened token handle */ + return TokenHandle; + } + + /* There's a thread token but we couldn't open it so bail out */ + ERR("IntGetCurrentAccessToken(): Failed to capture security context, couldn't open the thread token (Status 0x%08lx)\n", Status); + return NULL; + } + + /* Return the opened token handle */ + return TokenHandle; +} + +/** + * @brief + * Allocates a buffer within UM (user mode) address + * space area. Such buffer is reserved for security + * purposes, such as allocating a buffer for a DACL + * or a security descriptor. + * + * @param[in] Length + * The length of the buffer that has to be allocated, + * in bytes. + * + * @return + * Returns a pointer to an allocated buffer whose + * contents are arbitrary. If the function fails, + * it means no pages are available to reserve for + * memory allocation for this buffer. + */ +PVOID +IntAllocateSecurityBuffer( + _In_ SIZE_T Length) +{ + NTSTATUS Status; + PVOID Buffer = NULL; + + /* Allocate the buffer in UM memory space */ + Status = ZwAllocateVirtualMemory(ZwCurrentProcess(), + &Buffer, + 0, + &Length, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + ERR("IntAllocateSecurityBuffer(): Failed to allocate the buffer (Status 0x%08lx)\n", Status); + return NULL; + } + + return Buffer; +} + +/** + * @brief + * Frees an allocated security buffer from UM + * memory that is been previously allocated by + * IntAllocateSecurityBuffer function. + * + * @param[in] Buffer + * A pointer to a buffer whose contents are + * arbitrary, to be freed from UM memory space. + * + * @return + * Nothing. + */ +VOID +IntFreeSecurityBuffer( + _In_ PVOID Buffer) +{ + SIZE_T Size = 0; + + ZwFreeVirtualMemory(ZwCurrentProcess(), + &Buffer, + &Size, + MEM_RELEASE); +} + +/** + * @brief + * Queries the authenticated user security identifier + * (SID) that is associated with the security context + * of the access token that is being opened. + * + * @param[out] User + * A pointer to the token user that contains the security + * identifier of the authenticated user. + * + * @return + * Returns STATUS_SUCCESS if the function has successfully + * queried the token user. STATUS_UNSUCCESSFUL is returned + * if the effective token of the caller couldn't be opened. + * STATUS_NO_MEMORY is returned if memory allocation for + * token user buffer has failed because of lack of necessary + * pages reserved for such allocation. A failure NTSTATUS + * code is returned otherwise. + * + * @remarks + * !!!WARNING!!! -- THE CALLER WHO QUERIES THE TOKEN USER IS + * RESPONSIBLE TO FREE THE ALLOCATED TOKEN USER BUFFER THAT IS + * BEING GIVEN. + */ +NTSTATUS +IntQueryUserSecurityIdentification( + _Out_ PTOKEN_USER *User) +{ + NTSTATUS Status; + PTOKEN_USER UserToken; + HANDLE Token; + ULONG BufferLength; + + /* Initialize the parameter */ + *User = NULL; + + /* Open the current token of the caller */ + Token = IntGetCurrentAccessToken(); + if (!Token) + { + ERR("IntQueryUserSecurityIdentification(): Couldn't capture the token!\n"); + return STATUS_UNSUCCESSFUL; + } + + /* + * Since we do not know what the length + * of the buffer size should be exactly to + * hold the user data, let the function + * tell us the size. + */ + Status = ZwQueryInformationToken(Token, + TokenUser, + NULL, + 0, + &BufferLength); + if (!NT_SUCCESS(Status) && Status == STATUS_BUFFER_TOO_SMALL) + { + /* + * Allocate some memory for the buffer + * based on the size that the function + * gave us. + */ + UserToken = IntAllocateSecurityBuffer(BufferLength); + if (!UserToken) + { + /* Bail out if we failed */ + ERR("IntQueryUserSecurityIdentification(): Couldn't allocate memory for the token user!\n"); + ZwClose(Token); + return STATUS_NO_MEMORY; + } + } + + /* Query the user now as we have plenty of space to hold it */ + Status = ZwQueryInformationToken(Token, + TokenUser, + UserToken, + BufferLength, + &BufferLength); + if (!NT_SUCCESS(Status)) + { + /* We failed, bail out */ + ERR("IntQueryUserSecurityIdentification(): Failed to query token user (Status 0x%08lx)\n", Status); + IntFreeSecurityBuffer(UserToken); + ZwClose(Token); + return Status; + } + + /* All good, give the buffer to the caller and close the captured token */ + *User = UserToken; + ZwClose(Token); + + return STATUS_SUCCESS; +} + +/** + * @brief + * Creates a security descriptor for the service. + * + * @param[out] ServiceSd + * A pointer to a newly allocated and created security + * descriptor for the service. + * + * @return + * Returns STATUS_SUCCESS if the function has successfully + * queried created the security descriptor. STATUS_NO_MEMORY + * is returned if memory allocation for security buffers because + * of a lack of needed pages to reserve for such allocation. A + * failure NTSTATUS code is returned otherwise. + */ +NTSTATUS +NTAPI +IntCreateServiceSecurity( + _Out_ PSECURITY_DESCRIPTOR *ServiceSd) +{ + NTSTATUS Status; + PACL ServiceDacl; + ULONG DaclSize; + ULONG RelSDSize; + SECURITY_DESCRIPTOR AbsSD; + PSECURITY_DESCRIPTOR RelSD; + PTOKEN_USER TokenUser; + + /* Initialize our local variables */ + RelSDSize = 0; + TokenUser = NULL; + RelSD = NULL; + ServiceDacl = NULL; + + /* Query the logged in user of the current security context (aka token) */ + Status = IntQueryUserSecurityIdentification(&TokenUser); + if (!TokenUser) + { + ERR("IntCreateServiceSecurity(): Failed to query the token user (Status 0x%08lx)\n", Status); + return Status; + } + + /* Initialize the absolute security descriptor */ + Status = RtlCreateSecurityDescriptor(&AbsSD, SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to initialize absolute SD (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* + * Build up the size of access control + * list (the DACL) necessary to initialize + * our ACL. The first two entry members + * of ACL field are the authenticated user + * that is associated with the security + * context of the token. Then here come + * the last two entries which are admins. + * Why the ACL contains two ACEs of the + * same SID is because of service access + * rights and ACE inheritance. + * + * A service is composed of a default + * desktop and window station upon + * booting the system. On Windows connection + * to such service is being made if no + * default window station and desktop handles + * were created before. The desktop and winsta + * objects grant access on a separate type basis. + * The user is granted full access to the window + * station first and then full access to the desktop. + * After that admins are granted specific rights + * separately, just like the user. Ultimately the + * ACEs that handle desktop rights management are + * inherited to the default desktop object so + * that there's no need to have a separate security + * descriptor for the desktop object alone. + */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(TokenUser->User.Sid) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(TokenUser->User.Sid) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SeExports->SeAliasAdminsSid) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SeExports->SeAliasAdminsSid); + + /* Allocate memory for service DACL */ + ServiceDacl = IntAllocateSecurityBuffer(DaclSize); + if (!ServiceDacl) + { + ERR("IntCreateServiceSecurity(): Failed to allocate memory for service DACL!\n"); + Status = STATUS_NO_MEMORY; + goto Quit; + } + + /* Now create the DACL */ + Status = RtlCreateAcl(ServiceDacl, + DaclSize, + ACL_REVISION); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to create service DACL (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* + * The authenticated user is the ultimate and absolute + * king in charge of the created (or opened, whatever that is) + * window station object. + */ + Status = RtlAddAccessAllowedAceEx(ServiceDacl, + ACL_REVISION, + 0, + WINSTA_ACCESS_ALL, + TokenUser->User.Sid); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to set up window station ACE for authenticated user (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* + * The authenticated user also has the ultimate power + * over the desktop object as well. This ACE cannot + * be propagated but inherited. See the comment + * above regarding ACL size for further explanation. + */ + Status = RtlAddAccessAllowedAceEx(ServiceDacl, + ACL_REVISION, + INHERIT_ONLY_ACE | NO_PROPAGATE_INHERIT_ACE | OBJECT_INHERIT_ACE, + DESKTOP_ALL_ACCESS, + TokenUser->User.Sid); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to set up desktop ACE for authenticated user (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* + * Administrators can only enumerate window + * stations within a desktop. + */ + Status = RtlAddAccessAllowedAceEx(ServiceDacl, + ACL_REVISION, + 0, + WINSTA_ENUMERATE, + SeExports->SeAliasAdminsSid); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to set up window station ACE for admins (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* + * Administrators have some share of power over + * the desktop object. They can enumerate desktops, + * write and read upon the object itself. + */ + Status = RtlAddAccessAllowedAceEx(ServiceDacl, + ACL_REVISION, + INHERIT_ONLY_ACE | NO_PROPAGATE_INHERIT_ACE | OBJECT_INHERIT_ACE, + DESKTOP_ENUMERATE | DESKTOP_READOBJECTS | DESKTOP_WRITEOBJECTS, + SeExports->SeAliasAdminsSid); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to set up desktop ACE for admins (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* Set the DACL to absolute SD */ + Status = RtlSetDaclSecurityDescriptor(&AbsSD, + TRUE, + ServiceDacl, + FALSE); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to set up service DACL to absolute SD (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* This descriptor is ownerless */ + Status = RtlSetOwnerSecurityDescriptor(&AbsSD, + NULL, + FALSE); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to make the absolute SD as ownerless (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* This descriptor has no primary group */ + Status = RtlSetGroupSecurityDescriptor(&AbsSD, + NULL, + FALSE); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to make the absolute SD as having no primary group (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* + * Determine how much size is needed to allocate + * memory space for our relative security descriptor. + */ + Status = RtlAbsoluteToSelfRelativeSD(&AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + ERR("IntCreateServiceSecurity(): Unexpected status code, must be STATUS_BUFFER_TOO_SMALL (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* Allocate memory for this */ + RelSD = IntAllocateSecurityBuffer(RelSDSize); + if (!RelSD) + { + ERR("IntCreateServiceSecurity(): Failed to allocate memory pool for relative SD!\n"); + Status = STATUS_NO_MEMORY; + goto Quit; + } + + /* Convert the absolute SD into a relative one now */ + Status = RtlAbsoluteToSelfRelativeSD(&AbsSD, + RelSD, + &RelSDSize); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateServiceSecurity(): Failed to convert absolute SD to a relative one (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* All good, give the SD to the caller */ + *ServiceSd = RelSD; + +Quit: + if (ServiceDacl) + { + IntFreeSecurityBuffer(ServiceDacl); + } + + if (TokenUser) + { + IntFreeSecurityBuffer(TokenUser); + } + + if (!NT_SUCCESS(Status)) + { + if (RelSD) + { + IntFreeSecurityBuffer(RelSD); + } + } + + return Status; +} + +/* EOF */ diff --git a/win32ss/user/ntuser/security.h b/win32ss/user/ntuser/security.h new file mode 100644 index 00000000000..f719beccc8a --- /dev/null +++ b/win32ss/user/ntuser/security.h @@ -0,0 +1,92 @@ +/* + * PROJECT: ReactOS Win32k subsystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security infrastructure of NTUSER component of Win32k + * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + +#pragma once + +// +// USER objects security rights +// + +/* Desktop access rights */ +#define DESKTOP_READ (STANDARD_RIGHTS_READ | \ + DESKTOP_ENUMERATE | \ + DESKTOP_READOBJECTS) + +#define DESKTOP_WRITE (STANDARD_RIGHTS_WRITE | \ + DESKTOP_CREATEMENU | \ + DESKTOP_CREATEWINDOW | \ + DESKTOP_HOOKCONTROL | \ + DESKTOP_JOURNALPLAYBACK | \ + DESKTOP_JOURNALRECORD | \ + DESKTOP_WRITEOBJECTS) + +#define DESKTOP_EXECUTE (STANDARD_RIGHTS_EXECUTE | \ + DESKTOP_SWITCHDESKTOP) + +#define DESKTOP_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + DESKTOP_CREATEMENU | \ + DESKTOP_CREATEWINDOW | \ + DESKTOP_ENUMERATE | \ + DESKTOP_HOOKCONTROL | \ + DESKTOP_JOURNALPLAYBACK | \ + DESKTOP_JOURNALRECORD | \ + DESKTOP_READOBJECTS | \ + DESKTOP_SWITCHDESKTOP | \ + DESKTOP_WRITEOBJECTS) + +/* Window Station access rights */ +#define WINSTA_READ (STANDARD_RIGHTS_READ | \ + WINSTA_ENUMDESKTOPS | \ + WINSTA_ENUMERATE | \ + WINSTA_READATTRIBUTES | \ + WINSTA_READSCREEN) + +#define WINSTA_WRITE (STANDARD_RIGHTS_WRITE | \ + WINSTA_ACCESSCLIPBOARD | \ + WINSTA_CREATEDESKTOP | \ + WINSTA_WRITEATTRIBUTES) + +#define WINSTA_EXECUTE (STANDARD_RIGHTS_EXECUTE | \ + WINSTA_ACCESSGLOBALATOMS | \ + WINSTA_EXITWINDOWS) + +#define WINSTA_ACCESS_ALL (STANDARD_RIGHTS_REQUIRED | \ + WINSTA_ACCESSCLIPBOARD | \ + WINSTA_ACCESSGLOBALATOMS | \ + WINSTA_CREATEDESKTOP | \ + WINSTA_ENUMDESKTOPS | \ + WINSTA_ENUMERATE | \ + WINSTA_EXITWINDOWS | \ + WINSTA_READATTRIBUTES | \ + WINSTA_READSCREEN | \ + WINSTA_WRITEATTRIBUTES) + +// +// Function prototypes +// + +HANDLE +IntCaptureCurrentAccessToken(VOID); + +PVOID +IntAllocateSecurityBuffer( + _In_ SIZE_T Length); + +VOID +IntFreeSecurityBuffer( + _In_ PVOID Buffer); + +NTSTATUS +IntQueryUserSecurityIdentification( + _Out_ PTOKEN_USER *User); + +NTSTATUS +NTAPI +IntCreateServiceSecurity( + _Out_ PSECURITY_DESCRIPTOR *ServiceSd); + +/* EOF */ diff --git a/win32ss/user/ntuser/win32kdebug.h b/win32ss/user/ntuser/win32kdebug.h index 48175854401..2d9e1a95351 100644 --- a/win32ss/user/ntuser/win32kdebug.h +++ b/win32ss/user/ntuser/win32kdebug.h @@ -108,6 +108,7 @@ DbgChUserProcess, DbgChUserProp, DbgChUserScrollbar, + DbgChUserSecurity, DbgChUserShutdown, DbgChUserSysparams, DbgChUserThread, diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h index 34720ad5093..b36aaa1ce55 100644 --- a/win32ss/user/ntuser/winsta.h +++ b/win32ss/user/ntuser/winsta.h @@ -47,32 +47,6 @@ extern HANDLE gpidLogon; extern HWND hwndSAS; extern UNICODE_STRING gustrWindowStationsDir; -#define WINSTA_READ STANDARD_RIGHTS_READ | \ - WINSTA_ENUMDESKTOPS | \ - WINSTA_ENUMERATE | \ - WINSTA_READATTRIBUTES | \ - WINSTA_READSCREEN - -#define WINSTA_WRITE STANDARD_RIGHTS_WRITE | \ - WINSTA_ACCESSCLIPBOARD | \ - WINSTA_CREATEDESKTOP | \ - WINSTA_WRITEATTRIBUTES - -#define WINSTA_EXECUTE STANDARD_RIGHTS_EXECUTE | \ - WINSTA_ACCESSGLOBALATOMS | \ - WINSTA_EXITWINDOWS - -#define WINSTA_ACCESS_ALL STANDARD_RIGHTS_REQUIRED | \ - WINSTA_ACCESSCLIPBOARD | \ - WINSTA_ACCESSGLOBALATOMS | \ - WINSTA_CREATEDESKTOP | \ - WINSTA_ENUMDESKTOPS | \ - WINSTA_ENUMERATE | \ - WINSTA_EXITWINDOWS | \ - WINSTA_READATTRIBUTES | \ - WINSTA_READSCREEN | \ - WINSTA_WRITEATTRIBUTES - CODE_SEG("INIT") NTSTATUS NTAPI @@ -125,4 +99,5 @@ BOOL FASTCALL UserSetProcessWindowStation(HWINSTA hWindowStation); BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID); VOID FASTCALL IntEndDesktopGraphics(VOID); BOOL FASTCALL CheckWinstaAttributeAccess(ACCESS_MASK); + /* EOF */ diff --git a/win32ss/win32kp.h b/win32ss/win32kp.h index e8f401d35c2..9a6ae760005 100644 --- a/win32ss/win32kp.h +++ b/win32ss/win32kp.h @@ -81,6 +81,7 @@ typedef struct _DC *PDC; #include "user/ntuser/painting.h" #include "user/ntuser/class.h" #include "user/ntuser/window.h" +#include "user/ntuser/security.h" #include "user/ntuser/sysparams.h" #include "user/ntuser/prop.h" #include "user/ntuser/guicheck.h"

2 years, 7 months

[reactos] 01/21: [LSASRV] Set up a security descriptor for the token object

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bee9b2fcc6cbe03251778… commit bee9b2fcc6cbe03251778e439ffb5f408fba650e Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Feb 28 18:35:53 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri May 6 10:09:36 2022 +0200 [LSASRV] Set up a security descriptor for the token object LSASS implements a default ACL inside the token structure field but it doesn't actually set a protective security descriptor for the token object itself. This happens so that the kernel gets whatever default ACLs it finds for the object which is incorrect. SYSTEM has full and supreme control over tokens, administrators can only read the token as such. The logged in user of their own token has full access. Credits and courtesy goes to Thomas Faber for the patch. --- dll/win32/lsasrv/authpackage.c | 15 +++- dll/win32/lsasrv/lsasrv.h | 6 ++ dll/win32/lsasrv/security.c | 176 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 1 deletion(-) diff --git a/dll/win32/lsasrv/authpackage.c b/dll/win32/lsasrv/authpackage.c index 8a335be6d6b..462329b826e 100644 --- a/dll/win32/lsasrv/authpackage.c +++ b/dll/win32/lsasrv/authpackage.c @@ -1627,9 +1627,18 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, else if (TokenInformationType == LsaTokenInformationV1) { TOKEN_PRIVILEGES NoPrivileges = {0}; + PSECURITY_DESCRIPTOR TokenSd; + ULONG TokenSdSize; TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + /* Set up a security descriptor for token object itself */ + Status = LsapCreateTokenSd(&TokenInfo1->User, &TokenSd, &TokenSdSize); + if (!NT_SUCCESS(Status)) + { + TokenSd = NULL; + } + Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); Qos.ImpersonationLevel = SecurityImpersonation; Qos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; @@ -1639,7 +1648,7 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, ObjectAttributes.RootDirectory = NULL; ObjectAttributes.ObjectName = NULL; ObjectAttributes.Attributes = 0; - ObjectAttributes.SecurityDescriptor = NULL; + ObjectAttributes.SecurityDescriptor = TokenSd; ObjectAttributes.SecurityQualityOfService = &Qos; /* Create the logon token */ @@ -1656,6 +1665,10 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, &TokenInfo1->PrimaryGroup, &TokenInfo1->DefaultDacl, &RequestMsg->LogonUser.Request.SourceContext); + + /* Free the allocated security descriptor */ + RtlFreeHeap(RtlGetProcessHeap(), 0, TokenSd); + if (!NT_SUCCESS(Status)) { ERR("NtCreateToken failed (Status 0x%08lx)\n", Status); diff --git a/dll/win32/lsasrv/lsasrv.h b/dll/win32/lsasrv/lsasrv.h index a73b66c672e..2ba5fa1b917 100644 --- a/dll/win32/lsasrv/lsasrv.h +++ b/dll/win32/lsasrv/lsasrv.h @@ -436,6 +436,12 @@ NTSTATUS LsapCreateSecretSd(PSECURITY_DESCRIPTOR *SecretSd, PULONG SecretSdSize); +NTSTATUS +LsapCreateTokenSd( + _In_ const TOKEN_USER *User, + _Outptr_ PSECURITY_DESCRIPTOR *TokenSd, + _Out_ PULONG TokenSdSize); + /* session.c */ VOID LsapInitLogonSessions(VOID); diff --git a/dll/win32/lsasrv/security.c b/dll/win32/lsasrv/security.c index 10fd7352a23..6bb61cdfa65 100644 --- a/dll/win32/lsasrv/security.c +++ b/dll/win32/lsasrv/security.c @@ -599,4 +599,180 @@ done: return Status; } + +/** + * @brief + * Creates a security descriptor for the token + * object. + * + * @param[in] User + * A primary user to be given to the function. + * This user represents the owner that is in + * charge of this object. + * + * @param[out] TokenSd + * A pointer to an allocated security descriptor + * for the token object. + * + * @param[out] TokenSdSize + * A pointer to a returned size of the descriptor. + * + * @return + * STATUS_SUCCESS is returned if the function has + * successfully created the security descriptor. + * STATUS_INVALID_PARAMETER is returned if one of the + * parameters are not valid. STATUS_INSUFFICIENT_RESOURCES + * is returned if memory heap allocation for specific + * security buffers couldn't be done. A NTSTATUS status + * code is returned otherwise. + * + * @remarks + * Bot the local system and user are given full access rights + * for the token (they can open it, read and write into it, etc.) + * whereas admins can only read from the token. This security + * descriptor is TO NOT BE confused with the default DACL of the + * token which is another thing that serves different purpose. + */ +NTSTATUS +LsapCreateTokenSd( + _In_ const TOKEN_USER *User, + _Outptr_ PSECURITY_DESCRIPTOR *TokenSd, + _Out_ PULONG TokenSdSize) +{ + SECURITY_DESCRIPTOR AbsoluteSd; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + ULONG RelativeSdSize = 0; + PSID AdministratorsSid = NULL; + PSID LocalSystemSid = NULL; + PACL Dacl = NULL; + ULONG DaclSize; + NTSTATUS Status; + + if (TokenSd == NULL || TokenSdSize == NULL) + return STATUS_INVALID_PARAMETER; + + *TokenSd = NULL; + *TokenSdSize = 0; + + /* Initialize the SD */ + Status = RtlCreateSecurityDescriptor(&AbsoluteSd, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, 0, 0, 0, 0, 0, 0, + &LocalSystemSid); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdministratorsSid); + if (!NT_SUCCESS(Status)) + goto done; + + /* Allocate and initialize the DACL */ + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(LocalSystemSid) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(AdministratorsSid) + + sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(User->User.Sid); + + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + TOKEN_ALL_ACCESS, + LocalSystemSid); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + TOKEN_READ, + AdministratorsSid); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + TOKEN_ALL_ACCESS, + User->User.Sid); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlSetDaclSecurityDescriptor(&AbsoluteSd, + TRUE, + Dacl, + FALSE); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlSetOwnerSecurityDescriptor(&AbsoluteSd, + AdministratorsSid, + FALSE); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAbsoluteToSelfRelativeSD(&AbsoluteSd, + RelativeSd, + &RelativeSdSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + RelativeSd = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RelativeSdSize); + if (RelativeSd == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = RtlAbsoluteToSelfRelativeSD(&AbsoluteSd, + RelativeSd, + &RelativeSdSize); + if (!NT_SUCCESS(Status)) + goto done; + + *TokenSd = RelativeSd; + *TokenSdSize = RelativeSdSize; + +done: + if (Dacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + + if (AdministratorsSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AdministratorsSid); + + if (LocalSystemSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, LocalSystemSid); + + if (!NT_SUCCESS(Status)) + { + if (RelativeSd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + } + + return Status; +} + /* EOF */

2 years, 7 months

[reactos] 01/01: [WIN32SS] Fix CF_DIB format not being saved to clipboard on Print Screen key (#3265)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de6c514c3e6e9fa047be3… commit de6c514c3e6e9fa047be391410f7834d94ccd488 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu May 5 10:54:15 2022 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 5 17:54:15 2022 +0200 [WIN32SS] Fix CF_DIB format not being saved to clipboard on Print Screen key (#3265) Use pool to allocate (potentially huge) clipboard data buffers. CORE-17318 --- win32ss/user/ntuser/object.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/object.c b/win32ss/user/ntuser/object.c index 26c407f0b56..d0b4b4cf364 100644 --- a/win32ss/user/ntuser/object.c +++ b/win32ss/user/ntuser/object.c @@ -207,12 +207,45 @@ static PVOID AllocSysObject( return Object; } +_Success_(return!=NULL) +static PVOID AllocSysObjectCB( + _In_ PDESKTOP pDesk, + _In_ PTHREADINFO pti, + _In_ SIZE_T Size, + _Out_ PVOID* ObjectOwner) +{ + PVOID Object; + + UNREFERENCED_PARAMETER(pDesk); + UNREFERENCED_PARAMETER(pti); + ASSERT(Size > sizeof(HEAD)); + + /* Allocate the clipboard data */ + // FIXME: This allocation should be done on the current session pool; + // however ReactOS' MM doesn't support session pool yet. + Object = ExAllocatePoolZero(/* SESSION_POOL_MASK | */ PagedPool, Size, USERTAG_CLIPBOARD); + if (!Object) + { + ERR("ExAllocatePoolZero failed. No object created.\n"); + return NULL; + } + + *ObjectOwner = NULL; + return Object; +} + static void FreeSysObject( _In_ PVOID Object) { UserHeapFree(Object); } +static void FreeSysObjectCB( + _In_ PVOID Object) +{ + ExFreePoolWithTag(Object, USERTAG_CLIPBOARD); +} + static const struct { PVOID (*ObjectAlloc)(PDESKTOP, PTHREADINFO, SIZE_T, PVOID*); @@ -226,7 +259,7 @@ static const struct { AllocProcMarkObject, IntDestroyCurIconObject, FreeCurIconObject }, /* TYPE_CURSOR */ { AllocSysObject, /*UserSetWindowPosCleanup*/NULL, FreeSysObject }, /* TYPE_SETWINDOWPOS */ { AllocDeskThreadObject, IntRemoveHook, FreeDeskThreadObject }, /* TYPE_HOOK */ - { AllocSysObject, /*UserClipDataCleanup*/NULL,FreeSysObject }, /* TYPE_CLIPDATA */ + { AllocSysObjectCB, /*UserClipDataCleanup*/NULL,FreeSysObjectCB }, /* TYPE_CLIPDATA */ { AllocDeskProcObject, DestroyCallProc, FreeDeskProcObject }, /* TYPE_CALLPROC */ { AllocProcMarkObject, UserDestroyAccelTable, FreeProcMarkObject }, /* TYPE_ACCELTABLE */ { NULL, NULL, NULL }, /* TYPE_DDEACCESS */

2 years, 7 months

[reactos] 01/01: [SHELL32] Fix Shift-Delete to Permanently Delete Files and Folders (#4004)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc0e2a3672653da009dc6… commit cc0e2a3672653da009dc6757c233c0395e32ba66 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu May 5 10:30:06 2022 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 5 17:30:06 2022 +0200 [SHELL32] Fix Shift-Delete to Permanently Delete Files and Folders (#4004) CORE-17802 --- dll/win32/shell32/CDefaultContextMenu.cpp | 3 ++- dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 62740118a6c..6bddfafcb35 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -779,7 +779,8 @@ HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) if (FAILED_UNEXPECTEDLY(hr)) return hr; - SHSimulateDrop(pDT, m_pDataObj, 0, NULL, NULL); + DWORD grfKeyState = (lpcmi->fMask & CMIC_MASK_SHIFT_DOWN) ? MK_SHIFT : 0; + SHSimulateDrop(pDT, m_pDataObj, grfKeyState, NULL, NULL); return S_OK; } diff --git a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp index efd446d5cfa..a29ec1e1c88 100644 --- a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp @@ -140,12 +140,10 @@ class CRecyclerDropTarget : } HRESULT WINAPI Drop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) + DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) object dropped on recycle bin, effect %u\n", this, *pdwEffect); - /* TODO: pdwEffect should be read and make the drop object be permanently deleted in the move case (shift held) */ - FORMATETC fmt; TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); @@ -155,7 +153,7 @@ class CRecyclerDropTarget : { DWORD fMask = 0; - if ((dwKeyState & MK_SHIFT) == MK_SHIFT) + if ((grfKeyState & MK_SHIFT) == MK_SHIFT) fMask |= CMIC_MASK_SHIFT_DOWN; _DoDeleteAsync(pDataObject, fMask);

2 years, 7 months

[reactos] 02/02: [CABMAN] Make cabman exit with non-zero exit code if argument parsing fails (#4022)

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=212cbb6fffffbed79aa89… commit 212cbb6fffffbed79aa89b39382556b1c8567b98 Author: William Kent <wjk011(a)gmail.com> AuthorDate: Sun Oct 10 17:01:48 2021 -0400 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 5 17:21:54 2022 +0200 [CABMAN] Make cabman exit with non-zero exit code if argument parsing fails (#4022) Co-authored-by: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> --- sdk/tools/cabman/cabman.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/cabman/cabman.cxx b/sdk/tools/cabman/cabman.cxx index d258b534e79..97c72f7d18a 100644 --- a/sdk/tools/cabman/cabman.cxx +++ b/sdk/tools/cabman/cabman.cxx @@ -689,7 +689,7 @@ int main(int argc, char * argv[]) CCABManager CABMgr; if (!CABMgr.ParseCmdline(argc, argv)) - return false; + return 2; return CABMgr.Run() ? 0 : 1; }

2 years, 7 months

[reactos] 01/02: [TXT2NLS] Use delete[] to deallocate new[] output (#4022)

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ebad9f3c52ecf51fb0e5… commit 0ebad9f3c52ecf51fb0e5fc7cf93e190aab46c1e Author: William Kent <wjk011(a)gmail.com> AuthorDate: Sun Oct 10 16:59:48 2021 -0400 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 5 17:21:54 2022 +0200 [TXT2NLS] Use delete[] to deallocate new[] output (#4022) Per AppleClang 13.0 warning. --- sdk/tools/txt2nls/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/txt2nls/main.cpp b/sdk/tools/txt2nls/main.cpp index cb8ebb7572f..d966029ede0 100644 --- a/sdk/tools/txt2nls/main.cpp +++ b/sdk/tools/txt2nls/main.cpp @@ -541,7 +541,7 @@ int main(int argc, char* argv[]) output.write(reinterpret_cast<char*>(wc_table), 65536 * FileHeader.MaximumCharacterSize); output.close(); - delete wc_table; + delete[] wc_table; return 0; }

2 years, 7 months

[reactos] 01/01: [SHELL32] Folders: Adjust column sequence in details view (#4279)

by Thomas Csovcsity

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=860d3544af58d031cc79c… commit 860d3544af58d031cc79c05e81b13e6b7419a7b6 Author: Thomas Csovcsity <46087964+thc13(a)users.noreply.github.com> AuthorDate: Thu May 5 17:05:18 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 5 17:05:18 2022 +0200 [SHELL32] Folders: Adjust column sequence in details view (#4279) Adjust column sequence in folder view to match WinXP and Win2k3 order. CORE-11846 --- dll/win32/shell32/folders/CControlPanelFolder.cpp | 4 ++-- dll/win32/shell32/folders/CDrivesFolder.cpp | 28 +++++++++++------------ dll/win32/shell32/folders/CFSFolder.cpp | 26 ++++++++++----------- dll/win32/shell32/folders/CRegFolder.cpp | 19 +++++++-------- 4 files changed, 37 insertions(+), 40 deletions(-) diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index c4d9eddf670..5782ed49d3c 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -333,7 +333,7 @@ HRESULT WINAPI CControlPanelFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE case 0: /* name */ result = wcsicmp(pData1->szName + pData1->offsDispName, pData2->szName + pData2->offsDispName); break; - case 1: /* comment */ + case 4: /* comment */ result = wcsicmp(pData1->szName + pData1->offsComment, pData2->szName + pData2->offsComment); break; default: @@ -581,7 +581,7 @@ HRESULT WINAPI CControlPanelFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iCol { case 0: /* name */ return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsDispName); - case 1: /* comment */ + case 4: /* comment */ return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsComment); } } diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index fe5e8f5bb38..b8ef36e2ea0 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -528,10 +528,10 @@ class CDrivesFolderEnum : static const shvheader MyComputerSFHeader[] = { {IDS_SHV_COLUMN_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, - {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_DISK_CAPACITY, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, {IDS_SHV_COLUMN_DISK_AVAILABLE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, + {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 10}, }; #define MYCOMPUTERSHELLVIEWCOLUMNS 5 @@ -729,16 +729,13 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1 hres = MAKE_COMPARE_HRESULT(result); break; } - case 1: /* comments */ - hres = MAKE_COMPARE_HRESULT(0); - break; - case 2: /* Type */ + case 1: /* Type */ { /* We want to return immediately because SHELL32_CompareDetails also compares children. */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } - case 3: /* Size */ - case 4: /* Size Available */ + case 2: /* Size */ + case 3: /* Size Available */ { ULARGE_INTEGER Drive1Available, Drive1Total, Drive2Available, Drive2Total; @@ -761,6 +758,9 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1 hres = MAKE_COMPARE_HRESULT(Diff.QuadPart); break; } + case 4: /* comments */ + hres = MAKE_COMPARE_HRESULT(0); + break; default: return E_INVALIDARG; } @@ -1115,29 +1115,29 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S case 0: /* name */ hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; - case 1: /* FIXME: comments */ - hr = SHSetStrRet(&psd->str, ""); - break; - case 2: /* type */ + case 1: /* type */ if (DriveType == DRIVE_REMOVABLE && !IsDriveFloppyA(pszDrive)) hr = SHSetStrRet(&psd->str, IDS_DRIVE_REMOVABLE); else hr = SHSetStrRet(&psd->str, iDriveTypeIds[DriveType]); break; - case 3: /* total size */ - case 4: /* free size */ + case 2: /* total size */ + case 3: /* free size */ psd->str.cStr[0] = 0x00; psd->str.uType = STRRET_CSTR; if (GetVolumeInformationA(pszDrive, NULL, 0, NULL, NULL, NULL, NULL, 0)) { GetDiskFreeSpaceExA(pszDrive, &ulFreeBytes, &ulTotalBytes, NULL); - if (iColumn == 3) + if (iColumn == 2) StrFormatByteSize64A(ulTotalBytes.QuadPart, psd->str.cStr, MAX_PATH); else StrFormatByteSize64A(ulFreeBytes.QuadPart, psd->str.cStr, MAX_PATH); } hr = S_OK; break; + case 4: /* FIXME: comments */ + hr = SHSetStrRet(&psd->str, ""); + break; } } diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index f6aaa4efce2..cf8d0c99233 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -527,10 +527,10 @@ CFSFolder::~CFSFolder() static const shvheader GenericSFHeader[] = { {IDS_SHV_COLUMN_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, - {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 0}, {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_SIZE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, {IDS_SHV_COLUMN_MODIFIED, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12}, + {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 0}, {IDS_SHV_COLUMN_ATTRIBUTES, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10} }; @@ -969,15 +969,12 @@ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam, case 0: /* Name */ result = wcsicmp(pDataW1->wszName, pDataW2->wszName); break; - case 1: /* Comments */ - result = 0; - break; - case 2: /* Type */ + case 1: /* Type */ pExtension1 = PathFindExtensionW(pDataW1->wszName); pExtension2 = PathFindExtensionW(pDataW2->wszName); result = wcsicmp(pExtension1, pExtension2); break; - case 3: /* Size */ + case 2: /* Size */ if (pData1->u.file.dwFileSize > pData2->u.file.dwFileSize) result = 1; else if (pData1->u.file.dwFileSize < pData2->u.file.dwFileSize) @@ -985,11 +982,14 @@ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam, else result = 0; break; - case 4: /* Modified */ + case 3: /* Modified */ result = pData1->u.file.uFileDate - pData2->u.file.uFileDate; if (result == 0) result = pData1->u.file.uFileTime - pData2->u.file.uFileTime; break; + case 4: /* Comments */ + result = 0; + break; case 5: /* Attributes */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } @@ -1532,18 +1532,18 @@ HRESULT WINAPI CFSFolder::GetDetailsOf(PCUITEMID_CHILD pidl, case 0: /* name */ hr = GetDisplayNameOf (pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; - case 1: /* FIXME: comments */ - psd->str.cStr[0] = 0; - break; - case 2: /* type */ + case 1: /* type */ _ILGetFileType(pidl, psd->str.cStr, MAX_PATH); break; - case 3: /* size */ + case 2: /* size */ _ILGetFileSize(pidl, psd->str.cStr, MAX_PATH); break; - case 4: /* date */ + case 3: /* date */ _ILGetFileDate(pidl, psd->str.cStr, MAX_PATH); break; + case 4: /* FIXME: comments */ + psd->str.cStr[0] = 0; + break; case 5: /* attributes */ _ILGetFileAttributes(pidl, psd->str.cStr, MAX_PATH); break; diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 71e5e062eb8..9792e0568f3 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -742,19 +742,13 @@ HRESULT WINAPI CRegFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHEL return E_INVALIDARG; } - if (iColumn >= 3) - { - /* Return an empty string when we area asked for a column we don't support. - Only the regfolder is supposed to do this as it supports less columns compared to other folder - and its contents are supposed to be presented alongside items that support more columns. */ - return SHSetStrRet(&psd->str, ""); - } - switch(iColumn) { case 0: /* name */ return GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); - case 1: /* comments */ + case 1: /* type */ + return SHSetStrRet(&psd->str, IDS_SYSTEMFOLDER); + case 4: /* comments */ HKEY hKey; if (!HCR_RegOpenClassIDKey(*clsid, &hKey)) return SHSetStrRet(&psd->str, ""); @@ -764,8 +758,11 @@ HRESULT WINAPI CRegFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHEL RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); RegCloseKey(hKey); return S_OK; - case 2: /* type */ - return SHSetStrRet(&psd->str, IDS_SYSTEMFOLDER); + default: + /* Return an empty string when we area asked for a column we don't support. + Only the regfolder is supposed to do this as it supports less columns compared to other folder + and its contents are supposed to be presented alongside items that support more columns. */ + return SHSetStrRet(&psd->str, ""); } return E_FAIL; }

2 years, 7 months

[reactos] 01/01: [BROWSEUI] Remove useless variable and unreachable code (#4483)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=beefb07d183d289397baa… commit beefb07d183d289397baa1360e3fd44636db15bc Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu May 5 16:45:56 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 5 16:45:56 2022 +0200 [BROWSEUI] Remove useless variable and unreachable code (#4483) Addendum to 0c47416 (r72003). CORE-12804 Co-authored-by: Victor Martinez Calvo <vicmarcal(a)gmail.com> --- dll/win32/browseui/explorerband.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/browseui/explorerband.cpp index 535ba404f97..83b5d8c3396 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/browseui/explorerband.cpp @@ -726,7 +726,6 @@ BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExp HTREEITEM current; HTREEITEM tmp; HTREEITEM parent; - BOOL found; NodeInfo *nodeData; LPITEMIDLIST relativeChild; TVITEM tvItem; @@ -734,10 +733,9 @@ BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExp if (!item) return FALSE; - found = FALSE; current = m_hRoot; parent = NULL; - while(!found) + while (TRUE) { nodeData = GetNodeInfo(current); if (!nodeData) @@ -811,7 +809,7 @@ BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExp *item = NULL; return FALSE; } - return FALSE; + UNREACHABLE; } BOOL CExplorerBand::NavigateToCurrentFolder()

2 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2022