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

fix: [analyst-data:pull] Correctly adjust distribution level and locked flag when pulling

notes
Sami Mokaddem 2024-02-05 11:58:40 +01:00
parent f71b50d3d7
commit 7fee219b45
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Model/AnalystData.php
View File

@ -375,15 +375,15 @@ class AnalystData extends AppModel
}
$analystData = $analystModel->captureOrganisationAndSG($analystData, $type, $user);
$existingAnalystData = $analystModel->find('first', [
'conditions' => ["{$type}.uuid" => $analystData[$type]['uuid'],],
]);
if (!isset($analystData[$type]['distribution'])) {
$analystData[$type]['distribution'] = Configure::read('MISP.default_event_distribution'); // use default event distribution
}
if ($analystData[$type]['distribution'] != 4) {
$analystData[$type]['sharing_group_id'] = null;
}
$existingAnalystData = $analystModel->find('first', [
'conditions' => ["{$type}.uuid" => $analystData[$type]['uuid'],],
]);
if (empty($existingAnalystData)) {
unset($analystData[$type]['id']);
$analystModel->create();
@ -727,6 +727,7 @@ class AnalystData extends AppModel
}
foreach ($chunkedAnalystData as $analystData) {
$analystData = $this->updatePulledBeforeInsert($analystData, $type, $serverSync->server(), $user, $serverSync->pullRules());
$savedResult = $this->captureAnalystData($user, $analystData, true, $serverOrgUUID, $serverSync->server());
if ($savedResult['success']) {
$saved += $savedResult['imported'];
@ -737,4 +738,23 @@ class AnalystData extends AppModel
return $saved;
}
private function updatePulledBeforeInsert(array $analystData, $type, array $server, array $user, array $pullRules): array
{
$analystData[$type]['locked'] = true;
if (empty(Configure::read('MISP.host_org_id')) || !$server['Server']['internal'] || Configure::read('MISP.host_org_id') != $server['Server']['org_id']) {
switch ($analystData[$type]['distribution']) {
case 1:
// if community only, downgrade to org only after pull
$analystData[$type]['distribution'] = '0';
break;
case 2:
// if connected communities downgrade to community only
$analystData[$type]['distribution'] = '1';
break;
}
}
return $analystData;
}
}