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

fix: [API] Fixes to the new attribute add

pull/4965/head
iglocska 2019-08-06 16:01:09 +02:00
parent 786d53d30b
commit edf0657a1d
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AttributesController.php
View File

@ -188,9 +188,9 @@ class AttributesController extends AppController
$validationErrors = array();
$this->Attribute->captureAttribute($attribute, $eventId, $this->Auth->user(), false, false, false, $validationErrors, $this->params['named']);
if (empty($validationErrors)) {
$inserted_ids[] = $this->Attribute->id;
$successes +=1;
} else {
$inserted_ids[] = $this->Attribute->id;
$fails["attribute_" . $k] = $validationErrors;
}
}

5
app/Model/Attribute.php
View File

@ -3765,8 +3765,11 @@ class Attribute extends AppModel
}
$attribute['event_id'] = $eventId;
$attribute['object_id'] = $objectId ? $objectId : 0;
if (!isset($attribute['to_ids'])) {
$attribute['to_ids'] = $this->typeDefinitions[$attribute['type']]['to_ids'];
}
$attribute['to_ids'] = $attribute['to_ids'] ? 1 : 0;
$attribute['disable_correlation'] = $attribute['disable_correlation'] ? 1 : 0;
$attribute['disable_correlation'] = empty($attribute['disable_correlation']) ? 0 : 1;
unset($attribute['id']);
if (isset($attribute['base64'])) {
$attribute['data'] = $attribute['base64'];