Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:56:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINLOGON] Cleanup user login information when logon fails and at logoff (#8182)

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2025-06-21 22:24:27 +02:00
parent c507b701ab
commit 3f73319068
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

50
base/system/winlogon/sas.c
View file

@ -561,18 +561,18 @@ BOOL
HandleLogon( HandleLogon(
IN OUT PWLSESSION Session) IN OUT PWLSESSION Session)
{ {
PROFILEINFOW ProfileInfo;
BOOL ret = FALSE; BOOL ret = FALSE;
/* Loading personal settings */ /* Loading personal settings */
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS);
ProfileInfo.hProfile = INVALID_HANDLE_VALUE; Session->hProfileInfo = NULL;
if (!(Session->Options & WLX_LOGON_OPT_NO_PROFILE)) if (!(Session->Options & WLX_LOGON_OPT_NO_PROFILE))
{ {
HKEY hKey; HKEY hKey;
LONG lError; LONG lError;
BOOL bNoPopups = FALSE; BOOL bNoPopups = FALSE;
PROFILEINFOW ProfileInfo;
if (Session->Profile == NULL if (Session->Profile == NULL
|| (Session->Profile->dwType != WLX_PROFILE_TYPE_V1_0 || (Session->Profile->dwType != WLX_PROFILE_TYPE_V1_0
@ -618,17 +618,19 @@ HandleLogon(
ERR("WL: LoadUserProfileW() failed\n"); ERR("WL: LoadUserProfileW() failed\n");
goto cleanup; goto cleanup;
} }
Session->hProfileInfo = ProfileInfo.hProfile;
} }
/* Create environment block for the user */ /* Create environment block for the user */
if (!CreateUserEnvironment(Session)) if (!CreateUserEnvironment(Session))
{ {
WARN("WL: SetUserEnvironment() failed\n"); WARN("WL: CreateUserEnvironment() failed\n");
goto cleanup; goto cleanup;
} }
CallNotificationDlls(Session, LogonHandler); CallNotificationDlls(Session, LogonHandler);
/* Enable per-user settings */
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS);
UpdatePerUserSystemParameters(0, TRUE); UpdatePerUserSystemParameters(0, TRUE);
@ -663,8 +665,6 @@ HandleLogon(
if (!InitializeScreenSaver(Session)) if (!InitializeScreenSaver(Session))
WARN("WL: Failed to initialize screen saver\n"); WARN("WL: Failed to initialize screen saver\n");
Session->hProfileInfo = ProfileInfo.hProfile;
/* Logon has succeeded. Play sound. */ /* Logon has succeeded. Play sound. */
PlayLogonSound(Session); PlayLogonSound(Session);
@ -683,25 +683,32 @@ cleanup:
FreeWlxMprInfo(&Session->MprNotifyInfo); FreeWlxMprInfo(&Session->MprNotifyInfo);
ZeroMemory(&Session->MprNotifyInfo, sizeof(Session->MprNotifyInfo)); ZeroMemory(&Session->MprNotifyInfo, sizeof(Session->MprNotifyInfo));
if (!ret && ProfileInfo.hProfile != INVALID_HANDLE_VALUE)
{
UnloadUserProfile(Session->UserToken, ProfileInfo.hProfile);
}
RemoveStatusMessage(Session); RemoveStatusMessage(Session);
if (!ret) if (!ret)
{ {
if (Session->hProfileInfo)
UnloadUserProfile(Session->UserToken, Session->hProfileInfo);
Session->hProfileInfo = NULL;
/* Restore default system parameters */
UpdatePerUserSystemParameters(0, FALSE);
// TODO: Remove session access to window station
// (revert what security.c!AllowAccessOnSession() does).
SetWindowStationUser(Session->InteractiveWindowStation, SetWindowStationUser(Session->InteractiveWindowStation,
&LuidNone, NULL, 0); &LuidNone, NULL, 0);
/* Switch back to default SYSTEM user */
CloseHandle(Session->UserToken); CloseHandle(Session->UserToken);
Session->UserToken = NULL; Session->UserToken = NULL;
Session->LogonId = LuidNone;
} }
else // if (ret)
if (ret)
{ {
SwitchDesktop(Session->ApplicationDesktop); SwitchDesktop(Session->ApplicationDesktop);
Session->LogonState = STATE_LOGGED_ON; Session->LogonState = STATE_LOGGED_ON;
} }
return ret; return ret;
} }
@ -979,6 +986,7 @@ HandleLogoff(
&LuidNone, NULL, 0); &LuidNone, NULL, 0);
// DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOGGINGOFF); // DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOGGINGOFF);
CallNotificationDlls(Session, LogoffHandler);
// FIXME: Closing network connections! // FIXME: Closing network connections!
// DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_CLOSINGNETWORKCONNECTIONS); // DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_CLOSINGNETWORKCONNECTIONS);
@ -999,14 +1007,22 @@ HandleLogoff(
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS);
UnloadUserProfile(Session->UserToken, Session->hProfileInfo); if (Session->hProfileInfo)
UnloadUserProfile(Session->UserToken, Session->hProfileInfo);
Session->hProfileInfo = NULL;
CallNotificationDlls(Session, LogoffHandler); /* Restore default system parameters */
CloseHandle(Session->UserToken);
UpdatePerUserSystemParameters(0, FALSE); UpdatePerUserSystemParameters(0, FALSE);
Session->LogonState = STATE_LOGGED_OFF;
// TODO: Remove session access to window station
// (revert what security.c!AllowAccessOnSession() does).
/* Switch back to default SYSTEM user */
CloseHandle(Session->UserToken);
Session->UserToken = NULL; Session->UserToken = NULL;
Session->LogonId = LuidNone;
Session->LogonState = STATE_LOGGED_OFF;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }