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

fix: fetchAttributes() now correctly adheres to object distributions

pull/2979/head
iglocska 2018-01-12 15:58:29 +01:00
parent 811ea4a6d8
commit 1d992cac92
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/AttributesController.php
View File

@ -739,9 +739,9 @@ class AttributesController extends AppController {
if (empty($event)) {
throw new NotFoundException('Invalid Event.');
}
if ($this->Attribute->data['Attribute']['object_id']) {
if ($existingAttribute['Attribute']['object_id']) {
$result = $this->Attribute->save($this->request->data, array('Attribute.category', 'Attribute.value', 'Attribute.to_ids', 'Attribute.comment', 'Attribute.distribution', 'Attribute.sharing_group_id'));
$this->Attribute->Object->updateTimestamp($id);
$this->Attribute->Object->updateTimestamp($existingAttribute['Attribute']['object_id']);
} else {
$result = $this->Attribute->save($this->request->data);
}

19
app/Model/Attribute.php
View File

@ -1854,7 +1854,8 @@ class Attribute extends AppModel {
'contain' => array('Event' => array(
'fields' => array('Event.id', 'Event.published', 'Event.date', 'Event.publish_timestamp'),
)),
'enforceWarninglist' => $enforceWarninglist
'enforceWarninglist' => $enforceWarninglist,
'flatten' => 1
));
return $attributes;
}
@ -2303,6 +2304,17 @@ class Attribute extends AppModel {
'Attribute.sharing_group_id' => $sgids,
)
)
),
array(
'OR' => array(
'Attribute.object_id' => 0,
'Event.org_id' => $user['org_id'],
'Object.distribution' => array('1', '2', '3', '5'),
'AND' => array(
'Object.distribution' => 4,
'Object.sharing_group_id' => $sgids,
)
)
)
)
);
@ -2393,6 +2405,9 @@ class Attribute extends AppModel {
'Event' => array(
'fields' => array('id', 'info', 'org_id', 'orgc_id', 'uuid'),
),
'Object' => array(
'fields' => array('id', 'distribution', 'sharing_group_id')
)
)
);
$params['contain']['AttributeTag'] = array('Tag' => array('conditions' => array()));
@ -2438,7 +2453,7 @@ class Attribute extends AppModel {
$results = $this->find('list', array(
'conditions' => $params['conditions'],
'recursive' => -1,
'contain' => array('Event'),
'contain' => array('Event', 'Object'),
'fields' => $fields,
'group' => $group,
'sort' => false