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

chg: [analyst-data:beforeSave] Make sure to set distribution to default value if not provided

pull/9679/merge
Sami Mokaddem 2024-05-02 15:14:18 +02:00
parent 70c01ae049
commit 3ae6351509
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Model/AnalystData.php
View File

@ -180,6 +180,15 @@ class AnalystData extends AppModel
}
$this->data[$this->current_type]['modified'] = (new DateTime($this->data[$this->current_type]['modified'], new DateTimeZone('UTC')))->format('Y-m-d H:i:s');
$this->data[$this->current_type]['created'] = (new DateTime($this->data[$this->current_type]['created'], new DateTimeZone('UTC')))->format('Y-m-d H:i:s');
if (empty($this->data[$this->current_type]['id'])) {
if (!isset($this->data[$this->current_type]['distribution'])) {
$this->data[$this->current_type]['distribution'] = Configure::read('MISP.default_event_distribution'); // use default event distribution
}
if ($this->data[$this->current_type]['distribution'] != 4) {
$this->data[$this->current_type]['sharing_group_id'] = null;
}
}
return true;
}
@ -555,12 +564,6 @@ class AnalystData extends AppModel
}
$analystData = $analystModel->captureOrganisationAndSG($analystData, $type, $user);
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;
}
// Start saving from the leaf since to make sure child elements get saved even if the parent should not be saved (or updated due to locked or timestamp)
foreach (self::ANALYST_DATA_TYPES as $childType) {