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

fix: [bulksave] doesn't save with a single invalid attribute

pull/9438/head
iglocska 2023-11-25 10:59:26 +01:00
parent 4d7096f874
commit 7b209e726e
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Model/Attribute.php
View File

@ -2626,6 +2626,7 @@ class Attribute extends AppModel
$this->create();
}
} else {
$attribute['uuid'] = CakeText::uuid();
$attribute['_materialChange'] = true;
$this->create();
}
@ -2644,7 +2645,7 @@ class Attribute extends AppModel
'Attribute dropped due to invalid sharing group for Event ' . $eventId . ' failed: ' . $attribute_short,
'Validation errors: ' . json_encode($this->validationErrors) . ' Full Attribute: ' . json_encode($attribute)
);
return 'Invalid sharing group choice.';
return true;
}
} else if (!isset($attribute['distribution'])) {
$attribute['distribution'] = $this->defaultDistribution();
@ -2668,14 +2669,20 @@ class Attribute extends AppModel
'fieldList' => $fieldList,
'parentEvent' => $event,
'atomic' => true,
'validate' => true
'validate' => 'only'
];
// validation only so we can cull the problematic attributes
$this->saveMany($attributes, $saveOptions);
if (!empty($this->validationErrors)) {
foreach ($this->validationErrors as $key => $validationError) {
$this->logDropped($user, $attributes[$key], 'edit', $validationError);
unset($this->updateLookupTable[$attributes[$key]['uuid']]);
unset($attributes[$key]);
}
}
$saveOptions['validate'] = true;
// actual save, though we still need to validate in order for the beforeValidate massaging scripts to fire.
$this->saveMany($attributes, $saveOptions);
return true;
}
@ -2684,6 +2691,9 @@ class Attribute extends AppModel
$eventId = $event['Event']['id'];
$tagActions = [];
foreach ($attributes as $attribute) {
if (!isset($this->updateLookupTable[$attribute['uuid']])) {
continue;
}
$attributeId = $this->updateLookupTable[$attribute['uuid']];
if (!empty($attribute['Sighting'])) {
$this->Sighting->captureSightings($attribute['Sighting'], $this->id, $eventId, $user);