Fix content type charset check

soyuka · soyuka · commit 25387a5075b2 · 2020-07-16T10:18:25.000+02:00
diff --git a/src/Symfony/Component/HttpClient/EventSourceHttpClient.php b/src/Symfony/Component/HttpClient/EventSourceHttpClient.php
@@ -33,7 +33,7 @@ final class EventSourceHttpClient implements HttpClientInterface
 
     public function __construct(HttpClientInterface $client = null, float $reconnectionTime = 10.0)
     {
-        $this->client = $client ?: HttpClient::create();
+        $this->client = $client ?? HttpClient::create();
         $this->reconnectionTime = $reconnectionTime;
     }
 
@@ -100,7 +100,7 @@ public function request(string $method, string $url, array $options = []): Respo
             }
 
             if ($chunk->isFirst()) {
-                if (0 === strpos($context->getHeaders()['content-type'][0] ?? '', 'text/event-stream')) {
+                if (preg_match('/^text\/event-stream(;|$)/i', $context->getHeaders()['content-type'][0] ?? '')) {
                     $state->buffer = '';
                 } elseif (null !== $lastError || (null !== $state->buffer && 200 === $context->getStatusCode())) {
                     throw new EventSourceException(sprintf('Response content-type is "%s" while "text/event-stream" was expected for "%s".', $context->getHeaders()['content-type'][0] ?? '', $context->getInfo('url')));
diff --git a/src/Symfony/Component/HttpClient/Tests/EventSourceHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/EventSourceHttpClientTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\HttpClient\Chunk\FirstChunk;
 use Symfony\Component\HttpClient\Chunk\ServerSentEvent;
 use Symfony\Component\HttpClient\EventSourceHttpClient;
+use Symfony\Component\HttpClient\Exception\EventSourceException;
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\HttpClient\Response\ResponseStream;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -108,4 +109,61 @@ public function testGetServerSentEvents()
             }
         }
     }
+
+    /**
+     * @dataProvider contentTypeProvider
+     */
+    public function testContentType($contentType, $expected)
+    {
+        $chunk = new DataChunk(0, '');
+        $response = new MockResponse('', ['canceled' => false, 'http_method' => 'GET', 'url' => 'http://localhost:8080/events', 'response_headers' => ['content-type: '.$contentType]]);
+        $responseStream = new ResponseStream((function () use ($response, $chunk) {
+            yield $response => new FirstChunk();
+            yield $response => $chunk;
+            yield $response => new ErrorChunk(0, 'timeout');
+        })());
+
+        $hasCorrectHeaders = function ($options) {
+            $this->assertSame(['Accept: text/event-stream', 'Cache-Control: no-cache'], $options['headers']);
+
+            return true;
+        };
+
+        $httpClient = $this->createMock(HttpClientInterface::class);
+        $httpClient->method('request')->with('GET', 'http://localhost:8080/events', $this->callback($hasCorrectHeaders))->willReturn($response);
+
+        $httpClient->method('stream')->willReturn($responseStream);
+
+        $es = new EventSourceHttpClient($httpClient);
+        $res = $es->connect('http://localhost:8080/events');
+
+        if ($expected instanceof EventSourceException) {
+            $this->expectExceptionMessage($expected->getMessage());
+        }
+
+        foreach ($es->stream($res) as $chunk) {
+            if ($chunk->isTimeout()) {
+                continue;
+            }
+
+            if ($chunk->isLast()) {
+                return;
+            }
+        }
+    }
+
+    public function contentTypeProvider()
+    {
+        return [
+            ['text/event-stream', true],
+            ['text/event-stream;charset=utf-8', true],
+            ['text/event-stream;charset=UTF-8', true],
+            ['Text/EVENT-STREAM;Charset="utf-8"', true],
+            ['text/event-stream; charset="utf-8"', true],
+            ['text/event-stream; charset=iso-8859-15', true],
+            ['text/html', new EventSourceException('Response content-type is "text/html" while "text/event-stream" was expected for "http://localhost:8080/events".')],
+            ['text/html; charset="utf-8"', new EventSourceException('Response content-type is "text/html; charset="utf-8"" while "text/event-stream" was expected for "http://localhost:8080/events".')],
+            ['text/event-streambla', new EventSourceException('Response content-type is "text/event-streambla" while "text/event-stream" was expected for "http://localhost:8080/events".')],
+        ];
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ final class EventSourceHttpClient implements HttpClientInterface`
`33`	`33`
`34`	`34`	`public function __construct(HttpClientInterface $client = null, float $reconnectionTime = 10.0)`
`35`	`35`	`{`
`36`		`- $this->client = $client ?: HttpClient::create();`
	`36`	`+ $this->client = $client ?? HttpClient::create();`
`37`	`37`	`$this->reconnectionTime = $reconnectionTime;`
`38`	`38`	`}`
`39`	`39`
`@@ -100,7 +100,7 @@ public function request(string $method, string $url, array $options = []): Respo`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if ($chunk->isFirst()) {`
`103`		`- if (0 === strpos($context->getHeaders()['content-type'][0] ?? '', 'text/event-stream')) {`
	`103`	`+ if (preg_match('/^text\/event-stream(;\|$)/i', $context->getHeaders()['content-type'][0] ?? '')) {`
`104`	`104`	`$state->buffer = '';`
`105`	`105`	`} elseif (null !== $lastError \|\| (null !== $state->buffer && 200 === $context->getStatusCode())) {`
`106`	`106`	`throw new EventSourceException(sprintf('Response content-type is "%s" while "text/event-stream" was expected for "%s".', $context->getHeaders()['content-type'][0] ?? '', $context->getInfo('url')));`