extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes required for EPL firewall

Browse Source
This commit is contained in:
Ralf Becker 2021-04-20 15:51:36 +02:00
parent c370941c51
commit 8df0ba3d70
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Framework/Login.php
View File

@ -385,6 +385,8 @@ class Login
$GLOBALS['egw']->session->egw_setcookie('kp3');
$GLOBALS['egw']->session->egw_setcookie('domain');
return lang('Your session timed out, please log in again');
case 100:
return lang('Login rejected by EPL firewall, please contact your administrator');
default:
if (!$code)
{

6
api/src/Session.php
View File

@ -177,7 +177,7 @@ class Session
const CD_SECOND_FACTOR_REQUIRED = 96;
const CD_FORCE_PASSWORD_CHANGE = 97;
const CD_ACCOUNT_EXPIRED = 98;
const CD_BLOCKED = 99; // to many failed attempts to loing
const CD_BLOCKED = 99; // to many failed attempts to login
/**
* Verbose reason why session creation failed
@ -593,7 +593,7 @@ class Session
catch(\Exception $e) {
$this->cd_reason = $e->getCode();
$this->reason = $e->getMessage();
$this->log_access($this->reason, $login, $user_ip, 0); // log unsuccessfull login
$this->log_access($this->reason, $login, $user_ip, 0); // log unsuccessful login
if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check,$fail_on_forced_password_change,'$check_2fa') UNSUCCESSFULL ($this->reason)");
return false;
}
@ -804,7 +804,7 @@ class Session
'errors' => &$errors,
'2fa_code' => $code,
'remember_me_token' => $token,
], [], true);
], ['webauthn'], true);
if (!count($factors) && (count($errors) ||
$GLOBALS['egw_info']['server']['2fa_required'] === 'strict'))