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

Addressing performance issues for fetching attributes when blocking attributes via proposals

pull/4341/head
Liviu Valsan 2019-03-19 14:16:35 +01:00
parent 9a863b3bb2
commit fe3241addb
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Model/Attribute.php
View File

@ -2885,7 +2885,7 @@ class Attribute extends AppModel
) )
) )
), ),
'fields' => array('ShadowAttribute.id') 'fields' => array('ShadowAttribute.id', 'ShadowAttribute.value', 'ShadowAttribute.type', 'ShadowAttribute.category', 'ShadowAttribute.to_ids')
) )
); );
$params['contain'] = array_merge($params['contain'], $proposalRestriction); $params['contain'] = array_merge($params['contain'], $proposalRestriction);
@ -2999,7 +2999,7 @@ class Attribute extends AppModel
$results[$key]['Attribute']['event_uuid'] = $results[$key]['Event']['uuid']; $results[$key]['Attribute']['event_uuid'] = $results[$key]['Event']['uuid'];
} }
if ($proposals_block_attributes) { if ($proposals_block_attributes) {
$results = $this->__blockAttributeViaProposal($results, $key); $this->__blockAttributeViaProposal($results, $key);
} }
if ($options['withAttachments']) { if ($options['withAttachments']) {
if ($this->typeIsAttachment($attribute['Attribute']['type'])) { if ($this->typeIsAttachment($attribute['Attribute']['type'])) {
@ -3007,7 +3007,9 @@ class Attribute extends AppModel
$results[$key]['Attribute']['data'] = $encodedFile; $results[$key]['Attribute']['data'] = $encodedFile;
} }
} }
$attributes[] = $results[$key]; if (!empty($results[$key])) {
$attributes[] = $results[$key];
}
} }
if (!empty($break)) { if (!empty($break)) {
break; break;
@ -3047,8 +3049,8 @@ class Attribute extends AppModel
if ($sa['value'] === $attributes[$k]['Attribute']['value'] && if ($sa['value'] === $attributes[$k]['Attribute']['value'] &&
$sa['type'] === $attributes[$k]['Attribute']['type'] && $sa['type'] === $attributes[$k]['Attribute']['type'] &&
$sa['category'] === $attributes[$k]['Attribute']['category'] && $sa['category'] === $attributes[$k]['Attribute']['category'] &&
$sa['to_ids'] == 0 && ($sa['to_ids'] == 0 || $sa['to_ids'] == '') &&
$attribute['to_ids'] == 1 $attributes[$k]['Attribute']['to_ids'] == 1
) { ) {
unset($attributes[$k]); unset($attributes[$k]);
} }
@ -3056,7 +3058,6 @@ class Attribute extends AppModel
} else { } else {
unset($attributes[$k]['ShadowAttribute']); unset($attributes[$k]['ShadowAttribute']);
} }
return $attributes;
} }
// Method gets and converts the contents of a file passed along as a base64 encoded string with the original filename into a zip archive // Method gets and converts the contents of a file passed along as a base64 encoded string with the original filename into a zip archive