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

fix: [object references] Object references can be added to deleted objects/attributes, fixes #3312

pull/3323/head
iglocska 2018-06-05 15:35:26 +02:00
parent 9da4fa6bfc
commit 755e0c3b34
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/ObjectReferencesController.php
View File

@ -26,7 +26,7 @@ class ObjectReferencesController extends AppController {
$temp = $this->ObjectReference->Object->find('first', array(
'recursive' => -1,
'fields' => array('Object.id'),
'conditions' => array('Object.uuid' => $objectId)
'conditions' => array('Object.uuid' => $objectId, 'Object.deleted' => 0)
));
if (empty($temp)) throw new NotFoundException('Invalid Object');
$objectId = $temp['Object']['id'];
@ -34,7 +34,7 @@ class ObjectReferencesController extends AppController {
throw new NotFoundException(__('Invalid object'));
}
$object = $this->ObjectReference->Object->find('first', array(
'conditions' => array('Object.id' => $objectId),
'conditions' => array('Object.id' => $objectId, 'Object.deleted' => 0),
'recursive' => -1,
'contain' => array(
'Event' => array(
@ -53,7 +53,7 @@ class ObjectReferencesController extends AppController {
}
$referenced_type = 1;
$target_object = $this->ObjectReference->Object->find('first', array(
'conditions' => array('Object.uuid' => $this->request->data['ObjectReference']['referenced_uuid']),
'conditions' => array('Object.uuid' => $this->request->data['ObjectReference']['referenced_uuid'], 'Object.deleted' => 0),
'recursive' => -1,
'fields' => array('Object.id', 'Object.uuid', 'Object.event_id')
));
@ -65,7 +65,7 @@ class ObjectReferencesController extends AppController {
}
} else {
$target_attribute = $this->ObjectReference->Object->Attribute->find('first', array(
'conditions' => array('Attribute.uuid' => $this->request->data['ObjectReference']['referenced_uuid']),
'conditions' => array('Attribute.uuid' => $this->request->data['ObjectReference']['referenced_uuid'], 'Attribute.deleted' => 0),
'recursive' => -1,
'fields' => array('Attribute.id', 'Attribute.uuid', 'Attribute.event_id')
));
@ -129,8 +129,7 @@ class ObjectReferencesController extends AppController {
'fields' => array('Attribute.id', 'Attribute.uuid', 'Attribute.type', 'Attribute.category', 'Attribute.value', 'Attribute.to_ids')
),
'Object' => array(
'conditions' => array('Object.deleted' => 0),
'conditions' => array('NOT' => array('Object.id' => $objectId)),
'conditions' => array('NOT' => array('Object.id' => $objectId), 'Object.deleted' => 0),
'fields' => array('Object.id', 'Object.uuid', 'Object.name', 'Object.meta-category'),
'Attribute' => array(
'conditions' => array('Attribute.deleted' => 0),