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

new: Include user action in zmq

pull/2668/head
iglocska 2017-11-16 12:15:39 +01:00
parent 85d2dc73c7
commit 67d9cd6a6c
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Controller/UsersController.php
View File

@ -778,11 +778,17 @@ class UsersController extends AppController {
$this->__extralog("login"); // TODO Audit, __extralog, check: customLog i.s.o. __extralog, no auth user?: $this->User->customLog('login', $this->Auth->user('id'), array('title' => '','user_id' => $this->Auth->user('id'),'email' => $this->Auth->user('email'),'org' => 'IN2'));
$this->User->Behaviors->disable('SysLogLogable.SysLogLogable');
$this->User->id = $this->Auth->user('id');
$user = $this->Auth->user();
$user['action'] = 'login';
$user['last_login'] = $this->Auth->user('current_login');
$user['current_login'] = time();
$this->User->save($user);
$user = $this->User->find('first', array(
'conditions' => array(
'User.id' => $this->Auth->user('id')
),
'recursive' => -1
));
unset($user['User']['password']);
$user['User']['action'] = 'login';
$user['User']['last_login'] = $this->Auth->user('current_login');
$user['User']['current_login'] = time();
$this->User->save($user['User'], true, array('id', 'last_login', 'current_login'));
if (empty($this->Auth->authenticate['Form']['passwordHasher']) && !empty($passwordToSave)) $this->User->saveField('password', $passwordToSave);
$this->User->Behaviors->enable('SysLogLogable.SysLogLogable');
// TODO removed the auto redirect for now, due to security concerns - will look more into this
@ -900,6 +906,15 @@ class UsersController extends AppController {
$this->__extralog("logout"); // TODO Audit, __extralog, check: customLog i.s.o. __extralog, $this->User->customLog('logout', $this->Auth->user('id'), array());
}
$this->Session->setFlash(__('Good-Bye'));
$user = $this->User->find('first', array(
'conditions' => array(
'User.id' => $this->Auth->user('id')
),
'recursive' => -1
));
unset($user['User']['password']);
$user['User']['action'] = 'logout';
$this->User->save($user['User'], true, array('id'));
$this->redirect($this->Auth->logout());
}

7
app/Model/User.php
View File

@ -267,9 +267,9 @@ class User extends AppModel {
if (!isset($user['User'])) {
$user['User'] = $user;
}
$action = isset($user['User']['id']) ? 'edit' : 'add';
if (isset($user['action'])) $action = $user['action'];
if (isset($user['User']['id']))
$action = $created ? 'edit' : 'add';
if (isset($user['User']['action'])) $action = $user['User']['action'];
if (isset($user['User']['id'])) {
$user = $this->find('first', array(
'recursive' => -1,
'condiitons' => array('User.id' => $user['User']['id']),
@ -280,6 +280,7 @@ class User extends AppModel {
)
)
));
}
if (isset($user['User']['password'])) {
unset($user['User']['password']);
unset($user['User']['confirm_password']);