From 251eb4f9a5ad91053177f94ab00ab49a745c833c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 16 Dec 2016 12:07:01 +0100
Subject: [PATCH] ObjectController: add explicit NotFoundError...

...handling for REST API requests

fixes #13641
---
 .../Web/Controller/ObjectController.php       | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/library/Director/Web/Controller/ObjectController.php b/library/Director/Web/Controller/ObjectController.php
index 779ec34f..9119c5a6 100644
--- a/library/Director/Web/Controller/ObjectController.php
+++ b/library/Director/Web/Controller/ObjectController.php
@@ -7,10 +7,8 @@ use Icinga\Exception\IcingaException;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Exception\NotFoundError;
 use Icinga\Module\Director\Exception\NestingError;
-use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
-use Icinga\Web\Url;
 
 abstract class ObjectController extends ActionController
 {
@@ -27,6 +25,23 @@ abstract class ObjectController extends ActionController
     {
         parent::init();
 
+        if ($this->getRequest()->isApiRequest()) {
+            $response = $this->getResponse();
+            try {
+                $this->loadObject();
+                return $this->handleApiRequest();
+            } catch (NotFoundError $e) {
+                $response->setHttpResponseCode(404);
+                return $this->sendJson((object) array('error' => $e->getMessage()));
+            } catch (Exception $e) {
+                if ($response->getHttpResponseCode() === 200) {
+                    $response->setHttpResponseCode(500);
+                }
+
+                return $this->sendJson((object) array('error' => $e->getMessage()));
+            }
+        }
+
         $type = strtolower($this->getType());
 
         if ($object = $this->loadObject()) {
@@ -81,16 +96,7 @@ abstract class ObjectController extends ActionController
     public function indexAction()
     {
         if ($this->getRequest()->isApiRequest()) {
-            try {
-                return $this->handleApiRequest();
-            } catch (Exception $e) {
-                $response = $this->getResponse();
-                if ($response->getHttpResponseCode() === 200) {
-                    $response->setHttpResponseCode(500);
-                }
-
-                return $this->sendJson((object) array('error' => $e->getMessage()));
-            }
+            return;
         }
 
         if ($this->object