Content-Type matching

- Ported final changes from zendframework/zendframework#4950 - Updated ContentTypeFilterListener to use new match() methodology from ContentType header
zfcampus · Aug 12, 2013 · 7f3f135 · 7f3f135
1 parent 409f4b9
commit 7f3f135
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 41 deletions.
diff --git a/src/ZF/ContentNegotiation/ContentTypeFilterListener.php b/src/ZF/ContentNegotiation/ContentTypeFilterListener.php
@@ -83,47 +83,16 @@ public function onDispatch(MvcEvent $e)
 
         $headers           = $request->getHeaders();
         $contentTypeHeader = false;
-        if ($headers->has('content-type')) {
-            $contentTypeHeader = $headers->get('content-type');
-            $value             = $contentTypeHeader->getFieldValue();
-            $value             = explode(';', $value, 2);
-            $contentTypeHeader = array_shift($value);
-            $contentTypeHeader = strtolower($contentTypeHeader);
-        }
-
-        $matched = false;
-        if (is_string($this->config[$controllerName])) {
-            $matched = $this->validateContentType($contentTypeHeader, $this->config[$controllerName]);
-        } elseif (is_array($this->config[$controllerName])) {
-            foreach ($this->config[$controllerName] as $whitelistType) {
-                $matched = $this->validateContentType($contentTypeHeader, $whitelistType);
-                if ($matched) {
-                    break;
-                }
-            }
-        }
-
-        if (!$matched) {
+        if (!$headers->has('content-type')) {
             throw new DomainException('Invalid content-type specified', 415);
         }
-    }
 
-    /**
-     * Validate that the content type received matches that in the whitelist
-     * 
-     * @param  string $received 
-     * @param  string $allowed 
-     */
-    protected function validateContentType($received, $allowed)
-    {
-        if (!$received) {
-            return false;
-        }
+        $contentTypeHeader = $headers->get('content-type');
+
+        $matched = $contentTypeHeader->match($this->config[$controllerName]);
 
-        if (strtolower($allowed) === $received) {
-            return true;
+        if (false === $matched) {
+            throw new DomainException('Invalid content-type specified', 415);
         }
-
-        return false;
     }
 }
diff --git a/src/ZF/ContentNegotiation/Header/ContentType.php b/src/ZF/ContentNegotiation/Header/ContentType.php
@@ -77,6 +77,8 @@ public function match($matchAgainst)
         $left      = $this->getMediaTypeObjectFromString($mediaType);
 
         foreach ($matchAgainst as $matchType) {
+            $matchType = strtolower($matchType);
+
             if ($mediaType == $matchType) {
                 return $matchType;
             }
@@ -142,7 +144,7 @@ public function getFieldValue()
      */
     public function setMediaType($mediaType)
     {
-        $this->mediaType = $mediaType;
+        $this->mediaType = strtolower($mediaType);
         $this->value     = null;
         return $this;
     }

diff --git a/test/ZFTest/ContentNegotiation/ContentTypeFilterListenerTest.php b/test/ZFTest/ContentNegotiation/ContentTypeFilterListenerTest.php
@@ -13,10 +13,14 @@ class ContentTypeFilterListenerTest extends TestCase
 {
     public function setUp()
     {
+        $request = new Request();
+        $headers = $request->getHeaders();
+        $headers->getPluginClassLoader()->registerPlugin('contenttype', 'ZF\ContentNegotiation\Header\ContentType');
+
         $this->listener   = new ContentTypeFilterListener();
         $this->event      = new MvcEvent();
         $this->event->setTarget(new TestAsset\ContentTypeController());
-        $this->event->setRequest(new Request);
+        $this->event->setRequest($request);
         $this->event->setRouteMatch(new RouteMatch(array(
             'controller' => __NAMESPACE__ . '\TestAsset\ContentTypeController',
         )));
@@ -44,10 +48,12 @@ public function testListenerRaisesExceptionIfRequestContentTypeIsNotInController
         $contentType = 'application/vnd.zf.v1.foo+json';
         $this->listener->setConfig(array(
             'ZFTest\ContentNegotiation\TestAsset\ContentTypeController' => array(
-                'application/json',
+                'application/xml',
             ),
         ));
-        $this->event->getRequest()->getHeaders()->addHeaderLine('content-type', $contentType);
+        $request = $this->event->getRequest();
+        $request->getHeaders()->addHeaderLine('content-type', $contentType);
+        $request->setContent('<?xml version="1.0"?><foo><bar>baz</bar></foo>');
 
         $this->setExpectedException('ZF\ApiProblem\Exception\DomainException', 'Invalid content-type');
         $this->listener->onDispatch($this->event);