Return HTTP 400 on MissingParameterException

refs #8886
Icinga · Apr 7, 2015 · 25736cf · 25736cf
1 parent dfd8c91
commit 25736cf
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
@@ -3,6 +3,7 @@
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
+use Icinga\Exception\MissingParameterException;
 use Icinga\Security\SecurityException;
 use Icinga\Web\Controller\ActionController;
 
@@ -42,19 +43,26 @@ public function errorAction()
                 }
 
                 break;
-            case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_OTHER:
-                if ($exception instanceof SecurityException) {
-                    $this->getResponse()->setHttpResponseCode(403);
-                    $this->view->message = $exception->getMessage();
-                    break;
-                }
-                // Move to default
             default:
+                switch (true) {
+                    case $exception instanceof SecurityException:
+                        $this->getResponse()->setHttpResponseCode(403);
+                        break;
+                    case $exception instanceof MissingParameterException:
+                        $this->getResponse()->setHttpResponseCode(400);
+                        $this->getResponse()->setHeader(
+                            'X-Status-Reason',
+                            'Missing parameter ' . $exception->getParameter()
+                        );
+                        break;
+                    default:
+                        $this->getResponse()->setHttpResponseCode(500);
+                        break;
+                }
                 $title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
-                $this->getResponse()->setHttpResponseCode(500);
                 $this->view->title = 'Server error: ' . $title;
                 $this->view->message = $exception->getMessage();
-                if ($this->getInvokeArg('displayExceptions') == true) {
+                if ($this->getInvokeArg('displayExceptions')) {
                     $this->view->stackTrace = $exception->getTraceAsString();
                 }
                 break;