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

fix: [API] Fix non exportable tags being included in the attribute level restsearch

pull/3892/head
iglocska 2018-11-20 19:53:02 +01:00
parent 63940564e0
commit bef72f9465
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Model/Attribute.php
View File

@ -2898,6 +2898,20 @@ class Attribute extends AppModel
} }
} }
$results = $this->find('all', $params); $results = $this->find('all', $params);
foreach ($results as $k => $result) {
if (!empty($result['AttributeTag'])) {
$tagCulled = false;
foreach ($result['AttributeTag'] as $k2 => $at) {
if (empty($at['Tag'])) {
unset($results[$k]['AttributeTag'][$k2]);
$tagCulled = true;
}
}
if ($tagCulled) {
$results[$k]['AttributeTag'] = array_values($results[$k]['AttributeTag']);
}
}
}
if (!$loop) { if (!$loop) {
if (!empty($params['limit']) && count($results) < $params['limit']) { if (!empty($params['limit']) && count($results) < $params['limit']) {
$continue = false; $continue = false;
@ -3764,7 +3778,7 @@ class Attribute extends AppModel
'fields' => array('Attribute.*', 'Event.org_id', 'Event.distribution'), 'fields' => array('Attribute.*', 'Event.org_id', 'Event.distribution'),
'withAttachments' => !empty($filters['withAttachments']) ? $filters['withAttachments'] : 0, 'withAttachments' => !empty($filters['withAttachments']) ? $filters['withAttachments'] : 0,
'enforceWarninglist' => !empty($filters['enforceWarninglist']) ? $filters['enforceWarninglist'] : 0, 'enforceWarninglist' => !empty($filters['enforceWarninglist']) ? $filters['enforceWarninglist'] : 0,
'includeAllTags' => true, 'includeAllTags' => !empty($filters['includeAllTags']) ? $filters['includeAllTags'] : 0,
'flatten' => 1, 'flatten' => 1,
'includeEventUuid' => !empty($filters['includeEventUuid']) ? $filters['includeEventUuid'] : 0, 'includeEventUuid' => !empty($filters['includeEventUuid']) ? $filters['includeEventUuid'] : 0,
'includeEventTags' => !empty($filters['includeEventTags']) ? $filters['includeEventTags'] : 0 'includeEventTags' => !empty($filters['includeEventTags']) ? $filters['includeEventTags'] : 0
@ -3852,5 +3866,5 @@ class Attribute extends AppModel
} }
return true; return true;
} }
} }