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

chg: [sighting restsearch] added org negations 

- the org_id filter now allows for the use of a prepended '!' character for negations
pull/9665/head
iglocska 2024-04-04 09:42:14 +02:00
parent 540f86b361
commit 31a2507fb4
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Model/Sighting.php
View File

@ -1101,20 +1101,30 @@ class Sighting extends AppModel
$filters['org_id'] = array($filters['org_id']);
}
foreach ($filters['org_id'] as $k => $org_id) {
$negation = false;
if (is_string($org_id) && $org_id[0] === '!') {
$negation = true;
$org_id = substr($org_id, 1);
}
if (Validation::uuid($org_id)) {
$org = $this->Organisation->find('first', array(
'conditions' => array('Organisation.uuid' => $org_id),
'recursive' => -1,
'fields' => array('Organisation.id'),
));
if (empty($org)) {
$filters['org_id'][$k] = -1;
} else {
$filters['org_id'][$k] = $org['Organisation']['id'];
if (!empty($org)) {
$temp = $org['Organisation']['id'];
}
}
if ($negation) {
$conditions['Sighting.org_id'][] = $temp;
} else {
$conditions['Sighting.org_id NOT IN'][] = $temp;
}
if (empty($conditions['Sighting.org_id']) && empty($conditions['Sighting.org_id NOT IN'])) {
$conditions['Sighting.org_id'] = -1;
}
}
$conditions['Sighting.org_id'] = $filters['org_id'];
}
if (isset($filters['source'])) {