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

fix: [correlation engines] added additional event fields to the retrieved event metadata to match the old behaviour

pull/8552/head
iglocska 2022-08-01 10:36:18 +02:00
parent e70f6de2e9
commit dbd992dbef
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Model/Behavior/DefaultCorrelationBehavior.php
View File

@ -363,7 +363,18 @@ class DefaultCorrelationBehavior extends ModelBehavior
if (!empty($includeEventData)) {
$contain['Event'] = [
'fields' => [
'Event.id', 'Event.uuid', 'Event.info', 'Event.distribution', 'Event.sharing_group_id', 'Event.date', 'Event.orgc_id', 'Event.org_id'
'Event.id',
'Event.uuid',
'Event.threat_level_id',
'Event.analysis',
'Event.info',
'Event.extends_uuid',
'Event.distribution',
'Event.sharing_group_id',
'Event.published',
'Event.date',
'Event.orgc_id',
'Event.org_id'
]
];
}
@ -379,10 +390,7 @@ class DefaultCorrelationBehavior extends ModelBehavior
$results = [];
foreach ($relatedAttributes as $k => $attribute) {
$temp = $attribute['Attribute'];
$temp['info'] = $attribute['Event']['info'];
$temp['org_id'] = $attribute['Event']['org_id'];
$temp['id'] = $attribute['Event']['id'];
$temp['date'] = $attribute['Event']['date'];
$temp['Event'] = $attribute['Event'];
$results[] = $temp;
}
return $results;
@ -455,8 +463,10 @@ class DefaultCorrelationBehavior extends ModelBehavior
private function checkCorrelationACL($user, $correlation, $sgids, $prefix)
{
// check if user can see the event
if (isset($correlation['Correlation'])) {
$correlation = $correlation['Correlation'];
}
if (
$correlation[$prefix . 'org_id'] != $user['org_id'] &&
(

18
app/Model/Behavior/NoAclCorrelationBehavior.php
View File

@ -268,7 +268,18 @@ class NoAclCorrelationBehavior extends ModelBehavior
if (!empty($includeEventData)) {
$contain['Event'] = [
'fields' => [
'Event.id', 'Event.uuid', 'Event.info', 'Event.distribution', 'Event.sharing_group_id', 'Event.date', 'Event.orgc_id', 'Event.org_id'
'Event.id',
'Event.uuid',
'Event.threat_level_id',
'Event.analysis',
'Event.info',
'Event.extends_uuid',
'Event.distribution',
'Event.sharing_group_id',
'Event.published',
'Event.date',
'Event.orgc_id',
'Event.org_id'
]
];
}
@ -284,10 +295,7 @@ class NoAclCorrelationBehavior extends ModelBehavior
$results = [];
foreach ($relatedAttributes as $k => $attribute) {
$temp = $attribute['Attribute'];
$temp['info'] = $attribute['Event']['info'];
$temp['org_id'] = $attribute['Event']['org_id'];
$temp['id'] = $attribute['Event']['id'];
$temp['date'] = $attribute['Event']['date'];
$temp['Event'] = $attribute['Event'];
$results[] = $temp;
}
return $results;