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

Merge pull request #8760 from JakubOnderka/sightings-conditions-simplify 

chg: [internal] Speedup sighting rest search
pull/7199/merge
Jakub Onderka 2024-04-03 13:09:16 +02:00 committed by GitHub
parent e60fe35e0a 8f3f7bc866
commit 67e2478845
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Model/Sighting.php
View File

@ -428,18 +428,33 @@ class Sighting extends AppModel
return ['Sighting.attribute_id' => array_column(array_column($attributes, 'Attribute'), 'id')];
}
$hostOrgId = Configure::read('MISP.host_org_id');
// Merge attributes by Event ID
$userOrgId = $user['org_id'];
$conditions = [];
$attributesByEventId = [];
foreach ($attributes as $attribute) {
$attributeConditions = ['Sighting.attribute_id' => $attribute['Attribute']['id']];
$ownEvent = $attribute['Event']['org_id'] == $userOrgId;
if (!$ownEvent) {
$eventId = $attribute['Event']['id'];
if (isset($attributesByEventId[$eventId])) {
$attributesByEventId[$eventId]['ids'][] = $attribute['Attribute']['id'];
} else {
$ownEvent = $attribute['Event']['org_id'] == $userOrgId;
$attributesByEventId[$eventId] = [
'ids' => [$attribute['Attribute']['id']],
'ownEvent' => $ownEvent,
];
}
}
// Create conditions for merged attributes
$hostOrgId = Configure::read('MISP.host_org_id');
$conditions = [];
foreach ($attributesByEventId as $eventId => $eventAttributes) {
$attributeConditions = ['Sighting.attribute_id' => $eventAttributes['ids']];
if (!$eventAttributes['ownEvent']) {
if ($sightingsPolicy === self::SIGHTING_POLICY_EVENT_OWNER) {
$attributeConditions['Sighting.org_id'] = $userOrgId;
} else if ($sightingsPolicy === self::SIGHTING_POLICY_SIGHTING_REPORTER) {
if (!$this->isReporter($attribute['Event']['id'], $userOrgId)) {
continue; // skip attribute
if (!$this->isReporter($eventId, $userOrgId)) {
continue; // skip event
}
} else if ($sightingsPolicy === self::SIGHTING_POLICY_HOST_ORG) {
$attributeConditions['Sighting.org_id'] = [$userOrgId, $hostOrgId];