Make sure an Exception in the FormatNegotiator causes a 406 response

FriendsOfSymfony · Nov 24, 2015 · 1af7cab · 1af7cab
1 parent 4c24162
commit 1af7cab
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/Controller/ExceptionController.php b/Controller/ExceptionController.php
@@ -60,12 +60,16 @@ protected function createExceptionWrapper(array $parameters)
      */
     public function showAction(Request $request, FlattenException $exception, DebugLoggerInterface $logger = null)
     {
-        $format = $this->getFormat($request, $request->getRequestFormat());
+        try {
+            $format = $this->getFormat($request, $request->getRequestFormat());
+        } catch (\Exception $e) {
+            $format = null;
+        }
         if (null === $format) {
             $message = 'No matching accepted Response format could be determined, while handling: ';
             $message .= $this->getExceptionMessage($exception);
 
-            return new Response($message, Response::HTTP_NOT_ACCEPTABLE, $exception->getHeaders());
+            return $this->createPlainResponse($message, Response::HTTP_NOT_ACCEPTABLE, $exception->getHeaders());
         }
 
         $currentContent = $this->getAndCleanOutputBuffering(
@@ -76,7 +80,6 @@ public function showAction(Request $request, FlattenException $exception, DebugL
         $viewHandler = $this->container->get('fos_rest.view_handler');
         $parameters = $this->getParameters($viewHandler, $currentContent, $code, $exception, $logger, $format);
         $showException = $request->attributes->get('showException', $this->container->get('kernel')->isDebug());
-
         try {
             if (!$viewHandler->isFormatTemplating($format)) {
                 $parameters = $this->createExceptionWrapper($parameters);
@@ -93,12 +96,28 @@ public function showAction(Request $request, FlattenException $exception, DebugL
         } catch (\Exception $e) {
             $message = 'An Exception was thrown while handling: ';
             $message .= $this->getExceptionMessage($exception);
-            $response = new Response($message, Response::HTTP_INTERNAL_SERVER_ERROR, $exception->getHeaders());
+            $response = $this->createPlainResponse($message, Response::HTTP_INTERNAL_SERVER_ERROR, $exception->getHeaders());
         }
 
         return $response;
     }
 
+    /**
+     * Returns a Response Object with content type text/plain.
+     *
+     * @param string $content
+     * @param int    $status
+     * @param array  $headers
+     *
+     * @return Response
+     */
+    private function createPlainResponse($content, $status, $headers)
+    {
+        $headers['content-type'] = 'text/plain';
+
+        return new Response($content, $status, $headers);
+    }
+
     /**
      * Gets and cleans any content that was already outputted.
      *