[hbelusca] 72737: [WINLOGON] - CreateUserEnvironment: if user impersonation fails, just fail the call. - SetDefaultLanguage: Use the *correct* HKEY_CURRENT_USER key to retrieve the lang., that is, ...
18 Sep
2016
18 Sep
'16
11:32 p.m.
Author: hbelusca
Date: Sun Sep 18 23:32:02 2016
New Revision: 72737
URL: http://svn.reactos.org/svn/reactos?rev=72737&view=rev
Log:
[WINLOGON]
- CreateUserEnvironment: if user impersonation fails, just fail the call.
- SetDefaultLanguage: Use the *correct* HKEY_CURRENT_USER key to retrieve the lang., that
is, first impersonate the user, then, call RegOpenCurrentUser. We do that because
otherwise calling RegOpenKey(Ex) for HKEY_CURRENT_USER just uses the process cached value
of HKEY_CURRENT_USER, which does not change *even if* one impersonates an user.
[MSGINA]
- Correctly impersonate the user when opening & initializing the shutdown dialog (in
the same way as winlogon does), i.e. call ImpersonateLoggedOnUser and use
RegOpenCurrentUser.
- Fill few (but not all) code holes in WlxScreenSaverNotify.
Modified:
trunk/reactos/base/system/winlogon/environment.c
trunk/reactos/base/system/winlogon/sas.c
trunk/reactos/base/system/winlogon/screensaver.c
trunk/reactos/base/system/winlogon/winlogon.c
trunk/reactos/base/system/winlogon/winlogon.h
trunk/reactos/dll/win32/msgina/gui.c
trunk/reactos/dll/win32/msgina/msgina.c
trunk/reactos/dll/win32/msgina/shutdown.c
Modified: trunk/reactos/base/system/winlogon/environment.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir…
==============================================================================
--- trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Sun Sep 18 23:32:02
2016
@@ -134,9 +134,13 @@
TRACE("WL: CreateUserEnvironment called\n");
/* Impersonate the new user */
- ImpersonateLoggedOnUser(Session->UserToken);
+ if (!ImpersonateLoggedOnUser(Session->UserToken))
+ {
+ ERR("ImpersonateLoggedOnUser() failed with error %lu\n",
GetLastError());
+ return FALSE;
+ }
- /* Open the new users HKCU key */
+ /* Open the new user HKCU key */
lError = RegOpenCurrentUser(KEY_CREATE_SUB_KEY,
&hKeyCurrentUser);
if (lError == ERROR_SUCCESS)
Modified: trunk/reactos/base/system/winlogon/sas.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c…
==============================================================================
--- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Sep 18 23:32:02 2016
@@ -106,51 +106,69 @@
BOOL
SetDefaultLanguage(
- IN BOOL UserProfile)
-{
- HKEY BaseKey;
- LPCWSTR SubKey;
- LPCWSTR ValueName;
+ IN PWLSESSION Session)
+{
+ BOOL ret = FALSE;
+ BOOL UserProfile;
LONG rc;
- HKEY hKey = NULL;
+ HKEY UserKey, hKey = NULL;
+ LPCWSTR SubKey, ValueName;
DWORD dwType, dwSize;
LPWSTR Value = NULL;
UNICODE_STRING ValueString;
NTSTATUS Status;
LCID Lcid;
- BOOL ret = FALSE;
+
+ UserProfile = (Session && Session->UserToken);
+
+ if (UserProfile && !ImpersonateLoggedOnUser(Session->UserToken))
+ {
+ ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n",
GetLastError());
+ return FALSE;
+ // FIXME: ... or use the default language of the system??
+ // UserProfile = FALSE;
+ }
if (UserProfile)
{
- BaseKey = HKEY_CURRENT_USER;
+ rc = RegOpenCurrentUser(MAXIMUM_ALLOWED, &UserKey);
+ if (rc != ERROR_SUCCESS)
+ {
+ TRACE("RegOpenCurrentUser() failed with error %lu\n", rc);
+ goto cleanup;
+ }
+
SubKey = L"Control Panel\\International";
ValueName = L"Locale";
}
else
{
- BaseKey = HKEY_LOCAL_MACHINE;
+ UserKey = NULL;
SubKey = L"System\\CurrentControlSet\\Control\\Nls\\Language";
ValueName = L"Default";
}
- rc = RegOpenKeyExW(
- BaseKey,
- SubKey,
- 0,
- KEY_READ,
- &hKey);
+ rc = RegOpenKeyExW(UserKey ? UserKey : HKEY_LOCAL_MACHINE,
+ SubKey,
+ 0,
+ KEY_READ,
+ &hKey);
+
+ if (UserKey)
+ RegCloseKey(UserKey);
+
if (rc != ERROR_SUCCESS)
{
TRACE("RegOpenKeyEx() failed with error %lu\n", rc);
goto cleanup;
}
- rc = RegQueryValueExW(
- hKey,
- ValueName,
- NULL,
- &dwType,
- NULL,
- &dwSize);
+
+ rc = RegQueryValueExW(hKey,
+ ValueName,
+ NULL,
+ &dwType,
+ NULL,
+ &dwSize);
if (rc != ERROR_SUCCESS)
{
TRACE("RegQueryValueEx() failed with error %lu\n", rc);
@@ -169,13 +187,12 @@
TRACE("HeapAlloc() failed\n");
goto cleanup;
}
- rc = RegQueryValueExW(
- hKey,
- ValueName,
- NULL,
- NULL,
- (LPBYTE)Value,
- &dwSize);
+ rc = RegQueryValueExW(hKey,
+ ValueName,
+ NULL,
+ NULL,
+ (LPBYTE)Value,
+ &dwSize);
if (rc != ERROR_SUCCESS)
{
TRACE("RegQueryValueEx() failed with error %lu\n", rc);
@@ -204,10 +221,15 @@
ret = TRUE;
cleanup:
+ if (Value)
+ HeapFree(GetProcessHeap(), 0, Value);
+
if (hKey)
RegCloseKey(hKey);
- if (Value)
- HeapFree(GetProcessHeap(), 0, Value);
+
+ if (UserProfile)
+ RevertToSelf();
+
return ret;
}
@@ -272,6 +294,11 @@
ULONG Index = 0;
SC_HANDLE hSCManager, hService;
+ //
+ // FIXME: Isn't it possible to *JUST* impersonate the current user
+ // *AND* open its HKCU??
+ //
+
/* Get SID of current user */
Status = NtQueryInformationToken((HANDLE)lpParameter,
TokenUser,
@@ -336,7 +363,7 @@
return 0;
}
- /* Open service manager */
+ /* Open the service manager */
hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
if (!hSCManager)
{
@@ -344,17 +371,17 @@
return 0;
}
- /* Open wdmaud service */
+ /* Open the wdmaud service */
hService = OpenServiceW(hSCManager, L"wdmaud", GENERIC_READ);
if (!hService)
{
- /* Sound is not installed */
+ /* The service is not installed */
TRACE("Failed to open wdmaud service (%x)\n", GetLastError());
CloseServiceHandle(hSCManager);
return 0;
}
- /* Wait for wdmaud start */
+ /* Wait for wdmaud to start */
do
{
if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&Info,
sizeof(SERVICE_STATUS_PROCESS), &dwSize))
@@ -451,8 +478,8 @@
DisplayStatusMessage(Session, Session->WinlogonDesktop,
IDS_APPLYINGYOURPERSONALSETTINGS);
UpdatePerUserSystemParameters(0, TRUE);
- /* Set default language */
- if (!SetDefaultLanguage(TRUE))
+ /* Set default user language */
+ if (!SetDefaultLanguage(Session))
{
WARN("WL: SetDefaultLanguage() failed\n");
goto cleanup;
@@ -1530,7 +1557,7 @@
goto cleanup;
}
- if (!SetDefaultLanguage(FALSE))
+ if (!SetDefaultLanguage(NULL))
return FALSE;
ret = TRUE;
Modified: trunk/reactos/base/system/winlogon/screensaver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree…
==============================================================================
--- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Sun Sep 18 23:32:02
2016
@@ -177,13 +177,14 @@
}
cleanup:
- RevertToSelf();
if (Session->hUserActivity)
CloseHandle(Session->hUserActivity);
if (Session->hEndOfScreenSaver)
CloseHandle(Session->hEndOfScreenSaver);
+ RevertToSelf();
+
#ifndef USE_GETLASTINPUTINFO
if (Session->KeyboardHook)
UnhookWindowsHookEx(Session->KeyboardHook);
@@ -194,6 +195,7 @@
CloseHandle(Session->hEndOfScreenSaverThread);
CloseHandle(Session->hScreenSaverParametersChanged);
+
return 0;
}
@@ -368,13 +370,14 @@
CallNotificationDlls(Session, StopScreenSaverHandler);
cleanup:
- RevertToSelf();
if (hKey)
RegCloseKey(hKey);
if (hCurrentUser)
RegCloseKey(hCurrentUser);
+ RevertToSelf();
+
if (!ret)
{
PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_SCRNSVR_ACTIVITY,
0);
Modified: trunk/reactos/base/system/winlogon/winlogon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo…
==============================================================================
--- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Sep 18 23:32:02 2016
@@ -160,7 +160,7 @@
/* Open registry key with preloaded layouts */
if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0,
KEY_READ, &hKey) == ERROR_SUCCESS)
{
- while(TRUE)
+ while (TRUE)
{
/* Read values with integer names only */
swprintf(wszKeyName, L"%d", i++);
Modified: trunk/reactos/base/system/winlogon/winlogon.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo…
==============================================================================
--- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sun Sep 18 23:32:02 2016
@@ -293,7 +293,7 @@
/* sas.c */
BOOL
-SetDefaultLanguage(IN BOOL UserProfile);
+SetDefaultLanguage(IN PWLSESSION Session);
BOOL
InitializeSAS(IN OUT PWLSESSION Session);
Modified: trunk/reactos/dll/win32/msgina/gui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Sep 18 23:32:02 2016
@@ -624,15 +624,33 @@
INT ret;
DWORD ShutdownOptions;
- // FIXME: User impersonation!!
- pgContext->nShutdownAction = LoadShutdownSelState();
- ShutdownOptions = GetAllowedShutdownOptions();
+ if (ImpersonateLoggedOnUser(pgContext->UserToken))
+ {
+ pgContext->nShutdownAction = LoadShutdownSelState();
+ ShutdownOptions = GetAllowedShutdownOptions();
+ RevertToSelf();
+ }
+ else
+ {
+ ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n",
GetLastError());
+ pgContext->nShutdownAction = 0;
+ ShutdownOptions = 0;
+ }
ret = ShutdownDialog(hwndDlg, ShutdownOptions, pgContext);
- // FIXME: User impersonation!!
if (ret == IDOK)
- SaveShutdownSelState(pgContext->nShutdownAction);
+ {
+ if (ImpersonateLoggedOnUser(pgContext->UserToken))
+ {
+ SaveShutdownSelState(pgContext->nShutdownAction);
+ RevertToSelf();
+ }
+ else
+ {
+ ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n",
GetLastError());
+ }
+ }
return ret;
}
Modified: trunk/reactos/dll/win32/msgina/msgina.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?…
==============================================================================
--- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Sep 18 23:32:02 2016
@@ -352,8 +352,9 @@
BOOL *pSecure)
{
#if 0
+ PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext;
WCHAR szBuffer[2];
- HKEY hKey;
+ HKEY hKeyCurrentUser, hKey;
DWORD bufferSize = sizeof(szBuffer);
DWORD varType = REG_SZ;
LONG rc;
@@ -369,14 +370,29 @@
* HKCU\Control Panel\Desktop : ScreenSaverIsSecure
*/
- // FIXME: User impersonation!!
-
- rc = RegOpenKeyExW(HKEY_CURRENT_USER,
- L"Control Panel\\Desktop",
- 0,
- KEY_QUERY_VALUE,
- &hKey);
- TRACE("RegOpenKeyExW: %ld\n", rc);
+ if (!ImpersonateLoggedOnUser(pgContext->UserToken))
+ {
+ ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n",
GetLastError());
+ *pSecure = FALSE;
+ return TRUE;
+ }
+
+ /* Open the current user HKCU key */
+ rc = RegOpenCurrentUser(MAXIMUM_ALLOWED, &hKeyCurrentUser);
+ TRACE("RegOpenCurrentUser: %ld\n", rc);
+ if (rc == ERROR_SUCCESS)
+ {
+ /* Open the subkey */
+ rc = RegOpenKeyExW(hKeyCurrentUser,
+ L"Control Panel\\Desktop",
+ 0,
+ KEY_QUERY_VALUE,
+ &hKey);
+ TRACE("RegOpenKeyExW: %ld\n", rc);
+ RegCloseKey(hKeyCurrentUser);
+ }
+
+ /* Read the value */
if (rc == ERROR_SUCCESS)
{
rc = RegQueryValueExW(hKey,
@@ -396,6 +412,9 @@
RegCloseKey(hKey);
}
+
+ /* Revert the impersonation */
+ RevertToSelf();
TRACE("*pSecure: %ld\n", *pSecure);
#endif
@@ -820,10 +839,10 @@
pProfile->pszEnvironment = lpEnvironment;
if (!GetTokenInformation(pgContext->UserToken,
- TokenStatistics,
- (PVOID)&Stats,
- sizeof(TOKEN_STATISTICS),
- &cbStats))
+ TokenStatistics,
+ &Stats,
+ sizeof(Stats),
+ &cbStats))
{
WARN("Couldn't get Authentication id from user token!\n");
goto cleanup;
Modified: trunk/reactos/dll/win32/msgina/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/shutdown.…
==============================================================================
--- trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] Sun Sep 18 23:32:02 2016
@@ -32,18 +32,26 @@
LoadShutdownSelState(VOID)
{
LONG lRet;
- HKEY hKey;
+ HKEY hKeyCurrentUser, hKey;
DWORD dwValue, dwTemp, dwSize;
/* Default to shutdown */
dwValue = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF;
- lRet = RegOpenKeyExW(HKEY_CURRENT_USER,
-
L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer",
- 0, KEY_QUERY_VALUE, &hKey);
+ /* Open the current user HKCU key */
+ lRet = RegOpenCurrentUser(MAXIMUM_ALLOWED, &hKeyCurrentUser);
+ if (lRet == ERROR_SUCCESS)
+ {
+ /* Open the subkey */
+ lRet = RegOpenKeyExW(hKeyCurrentUser,
+
L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer",
+ 0, KEY_QUERY_VALUE, &hKey);
+ RegCloseKey(hKeyCurrentUser);
+ }
if (lRet != ERROR_SUCCESS)
return dwValue;
+ /* Read the value */
dwSize = sizeof(dwTemp);
lRet = RegQueryValueExW(hKey,
L"Shutdown Setting",
@@ -90,18 +98,25 @@
SaveShutdownSelState(
IN DWORD ShutdownCode)
{
- HKEY hKey;
+ LONG lRet;
+ HKEY hKeyCurrentUser, hKey;
DWORD dwValue = 0;
- if (RegCreateKeyExW(HKEY_CURRENT_USER,
-
L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer",
- 0, NULL,
- REG_OPTION_NON_VOLATILE,
- KEY_SET_VALUE,
- NULL, &hKey, NULL) != ERROR_SUCCESS)
- {
+ /* Open the current user HKCU key */
+ lRet = RegOpenCurrentUser(MAXIMUM_ALLOWED, &hKeyCurrentUser);
+ if (lRet == ERROR_SUCCESS)
+ {
+ /* Create the subkey */
+ lRet = RegCreateKeyExW(hKeyCurrentUser,
+
L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer",
+ 0, NULL,
+ REG_OPTION_NON_VOLATILE,
+ KEY_SET_VALUE,
+ NULL, &hKey, NULL);
+ RegCloseKey(hKeyCurrentUser);
+ }
+ if (lRet != ERROR_SUCCESS)
return;
- }
switch (ShutdownCode)
{
2979
days inactive
2979
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org