composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°5394 - revert 2.7 merge

Browse Source
This commit is contained in:
Eric Espie
2022-09-12 10:54:55 +02:00
parent f02bc529fe
commit e9a3974b98
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/loginbasic.class.inc.php
View File

@@ -62,8 +62,6 @@ class LoginBasic extends AbstractLoginFSMExtension
$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
return LoginWebPage::LOGIN_FSM_ERROR; return LoginWebPage::LOGIN_FSM_ERROR;
} }
// Save the checked user
$_SESSION['auth_user'] = $sAuthUser;
} }
return LoginWebPage::LOGIN_FSM_CONTINUE; return LoginWebPage::LOGIN_FSM_CONTINUE;
} }
@@ -72,7 +70,7 @@ class LoginBasic extends AbstractLoginFSMExtension
{ {
if (Session::Get('login_mode') == 'basic') if (Session::Get('login_mode') == 'basic')
{ {
$sAuthUser = $_SESSION['auth_user']; list($sAuthUser) = $this->GetAuthUserAndPassword();
LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']); LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']);
} }
return LoginWebPage::LOGIN_FSM_CONTINUE; return LoginWebPage::LOGIN_FSM_CONTINUE;

4
application/loginexternal.class.inc.php
View File

@@ -45,8 +45,6 @@ class LoginExternal extends AbstractLoginFSMExtension
$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
return LoginWebPage::LOGIN_FSM_ERROR; return LoginWebPage::LOGIN_FSM_ERROR;
} }
// Save the checked user
$_SESSION['auth_user'] = $sAuthUser;
} }
return LoginWebPage::LOGIN_FSM_CONTINUE; return LoginWebPage::LOGIN_FSM_CONTINUE;
} }
@@ -55,7 +53,7 @@ class LoginExternal extends AbstractLoginFSMExtension
{ {
if (Session::Get('login_mode') == 'external') if (Session::Get('login_mode') == 'external')
{ {
$sAuthUser = $_SESSION['auth_user']; $sAuthUser = $this->GetAuthUser();
LoginWebPage::OnLoginSuccess($sAuthUser, 'external', $_SESSION['login_mode']); LoginWebPage::OnLoginSuccess($sAuthUser, 'external', $_SESSION['login_mode']);
} }
return LoginWebPage::LOGIN_FSM_CONTINUE; return LoginWebPage::LOGIN_FSM_CONTINUE;

10
application/loginform.class.inc.php
View File

@@ -71,8 +71,6 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
return LoginWebPage::LOGIN_FSM_ERROR; return LoginWebPage::LOGIN_FSM_ERROR;
} }
// Save the checked user
$_SESSION['auth_user'] = $sAuthUser;
} }
return LoginWebPage::LOGIN_FSM_CONTINUE; return LoginWebPage::LOGIN_FSM_CONTINUE;
} }
@@ -84,7 +82,15 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
{ {
if (Session::Get('login_mode') == 'form') if (Session::Get('login_mode') == 'form')
{ {
if (isset($_SESSION['auth_user']))
{
// If FSM reenter this state (example 2FA) then the auth_user is not resubmitted
$sAuthUser = $_SESSION['auth_user']; $sAuthUser = $_SESSION['auth_user'];
}
else
{
$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
}
// Store 'auth_user' in session for further use // Store 'auth_user' in session for further use
LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode')); LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode'));
} }

4
application/loginurl.class.inc.php
View File

@@ -60,8 +60,6 @@ class LoginURL extends AbstractLoginFSMExtension
$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
return LoginWebPage::LOGIN_FSM_ERROR; return LoginWebPage::LOGIN_FSM_ERROR;
} }
// Save the checked user
$_SESSION['auth_user'] = $sAuthUser;
} }
return LoginWebPage::LOGIN_FSM_CONTINUE; return LoginWebPage::LOGIN_FSM_CONTINUE;
} }
@@ -70,7 +68,7 @@ class LoginURL extends AbstractLoginFSMExtension
{ {
if (Session::Get('login_mode') == 'url') if (Session::Get('login_mode') == 'url')
{ {
$sAuthUser = $_SESSION['auth_user']; $sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']); LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']);
} }
return LoginWebPage::LOGIN_FSM_CONTINUE; return LoginWebPage::LOGIN_FSM_CONTINUE;