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

Merge pull request #8045 from RichieB2B/ncsc-nl/sightings-dist 

Allow sightings to be pushed upstream
pull/8052/head
Andras Iklody 2021-12-22 13:02:51 +01:00 committed by GitHub
parent b00711ee2f c7cf1e7be3
commit ec07811aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Model/Event.php
View File

@ -4313,12 +4313,12 @@ class Event extends AppModel
public function checkDistributionForPush($object, $server, $context = 'Event')
{
if (empty(Configure::read('MISP.host_org_id')) || !$server['Server']['internal'] || Configure::read('MISP.host_org_id') != $server['Server']['remote_org_id']) {
if ($object[$context]['distribution'] < 2) {
if ($context != 'Sighting' && $object[$context]['distribution'] < 2) {
return false;
}
}
if ($object[$context]['distribution'] == 4) {
if ($context === 'Event') {
if ($context === 'Event' || $context === 'Sighting') {
return $this->SharingGroup->checkIfServerInSG($object['SharingGroup'], $server);
} else {
return $this->SharingGroup->checkIfServerInSG($object[$context]['SharingGroup'], $server);
@ -4351,9 +4351,9 @@ class Event extends AppModel
// TODO: This are new conditions, that was not used in old code
// Filter out servers that do not match server conditions for event push
$servers = $this->Server->eventFilterPushableServers($event, $servers);
// Filter out servers that do not match event distribution conditions for event push
// Filter out servers that do not match event sharing group distribution for event push
$servers = array_filter($servers, function (array $server) use ($event) {
return $this->checkDistributionForPush($event, $server);
return $this->checkDistributionForPush($event, $server, 'Sighting');
});
if (empty($servers)) {
return true;