MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into 2.4

pull/9438/head v2.4.180
Christophe Vandeplas 2023-11-30 11:19:14 +01:00
parent 9fe50664a4 7f9d7c9e44
commit 2613715d07
No known key found for this signature in database
GPG Key ID: BDC48619FFDC5A5B
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controller/UsersController.php
View File

@ -1351,7 +1351,7 @@ class UsersController extends AppController
$this->Flash->info(__('Welcome! Last login was on %s', $readableDatetime));
}
if (version_compare(PHP_VERSION, '7.4.0') >= 0) {
try {
// there are reasons to believe there is evil happening, suspicious. Inform user and (org)admins.
$suspiciousness_reason = $this->User->UserLoginProfile->_isSuspicious();
if ($suspiciousness_reason) {
@ -1369,6 +1369,9 @@ class UsersController extends AppController
// send email to inform the user
$this->User->UserLoginProfile->email_newlogin($user);
}
} catch (Exception $e) {
// At first login after code update and before DB schema update we might end up with problems.
// Just catch it cleanly here to prevent problems.
}
// no state changes are ever done via GET requests, so it is safe to return to the original page: