new: [API] Fast check object or attribute existence by HEAD method

MISP · Nov 6, 2020 · 19c5d32 · 19c5d32
1 parent 1542d6b
commit 19c5d32
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
@@ -956,6 +956,14 @@ public function editField($id)
 
     public function view($id)
     {
+        if ($this->request->is('head')) { // Just check if attribute exists
+            $attribute = $this->Attribute->fetchAttributesSimple($this->Auth->user(), [
+                'conditions' => $this->__idToConditions($id),
+                'fields' => ['Attribute.id'],
+            ]);
+            return new CakeResponse(['status' => $attribute ? 200 : 404]);
+        }
+
         $attribute = $this->__fetchAttribute($id);
         if (empty($attribute)) {
             throw new MethodNotAllowedException(__('Invalid attribute'));

diff --git a/app/Controller/ObjectsController.php b/app/Controller/ObjectsController.php
@@ -887,22 +887,32 @@ private function __delete($id, $hard)
 
     public function view($id)
     {
-        if ($this->_isRest()) {
-            $objects = $this->MispObject->fetchObjects($this->Auth->user(), array(
+        if ($this->request->is('head')) { // Just check if object exists
+            $exists = $this->MispObject->fetchObjects($this->Auth->user(), [
                 'conditions' => $this->__objectIdToConditions($id),
-            ));
-            if (!empty($objects)) {
-                $object = $objects[0];
-                if (!empty($object['Event'])) {
-                    $object['Object']['Event'] = $object['Event'];
-                }
-                if (!empty($object['Attribute'])) {
-                    $object['Object']['Attribute'] = $object['Attribute'];
-                }
-                return $this->RestResponse->viewData(array('Object' => $object['Object']), $this->response->type());
-            }
+                'metadata' => true,
+            ]);
+            return new CakeResponse(['status' => $exists ? 200 : 404]);
+        }
+
+        $objects = $this->MispObject->fetchObjects($this->Auth->user(), array(
+            'conditions' => $this->__objectIdToConditions($id),
+        ));
+        if (empty($objects)) {
             throw new NotFoundException(__('Invalid object.'));
         }
+        $object = $objects[0];
+        if ($this->_isRest()) {
+            if (!empty($object['Event'])) {
+                $object['Object']['Event'] = $object['Event'];
+            }
+            if (!empty($object['Attribute'])) {
+                $object['Object']['Attribute'] = $object['Attribute'];
+            }
+            return $this->RestResponse->viewData(array('Object' => $object['Object']), $this->response->type());
+        } else {
+            $this->redirect('/events/view/' . $object['Object']['event_id']);
+        }
     }
 
     public function orphanedObjectDiagnostics()