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

chg: [import] Do not put same comment to all attribute in object

pull/8613/head
Jakub Onderka 2022-10-05 17:59:30 +02:00
parent e4fd5280fd
commit 9ff1d02700
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Model/Event.php
View File

@ -6424,8 +6424,7 @@ class Event extends AppModel
}
if ($jobId) {
$processedAttributes++;
$this->Job->saveField('message', 'Attribute ' . $processedAttributes . '/' . $total_attributes);
$this->Job->saveField('progress', ($processedAttributes * 100 / $items_count));
$this->Job->saveProgress($jobId, "Attribute $processedAttributes/$total_attributes", $processedAttributes * 100 / $items_count);
}
}
} else {
@ -6470,7 +6469,7 @@ class Event extends AppModel
if (isset($initial_attributes[$object_relation]) && in_array($object_attribute['value'], $initial_attributes[$object_relation])) {
continue;
}
if ($this->__saveObjectAttribute($object_attribute, $default_comment, $event, $initial_object_id, $user)) {
if ($this->__saveObjectAttribute($object_attribute, null, $event, $initial_object_id, $user)) {
$saved_object_attributes++;
} else {
$failed_object_attributes++;
@ -6503,7 +6502,7 @@ class Event extends AppModel
if ($this->Object->save($object)) {
$object_id = $this->Object->id;
foreach ($object['Attribute'] as $object_attribute) {
if ($this->__saveObjectAttribute($object_attribute, $default_comment, $event, $object_id, $user)) {
if ($this->__saveObjectAttribute($object_attribute, null, $event, $object_id, $user)) {
$saved_object_attributes++;
} else {
$failed_object_attributes++;
@ -6538,8 +6537,7 @@ class Event extends AppModel
}
if ($jobId) {
$processedObjects++;
$this->Job->saveField('message', 'Object ' . $processedObjects . '/' . $total_objects);
$this->Job->saveField('progress', (($processedObjects + $total_attributes) * 100 / $items_count));
$this->Job->saveProgress($jobId, "Object $processedObjects/$total_objects", ($processedObjects + $total_attributes) * 100 / $items_count);
}
}
@ -6606,8 +6604,7 @@ class Event extends AppModel
}
if ($jobId) {
$current = ($i + 1);
$this->Job->saveField('message', 'EventReport ' . $current . '/' . $total_reports);
$this->Job->saveField('progress', ($current * 100 / $items_count));
$this->Job->saveProgress($jobId, "EventReport $current/$total_reports", $current * 100 / $items_count);
}
}
}
@ -6674,8 +6671,7 @@ class Event extends AppModel
$message .= $failed_reports . $reason;
}
if ($jobId) {
$this->Job->saveField('message', 'Processing complete. ' . $message);
$this->Job->saveField('progress', 100);
$this->Job->saveStatus($jobId, true, 'Processing complete. ' . $message);
$eventLock->deleteBackgroundJobLock($event['Event']['id'], $jobId);
}
return $message;
@ -6765,7 +6761,7 @@ class Event extends AppModel
/**
* @param array $attribute
* @param string $default_comment
* @param string|null $default_comment
* @param array $event
* @param int $object_id
* @param array $user
@ -6776,7 +6772,7 @@ class Event extends AppModel
{
$attribute['object_id'] = $object_id;
$attribute['event_id'] = $event['Event']['id'];
if (empty($attribute['comment'])) {
if (empty($attribute['comment']) && $default_comment) {
$attribute['comment'] = $default_comment;
}
if (!empty($attribute['data']) && !empty($attribute['encrypt'])) {

2
app/View/Events/resolved_misp_format.ctp
View File

@ -303,7 +303,7 @@
<input type="checkbox" class="AttributeDisableCorrelation"<?php if (!empty($attribute['disable_correlation'])) echo ' checked'; ?>>
</td>
<td class="short">
<input type="text" class="AttributeComment" style="padding:0;height:20px;margin-bottom:0;" placeholder="<?php echo h($importComment); ?>"<?php if (!empty($attribute['comment'])) echo ' value="' . h($attribute['comment']) . '"';?>>
<input type="text" class="AttributeComment" style="padding:0;height:20px;margin-bottom:0;"<?php if (!empty($attribute['comment'])) echo ' value="' . h($attribute['comment']) . '"';?>>
</td>
<td class="short" style="width:40px;text-align:center;">
<select class="AttributeDistribution" style="padding:0;height:20px;margin-bottom:0;">