From 44c0e236b0db7a96606579b41b2ff390ca638915 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Thu, 8 Sep 2022 09:58:29 +0200 Subject: [PATCH 1/5] =?UTF-8?q?N=C2=B05509=20-=20User=20Provisioning=20Iss?= =?UTF-8?q?ue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/loginwebpage.class.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php index 10abc3cf3..0360d3ee5 100644 --- a/application/loginwebpage.class.inc.php +++ b/application/loginwebpage.class.inc.php @@ -112,7 +112,7 @@ class LoginWebPage extends NiceWebPage */ public static function SynchronizeProfiles(&$oUser, array $aProfiles, $sOrigin) { - $oProfilesSet = $oUser->Get(‘profile_list’); + $oProfilesSet = $oUser->Get('profile_list'); //delete old profiles $aExistingProfiles = []; while ($oProfile = $oProfilesSet->Fetch()) From ca3c0cb1639c104d27408aed7686ec10bacb811a Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Fri, 9 Sep 2022 09:20:52 +0200 Subject: [PATCH 2/5] =?UTF-8?q?N=C2=B05510=20-=20Exception=20"$amount:=20E?= =?UTF-8?q?xpected=205%=20to=20be=20within=200%=20and=201%"=20when=20compi?= =?UTF-8?q?ling=20a=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2.x/itop-portal-base/portal/public/css/variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/public/css/variables.scss b/datamodels/2.x/itop-portal-base/portal/public/css/variables.scss index 5bcce1d65..72d0a21aa 100644 --- a/datamodels/2.x/itop-portal-base/portal/public/css/variables.scss +++ b/datamodels/2.x/itop-portal-base/portal/public/css/variables.scss @@ -612,7 +612,7 @@ $popover-arrow-color: $popover-bg !default; //** Popover outer arrow width $popover-arrow-outer-width: ($popover-arrow-width + 1) !default; //** Popover outer arrow color -$popover-arrow-outer-color: fadein($popover-border-color, 5%) !default; +$popover-arrow-outer-color: fade-in($popover-border-color, 0.05) !default; //** Popover outer arrow fallback color $popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default; From 4c1df9927d1dc6b0181ee20721f93346def026fd Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Mon, 12 Sep 2022 09:45:30 +0200 Subject: [PATCH 3/5] =?UTF-8?q?N=C2=B05394=20-=20use=20session=20for=20the?= =?UTF-8?q?=20FSM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/loginbasic.class.inc.php | 4 +++- application/loginexternal.class.inc.php | 4 +++- application/loginform.class.inc.php | 12 +++--------- application/loginurl.class.inc.php | 4 +++- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/loginbasic.class.inc.php b/application/loginbasic.class.inc.php index 660b45cba..24b1afb2d 100644 --- a/application/loginbasic.class.inc.php +++ b/application/loginbasic.class.inc.php @@ -59,6 +59,8 @@ class LoginBasic extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } + // Save the checked user + $_SESSION['auth_user'] = $sAuthUser; } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -67,7 +69,7 @@ class LoginBasic extends AbstractLoginFSMExtension { if ($_SESSION['login_mode'] == 'basic') { - list($sAuthUser) = $this->GetAuthUserAndPassword(); + $sAuthUser = $_SESSION['auth_user']; LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']); } return LoginWebPage::LOGIN_FSM_CONTINUE; diff --git a/application/loginexternal.class.inc.php b/application/loginexternal.class.inc.php index d4fcb7182..c2c13de86 100644 --- a/application/loginexternal.class.inc.php +++ b/application/loginexternal.class.inc.php @@ -43,6 +43,8 @@ class LoginExternal extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } + // Save the checked user + $_SESSION['auth_user'] = $sAuthUser; } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -51,7 +53,7 @@ class LoginExternal extends AbstractLoginFSMExtension { if ($_SESSION['login_mode'] == 'external') { - $sAuthUser = $this->GetAuthUser(); + $sAuthUser = $_SESSION['auth_user']; LoginWebPage::OnLoginSuccess($sAuthUser, 'external', $_SESSION['login_mode']); } return LoginWebPage::LOGIN_FSM_CONTINUE; diff --git a/application/loginform.class.inc.php b/application/loginform.class.inc.php index a4fb99db5..9a044fade 100644 --- a/application/loginform.class.inc.php +++ b/application/loginform.class.inc.php @@ -71,6 +71,8 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } + // Save the checked user + $_SESSION['auth_user'] = $sAuthUser; } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -82,15 +84,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension { if ($_SESSION['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']; - } - else - { - $sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data'); - } + $sAuthUser = $_SESSION['auth_user']; // Store 'auth_user' in session for further use LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']); } diff --git a/application/loginurl.class.inc.php b/application/loginurl.class.inc.php index 8a215e8f5..166941d31 100644 --- a/application/loginurl.class.inc.php +++ b/application/loginurl.class.inc.php @@ -58,6 +58,8 @@ class LoginURL extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } + // Save the checked user + $_SESSION['auth_user'] = $sAuthUser; } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -66,7 +68,7 @@ class LoginURL extends AbstractLoginFSMExtension { if ($_SESSION['login_mode'] == 'url') { - $sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data'); + $sAuthUser = $_SESSION['auth_user']; LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']); } return LoginWebPage::LOGIN_FSM_CONTINUE; From e9a3974b985da89d4307d943017308bbf56484f8 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Mon, 12 Sep 2022 10:54:55 +0200 Subject: [PATCH 4/5] =?UTF-8?q?N=C2=B05394=20-=20revert=202.7=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/loginbasic.class.inc.php | 4 +--- application/loginexternal.class.inc.php | 4 +--- application/loginform.class.inc.php | 12 +++++++++--- application/loginurl.class.inc.php | 4 +--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/loginbasic.class.inc.php b/application/loginbasic.class.inc.php index bdfae92cf..06210cfa4 100644 --- a/application/loginbasic.class.inc.php +++ b/application/loginbasic.class.inc.php @@ -62,8 +62,6 @@ class LoginBasic extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } - // Save the checked user - $_SESSION['auth_user'] = $sAuthUser; } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -72,7 +70,7 @@ class LoginBasic extends AbstractLoginFSMExtension { if (Session::Get('login_mode') == 'basic') { - $sAuthUser = $_SESSION['auth_user']; + list($sAuthUser) = $this->GetAuthUserAndPassword(); LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']); } return LoginWebPage::LOGIN_FSM_CONTINUE; diff --git a/application/loginexternal.class.inc.php b/application/loginexternal.class.inc.php index 8bb6786b9..759b7482b 100644 --- a/application/loginexternal.class.inc.php +++ b/application/loginexternal.class.inc.php @@ -45,8 +45,6 @@ class LoginExternal extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } - // Save the checked user - $_SESSION['auth_user'] = $sAuthUser; } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -55,7 +53,7 @@ class LoginExternal extends AbstractLoginFSMExtension { if (Session::Get('login_mode') == 'external') { - $sAuthUser = $_SESSION['auth_user']; + $sAuthUser = $this->GetAuthUser(); LoginWebPage::OnLoginSuccess($sAuthUser, 'external', $_SESSION['login_mode']); } return LoginWebPage::LOGIN_FSM_CONTINUE; diff --git a/application/loginform.class.inc.php b/application/loginform.class.inc.php index 4a9e55bb8..f10b2263c 100644 --- a/application/loginform.class.inc.php +++ b/application/loginform.class.inc.php @@ -71,8 +71,6 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } - // Save the checked user - $_SESSION['auth_user'] = $sAuthUser; } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -84,7 +82,15 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension { if (Session::Get('login_mode') == 'form') { - $sAuthUser = $_SESSION['auth_user']; + if (isset($_SESSION['auth_user'])) + { + // If FSM reenter this state (example 2FA) then the auth_user is not resubmitted + $sAuthUser = $_SESSION['auth_user']; + } + else + { + $sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data'); + } // Store 'auth_user' in session for further use LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode')); } diff --git a/application/loginurl.class.inc.php b/application/loginurl.class.inc.php index 253be936e..2aab9bd22 100644 --- a/application/loginurl.class.inc.php +++ b/application/loginurl.class.inc.php @@ -60,8 +60,6 @@ class LoginURL extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } - // Save the checked user - $_SESSION['auth_user'] = $sAuthUser; } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -70,7 +68,7 @@ class LoginURL extends AbstractLoginFSMExtension { 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']); } return LoginWebPage::LOGIN_FSM_CONTINUE; From 2a064fd97d952c551c35f7ae23b7ad50cbd3d0d6 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Mon, 12 Sep 2022 10:56:25 +0200 Subject: [PATCH 5/5] =?UTF-8?q?N=C2=B05394=20-=20use=20session=20for=20the?= =?UTF-8?q?=20FSM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/loginbasic.class.inc.php | 4 ++-- application/loginexternal.class.inc.php | 4 ++-- application/loginform.class.inc.php | 12 ++---------- application/loginurl.class.inc.php | 4 ++-- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/application/loginbasic.class.inc.php b/application/loginbasic.class.inc.php index 92732fa25..68f8eeaf6 100644 --- a/application/loginbasic.class.inc.php +++ b/application/loginbasic.class.inc.php @@ -62,6 +62,7 @@ class LoginBasic extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } + Session::Set('auth_user', $sAuthUser); } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -70,8 +71,7 @@ class LoginBasic extends AbstractLoginFSMExtension { if (Session::Get('login_mode') == 'basic') { - list($sAuthUser) = $this->GetAuthUserAndPassword(); - LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode')); + LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode')); } return LoginWebPage::LOGIN_FSM_CONTINUE; } diff --git a/application/loginexternal.class.inc.php b/application/loginexternal.class.inc.php index 7ef8b5b35..a7055a14b 100644 --- a/application/loginexternal.class.inc.php +++ b/application/loginexternal.class.inc.php @@ -45,6 +45,7 @@ class LoginExternal extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } + Session::Set('auth_user', $sAuthUser); } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -53,8 +54,7 @@ class LoginExternal extends AbstractLoginFSMExtension { if (Session::Get('login_mode') == 'external') { - $sAuthUser = $this->GetAuthUser(); - LoginWebPage::OnLoginSuccess($sAuthUser, 'external', Session::Get('login_mode')); + LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'external', Session::Get('login_mode')); } return LoginWebPage::LOGIN_FSM_CONTINUE; } diff --git a/application/loginform.class.inc.php b/application/loginform.class.inc.php index 41fbe4ae5..d8e5bc8ee 100644 --- a/application/loginform.class.inc.php +++ b/application/loginform.class.inc.php @@ -71,6 +71,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } + Session::Set('auth_user', $sAuthUser); } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -82,17 +83,8 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension { if (Session::Get('login_mode') == 'form') { - if (Session::IsSet('auth_user')) - { - // If FSM reenter this state (example 2FA) then the auth_user is not resubmitted - $sAuthUser = Session::Get('auth_user'); - } - else - { - $sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data'); - } // Store 'auth_user' in session for further use - LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode')); + LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode')); } return LoginWebPage::LOGIN_FSM_CONTINUE; } diff --git a/application/loginurl.class.inc.php b/application/loginurl.class.inc.php index 553ec0062..554058481 100644 --- a/application/loginurl.class.inc.php +++ b/application/loginurl.class.inc.php @@ -60,6 +60,7 @@ class LoginURL extends AbstractLoginFSMExtension $iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS; return LoginWebPage::LOGIN_FSM_ERROR; } + Session::Set('auth_user', $sAuthUser); } return LoginWebPage::LOGIN_FSM_CONTINUE; } @@ -68,8 +69,7 @@ class LoginURL extends AbstractLoginFSMExtension { if (Session::Get('login_mode') == 'url') { - $sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data'); - LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', Session::Get('login_mode')); + LoginWebPage::OnLoginSuccess(Session::Get('auth_user'), 'internal', Session::Get('login_mode')); } return LoginWebPage::LOGIN_FSM_CONTINUE; }