Only allow chunked-encoding for requests

Author: legionth

README.md

@@ -93,9 +93,9 @@ Failing to do so will result in the server parsing the incoming request,
 but never sending a response back to the client.
 
 The `Server` supports both HTTP/1.1 and HTTP/1.0 request messages.
-If a client sends an invalid request message or uses an invalid HTTP protocol
-version, it will emit an `error` event, send an HTTP error response to the
-client and close the connection:
+If a client sends an invalid request message, uses an invalid HTTP protocol
+version or sends an invalid `Transfer-Encoding` in the request header, it will
+emit an `error` event, send an HTTP error response to the client and close the connection:
 
 ```php
 $http->on('error', function (Exception $e) {

src/Server.php

@@ -143,16 +143,18 @@ public function handleRequest(ConnectionInterface $conn, RequestInterface $reque
         $contentLength = 0;
         $stream = new CloseProtectionStream($conn);
         if ($request->hasHeader('Transfer-Encoding')) {
-            $transferEncodingHeader = $request->getHeader('Transfer-Encoding');
-            // 'chunked' must always be the final value of 'Transfer-Encoding' according to: https://tools.ietf.org/html/rfc7230#section-3.3.1
-            if (strtolower(end($transferEncodingHeader)) === 'chunked') {
-                $stream = new ChunkedDecoder($stream);
 
-                $request = $request->withoutHeader('Transfer-Encoding');
-                $request = $request->withoutHeader('Content-Length');
-
-                $contentLength = null;
+            if (strtolower($request->getHeaderLine('Transfer-Encoding')) !== 'chunked') {
+                $this->emit('error', array(new \InvalidArgumentException('Only chunked-encoding is allowed for Transfer-Encoding')));
+                return $this->writeError($conn, 501);
             }
+
+            $stream = new ChunkedDecoder($stream);
+
+            $request = $request->withoutHeader('Transfer-Encoding');
+            $request = $request->withoutHeader('Content-Length');
+
+            $contentLength = null;
         } elseif ($request->hasHeader('Content-Length')) {
             $string = $request->getHeaderLine('Content-Length');
 

tests/ServerTest.php

@@ -1428,6 +1428,42 @@ function ($data) use (&$buffer) {
         $this->assertContains("\r\n\r\n", $buffer);
     }
 
+    public function testOnlyChunkedEncodingIsAllowedForTransferEncoding()
+    {
+        $error = null;
+
+        $server = new Server($this->socket);
+        $server->on('request', $this->expectCallableNever());
+        $server->on('error', function ($exception) use (&$error) {
+            $error = $exception;
+        });
+
+        $buffer = '';
+        $this->connection
+            ->expects($this->any())
+            ->method('write')
+            ->will(
+                $this->returnCallback(
+                    function ($data) use (&$buffer) {
+                        $buffer .= $data;
+                    }
+                )
+            );
+        $this->socket->emit('connection', array($this->connection));
+
+        $data = "GET / HTTP/1.1\r\n";
+        $data .= "Host: example.com:80\r\n";
+        $data .= "Connection: close\r\n";
+        $data .= "Transfer-Encoding: custom\r\n";
+        $data .= "\r\n";
+
+        $this->connection->emit('data', array($data));
+
+        $this->assertContains("HTTP/1.1 501 Not Implemented\r\n", $buffer);
+        $this->assertContains("\r\n\r\nError 501: Not Implemented", $buffer);
+        $this->assertInstanceOf('InvalidArgumentException', $error);
+    }
+
     private function createGetRequest()
     {
         $data = "GET / HTTP/1.1\r\n";