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

fix: fix "'sharing_group_id' doesn't have a default value error" error when importing OpenIOC file

pull/9009/head
Luciano Righetti 2023-04-12 14:54:15 +02:00
parent e88a64db52
commit 478d1c6440
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/Component/IOCImportComponent.php
View File

@ -190,7 +190,7 @@ class IOCImportComponent extends Component
$duplicateFilter = array();
// check if we have any attributes, if yes, add their UUIDs to our list of success-array
if (count($event['Attribute']) > 0) {
if (isset($event['Attribute']) && count($event['Attribute']) > 0) {
foreach ($event['Attribute'] as $k => $attribute) {
$condensed = strtolower($attribute['value']) . $attribute['category'] . $attribute['type'];
if (!in_array($condensed, $duplicateFilter)) {

5
app/Controller/EventsController.php
View File

@ -2320,7 +2320,7 @@ class EventsController extends AppController
// set the id
$this->set('id', $id);
// set whether it is published or not
$this->set('published', $this->Event->data['Event']['published']);
$this->set('published', $this->Event->data['Event']['published'] ?? false);
}
public function add_misp_export()
@ -3528,6 +3528,7 @@ class EventsController extends AppController
'category' => 'External analysis',
'uuid' => CakeText::uuid(),
'type' => 'attachment',
'sharing_group_id' => '0',
'value' => $this->data['Event']['submittedioc']['name'],
'to_ids' => false,
'distribution' => $dist,
@ -3542,7 +3543,7 @@ class EventsController extends AppController
$fieldList = array(
'Event' => array('published', 'timestamp'),
'Attribute' => array('event_id', 'category', 'type', 'value', 'value1', 'value2', 'to_ids', 'uuid', 'distribution', 'timestamp', 'comment')
'Attribute' => array('event_id', 'category', 'type', 'value', 'value1', 'value2', 'to_ids', 'uuid', 'distribution', 'timestamp', 'comment', 'sharing_group_id')
);
// Save it all
$saveResult = $this->Event->saveAssociated($saveEvent, array('validate' => true, 'fieldList' => $fieldList));

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

@ -95,7 +95,7 @@ class DefaultCorrelationBehavior extends ModelBehavior
return [
$value,
(int) $a['Event']['id'],
(int) $a['Attribute']['object_id'],
(int) ($a['Attribute']['object_id'] ?? 0),
(int) $a['Attribute']['id'],
(int) $a['Event']['org_id'],
(int) $a['Attribute']['distribution'],
@ -105,7 +105,7 @@ class DefaultCorrelationBehavior extends ModelBehavior
(int) $a['Event']['sharing_group_id'],
empty($a['Attribute']['object_id']) ? 0 : (int) $a['Object']['sharing_group_id'],
(int) $b['Event']['id'],
(int) $b['Attribute']['object_id'],
(int) ($b['Attribute']['object_id'] ?? 0),
(int) $b['Attribute']['id'],
(int) $b['Event']['org_id'],
(int) $b['Attribute']['distribution'],