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

wip: [enrichment] Support of object references 

- Handling the references between objects and
  attributes or objects that are displayed in the
  form and saving them.
- Avoiding issue when an attribute or object can
  not be saved and is referenced: trying to find
  in the event if it is an attribute, returning
  a warning message if it is an object or if
  nothing corresponding to the failing referenced
  object or attribute is found.
pull/4584/head
chrisr3d 2019-04-11 17:11:30 +02:00
parent cdaff75ec4
commit 9f76063030
No known key found for this signature in database
GPG Key ID: 6BBED1B63A6D639F
1 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
app/Model/Event.php
View File

@ -5825,6 +5825,7 @@ class Event extends AppModel
$failed_attributes = $failed_objects = $failed_object_attributes = 0;
$saved_attributes = $saved_objects = $saved_object_attributes = 0;
$items_count = 0;
$failed = array();
foreach (array('Attribute', 'Object') as $feature) {
if (isset($resolved_data[$feature])) {
$items_count += count($resolved_data[$feature]);
@ -5843,6 +5844,7 @@ class Event extends AppModel
} else {
$failed_attributes++;
$lastAttributeError = $this->Attribute->validationErrors;
$failed[$attribute['uuid']] = array('Attribute' => $attribute);
}
if ($jobId) {
$current = ($a + 1);
@ -5855,6 +5857,7 @@ class Event extends AppModel
}
if (isset($resolved_data['Object']) && !empty($resolved_data['Object'])) {
$total_objects = count($resolved_data['Object']);
$references = array();
foreach ($resolved_data['Object'] as $o => $object) {
$this->Object->create();
$object['event_id'] = $id;
@ -5878,10 +5881,16 @@ class Event extends AppModel
}
}
}
if (isset($object['ObjectReference']) && !empty($object['ObjectReference'])) {
foreach($object['ObjectReference'] as $object_reference) {
array_push($references, array('objectName' => $object['name'], 'reference' => $object_reference));
}
}
$saved_objects++;
} else {
$failed_objects++;
$lastObjectError = $this->Object->validationErrors;
$failed[$object['uuid']] = array('Object' => $object);
}
if ($jobId) {
$current = ($o + 1);
@ -5890,6 +5899,56 @@ class Event extends AppModel
}
}
}
if (!empty($references)) {
$reference_errors = array();
foreach($references as $reference) {
$objectName = $reference['objectName'];
$reference = $reference['reference'];
if (array_key_exists($reference['referenced_uuid'], $failed)) {
$referenced_uuid = $reference['referenced_uuid'];
if (isset($failed[$referenced_uuid]['Attribute'])) {
$referenced_object = $failed[$referenced_uuid]['Attribute'];
$error = ' attribute (type: ' . $referenced_object['type'] . '), ';
$target_attributes = $this->Object->Attribute->find('all', array(
'conditions' => array('Attribute.type' => $referenced_object['type'],
'Attribute.value' => $referenced_object['value'],
'Attribute.deleted' => 0),
'recursive' => -1,
'fields' => array('Attribute.id', 'Attribute.uuid', 'Attribute.event_id')
));
foreach ($target_attributes as $target_attribute) {
if ($target_attribute['Attribute']['event_id'] == $id) {
$target_uuid = $target_attribute['Attribute']['uuid'];
break;
}
}
} else {
$error = 'other object (name: ' . $failed[$referenced_uuid]['Object']['name'] . '), ';
}
if (!isset($target_uuid)) {
array_push($reference_errors, ($reference['relationship_type'] . ' between ' . $objectName . 'object and an' . $error));
continue;
}
$reference['referenced_uuid'] = $target_uuid;
}
list($referenced_id, $referenced_uuid, $referenced_type) = $this->Object->ObjectReference->getReferencedInfo(
$reference['referenced_uuid'],
array('Event' => array('id' => $id))
);
$reference = array(
'event_id' => $id,
'referenced_id' => $referenced_id,
'referenced_uuid' => $referenced_uuid,
'referenced_type' => $referenced_type,
'object_id' => $object_id,
'object_uuid' => $reference['object_uuid'],
'relationship_type' => $reference['relationship_type']
);
$this->Object->ObjectReference->create();
$this->Object->ObjectReference->save($reference);
}
}
if ($saved_attributes > 0 || $saved_objects > 0) {
$event = $this->find('first', array(
'conditions' => array('Event.id' => $id),
@ -5936,7 +5995,15 @@ class Event extends AppModel
} else {
$reason = 'object attributes could not be saved. An example of reason for the failure: ';
}
$message .= 'Also, ' . $failed_object_attributes . $reason . json_encode($lastObjectAttributeError);
$message .= 'By the way, ' . $failed_object_attributes . $reason . json_encode($lastObjectAttributeError) . '.';
}
if (!empty($reference_errors)) {
$reference_error = sizeof($reference_errors) == 1 ? 'a reference is' : 'some references are';
$message .= ' Also, be aware that ' . $reference_error . ' missing: ';
foreach ($reference_errors as $error) {
$message .= $error;
}
$message .= 'you can have a look at the module results view you just left, to compare.';
}
if ($jobId) {
$this->Job->saveField('message', 'Processing complete. ' . $message);