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

fix: [analystdata] don't include the parent via the viewAnalystData endpoints

feature/event-view-collapsible-objects
iglocska 2024-05-02 12:08:23 +02:00
parent d6d4c8e08a
commit 8dbe02d115
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controller/AttributesController.php
View File

@ -3036,7 +3036,14 @@ class AttributesController extends AppController
$attribute[0]['Attribute'] = array_merge_recursive($attribute[0]['Attribute'], $this->Attribute->attachAnalystData($attribute[0]['Attribute']));
}
if ($this->_isRest()) {
return $this->RestResponse->viewData($attribute[0], $this->response->type());
$validFields = ['Note', 'Opinion', 'Relationship'];
$results = [];
foreach ($validFields as $field) {
if (!empty($attribute[0]['Attribute'][$field])) {
$results[$field] = $attribute[0]['Attribute'][$field];
}
}
return $this->RestResponse->viewData($results, $this->response->type());
}
$this->layout = null;
$this->set('shortDist', $this->Attribute->shortDist);

9
app/Controller/ObjectsController.php
View File

@ -1426,7 +1426,14 @@ class ObjectsController extends AppController
$object[0]['Object'] = array_merge_recursive($object[0]['Object'], $this->MispObject->attachAnalystData($object[0]['Object']));
}
if ($this->_isRest()) {
return $this->RestResponse->viewData($object[0], $this->response->type());
$validFields = ['Note', 'Opinion', 'Relationship'];
$results = [];
foreach ($validFields as $field) {
if (!empty($object[0]['Object'][$field])) {
$results[$field] = $object[0]['Object'][$field];
}
}
return $this->RestResponse->viewData($results, $this->response->type());
}
$this->layout = null;
$this->set('shortDist', $this->MispObject->Attribute->shortDist);