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

new: [event loader] has a new extensionList parameter 

- boolean, if set includes a list of extension events, metadata only
pull/7188/head
iglocska 2021-03-09 17:57:22 +01:00
parent 847ff85bed
commit ad20eb3562
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/Model/Event.php
View File

@ -1842,6 +1842,7 @@ class Event extends AppModel
'blockedAttributeTags',
'eventsExtendingUuid',
'extended',
'extensionList',
'excludeGalaxy',
'includeCustomGalaxyCluster', // not used
'includeRelatedTags',
@ -2385,6 +2386,11 @@ class Event extends AppModel
$results[$k] = $this->__mergeExtensions($user, $result, $options);
}
}
if ($options['extensionList']) {
foreach ($results as $k => $result) {
$results[$k] = $this->__fetchEventsExtendingEvent($user, $result, $options);
}
}
return $results;
}
@ -2562,6 +2568,37 @@ class Event extends AppModel
return $event;
}
/**
* @param array $user
* @param array $event
* @param array $options
* @return array
* @throws Exception
*/
private function __fetchEventsExtendingEvent(array $user, array $event, array $options)
{
$extensions = $this->fetchEvent($user, [
'eventsExtendingUuid' => $event['Event']['uuid'],
'sgReferenceOnly' => $options['sgReferenceOnly'],
'metadata' => 1
]);
$extensionList = [];
foreach ($extensions as $extension) {
$extensionList[] = [
'id' => $extension['Event']['id'],
'uuid' => $extension['Event']['uuid'],
'info' => $extension['Event']['info'],
'Orgc' => [
'id' => $extension['Orgc']['id'],
'uuid' => $extension['Orgc']['uuid'],
'name' => $extension['Orgc']['name']
]
];
}
$event['Event']['ExtendedBy'] = $extensionList;
return $event;
}
/**
* @param array $user
* @param array $event
@ -2602,7 +2639,7 @@ class Event extends AppModel
$event[$thingToMerge] = array_merge($event[$thingToMerge], $extensionEvent[$thingToMerge]);
}
// Merge event reports if requested
if (!$options['noEventReports']) {
if (!$options['noEventReports'] && isset($event['EventReport'])) {
$event['EventReport'] = array_merge($event['EventReport'], $extensionEvent['EventReport']);
}
// Merge just tags that are not already in main event