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

fix: Reduced the user data to just a partial user object and organisation object for the zmq push

pull/2643/merge
iglocska 2017-11-16 08:48:59 +01:00
parent 8f71ce66af
commit 1058345ee7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Model/User.php
View File

@ -267,7 +267,16 @@ class User extends AppModel {
if (!isset($user['User'])) {
$user['User'] = $user;
}
if (isset($user['User']['id'])) $user = $this->getAuthUser($user['User']['id']);
if (isset($user['User']['id']))
$user = $this->find('first', array(
'recursive' => array('User.id' => $user['User']['id']),
'fields' => array('id', 'email', 'last_login', 'date_modified', 'org_id', 'termsaccepted', 'autoalert', 'newsread', 'disabled'),
'contain' => array(
'Organisation' => array(
'fields' => array('Organisation.id', 'Organisation.name', 'Organisation.description', 'Organisation.uuid', 'Organisation.nationality', 'Organisation.sector', 'Organisation.type', 'Organisation.local')
)
)
));
if (isset($user['User']['password'])) {
unset($user['User']['password']);
unset($user['User']['confirm_password']);