[1.x] Sends content length to address OpenSSL issue (#167)

* send content length

* test content-length

src/Protocols/Pusher/Http/Controllers/ChannelController.php

@@ -4,9 +4,9 @@
 
 use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
 use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
 
 class ChannelController extends Controller
 {
@@ -20,6 +20,6 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
         return app(MetricsHandler::class)->gather($this->application, 'channel', [
             'channel' => $channel,
             'info' => ($info = $this->query['info']) ? $info.',occupied' : 'occupied',
-        ])->then(fn ($channel) => new JsonResponse((object) $channel));
+        ])->then(fn ($channel) => new Response((object) $channel));
     }
 }

src/Protocols/Pusher/Http/Controllers/ChannelUsersController.php

@@ -5,10 +5,9 @@
 use Laravel\Reverb\Protocols\Pusher\Concerns\InteractsWithChannelInformation;
 use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
 use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
 
 class ChannelUsersController extends Controller
 {
@@ -24,15 +23,15 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
         $channel = $this->channels->find($channel);
 
         if (! $channel) {
-            return new JsonResponse((object) [], 404);
+            return new Response((object) [], 404);
         }
 
         if (! $this->isPresenceChannel($channel)) {
-            return new JsonResponse((object) [], 400);
+            return new Response((object) [], 400);
         }
 
         return app(MetricsHandler::class)
             ->gather($this->application, 'channel_users', ['channel' => $channel->name()])
-            ->then(fn ($connections) => new JsonResponse(['users' => $connections]));
+            ->then(fn ($connections) => new Response(['users' => $connections]));
     }
 }

src/Protocols/Pusher/Http/Controllers/ChannelsController.php

@@ -4,9 +4,9 @@
 
 use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
 use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
 
 class ChannelsController extends Controller
 {
@@ -20,6 +20,6 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
         return app(MetricsHandler::class)->gather($this->application, 'channels', [
             'filter' => $this->query['filter_by_prefix'] ?? null,
             'info' => $this->query['info'] ?? null,
-        ])->then(fn ($channels) => new JsonResponse(['channels' => array_map(fn ($item) => (object) $item, $channels)]));
+        ])->then(fn ($channels) => new Response(['channels' => array_map(fn ($item) => (object) $item, $channels)]));
     }
 }

src/Protocols/Pusher/Http/Controllers/ConnectionsController.php

@@ -4,9 +4,9 @@
 
 use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
 use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
 
 class ConnectionsController extends Controller
 {
@@ -18,6 +18,6 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
         $this->verify($request, $connection, $appId);
 
         return app(MetricsHandler::class)->gather($this->application, 'connections')
-            ->then(fn ($connections) => new JsonResponse(['connections' => count($connections)]));
+            ->then(fn ($connections) => new Response(['connections' => count($connections)]));
     }
 }

src/Protocols/Pusher/Http/Controllers/EventsBatchController.php

@@ -8,10 +8,9 @@
 use Laravel\Reverb\Protocols\Pusher\EventDispatcher;
 use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
 use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
 
 use function React\Promise\all;
 
@@ -31,7 +30,7 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
         $validator = $this->validator($payload);
 
         if ($validator->fails()) {
-            return new JsonResponse($validator->errors(), 422);
+            return new Response($validator->errors(), 422);
         }
 
         $items = collect($payload['batch']);
@@ -56,11 +55,11 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
 
         if ($items->contains(fn ($item) => ! empty($item))) {
             return all($items)->then(function ($items) {
-                return new JsonResponse(['batch' => array_map(fn ($item) => (object) $item, $items)]);
+                return new Response(['batch' => array_map(fn ($item) => (object) $item, $items)]);
             });
         }
 
-        return new JsonResponse(['batch' => (object) []]);
+        return new Response(['batch' => (object) []]);
     }
 
     /**

src/Protocols/Pusher/Http/Controllers/EventsController.php

@@ -9,10 +9,9 @@
 use Laravel\Reverb\Protocols\Pusher\EventDispatcher;
 use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
 use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
 
 class EventsController extends Controller
 {
@@ -30,7 +29,7 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
         $validator = $this->validator($payload);
 
         if ($validator->fails()) {
-            return new JsonResponse($validator->errors(), 422);
+            return new Response($validator->errors(), 422);
         }
 
         $channels = Arr::wrap($payload['channels'] ?? $payload['channel'] ?? []);
@@ -51,10 +50,10 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
         if (isset($payload['info'])) {
             return app(MetricsHandler::class)
                 ->gather($this->application, 'channels', ['info' => $payload['info'], 'channels' => $channels])
-                ->then(fn ($channels) => new JsonResponse(['channels' => array_map(fn ($channel) => (object) $channel, $channels)]));
+                ->then(fn ($channels) => new Response(['channels' => array_map(fn ($channel) => (object) $channel, $channels)]));
         }
 
-        return new JsonResponse((object) []);
+        return new Response((object) []);
     }
 
     /**

src/Protocols/Pusher/Http/Controllers/UsersTerminateController.php

@@ -5,10 +5,9 @@
 use Laravel\Reverb\ServerProviderManager;
 use Laravel\Reverb\Servers\Reverb\Contracts\PubSubProvider;
 use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
 use Psr\Http\Message\RequestInterface;
 use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
 
 class UsersTerminateController extends Controller
 {
@@ -24,7 +23,7 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
                 'type' => 'terminate',
                 'application' => serialize($this->application),
                 'payload' => ['user_id' => $userId],
-            ])->then(fn () => new JsonResponse((object) []));
+            ])->then(fn () => new Response((object) []));
         }
 
         $connections = collect($this->channels->connections());
@@ -35,6 +34,6 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
             }
         });
 
-        return new JsonResponse((object) []);
+        return new Response((object) []);
     }
 }

src/Servers/Reverb/Http/Response.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Laravel\Reverb\Servers\Reverb\Http;
+
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class Response extends JsonResponse
+{
+    /**
+     * Create a new Http response instance.
+     */
+    public function __construct(mixed $data = null, int $status = 200, array $headers = [], bool $json = false)
+    {
+        parent::__construct($data, $status, $headers, $json);
+
+        $this->headers->set('Content-Length', strlen($this->content));
+    }
+}

tests/Feature/Protocols/Pusher/Reverb/ChannelControllerTest.php

@@ -59,6 +59,15 @@
     expect($response->getBody()->getContents())->toBe('{"occupied":true,"subscription_count":1}');
 });
 
+it('can send the content-length header', function () {
+    subscribe('test-channel-one');
+    subscribe('test-channel-one');
+
+    $response = await($this->signedRequest('channels/test-channel-one?info=user_count,subscription_count,cache'));
+
+    expect($response->getHeader('Content-Length'))->toBe(['40']);
+});
+
 it('can gather data for a single channel', function () {
     $this->usingRedis();
 
@@ -121,3 +130,14 @@
     expect($response->getStatusCode())->toBe(200);
     expect($response->getBody()->getContents())->toBe('{"occupied":true,"subscription_count":1}');
 });
+
+it('can send the content-length header when gathering results', function () {
+    $this->usingRedis();
+
+    subscribe('test-channel-one');
+    subscribe('test-channel-one');
+
+    $response = await($this->signedRequest('channels/test-channel-one?info=user_count,subscription_count,cache'));
+
+    expect($response->getHeader('Content-Length'))->toBe(['40']);
+});

tests/Feature/Protocols/Pusher/Reverb/ChannelUsersControllerTest.php

@@ -61,6 +61,19 @@
     await($this->signedRequest('channels/presence-test-channel/users'));
 })->throws(ResponseException::class);
 
+it('can send the content-length header', function () {
+    $channel = app(ChannelManager::class)
+        ->for(app()->make(ApplicationProvider::class)->findByKey('reverb-key'))
+        ->findOrCreate('presence-test-channel');
+    $channel->subscribe($connection = new FakeConnection('test-connection-one'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 1, 'user_info' => ['name' => 'Taylor']])), $data);
+    $channel->subscribe($connection = new FakeConnection('test-connection-two'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 2, 'user_info' => ['name' => 'Joe']])), $data);
+    $channel->subscribe($connection = new FakeConnection('test-connection-three'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 3, 'user_info' => ['name' => 'Jess']])), $data);
+
+    $response = await($this->signedRequest('channels/presence-test-channel/users'));
+
+    expect($response->getHeader('Content-Length'))->toBe(['38']);
+});
+
 it('gathers the user data', function () {
     $this->usingRedis();
 
@@ -92,3 +105,18 @@
     expect($response->getStatusCode())->toBe(200);
     expect($response->getBody()->getContents())->toBe('{"users":[{"id":2},{"id":3}]}');
 });
+
+it('can send the content-length header when gathering results', function () {
+    $this->usingRedis();
+
+    $channel = app(ChannelManager::class)
+        ->for(app()->make(ApplicationProvider::class)->findByKey('reverb-key'))
+        ->findOrCreate('presence-test-channel');
+    $channel->subscribe($connection = new FakeConnection('test-connection-one'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 1, 'user_info' => ['name' => 'Taylor']])), $data);
+    $channel->subscribe($connection = new FakeConnection('test-connection-two'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 2, 'user_info' => ['name' => 'Joe']])), $data);
+    $channel->subscribe($connection = new FakeConnection('test-connection-three'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 3, 'user_info' => ['name' => 'Jess']])), $data);
+
+    $response = await($this->signedRequest('channels/presence-test-channel/users'));
+
+    expect($response->getHeader('Content-Length'))->toBe(['38']);
+});

tests/Feature/Protocols/Pusher/Reverb/ChannelsControllerTest.php

@@ -51,6 +51,15 @@
     expect($response->getBody()->getContents())->toBe('{"channels":{"test-channel-two":{}}}');
 });
 
+it('can send the content-length header', function () {
+    subscribe('test-channel-one');
+    subscribe('presence-test-channel-two');
+
+    $response = await($this->signedRequest('channels?info=user_count'));
+
+    expect($response->getHeader('Content-Length'))->toBe(['81']);
+});
+
 it('can gather all channel information', function () {
     $this->usingRedis();
 
@@ -102,3 +111,14 @@
     expect($response->getStatusCode())->toBe(200);
     expect($response->getBody()->getContents())->toBe('{"channels":{"test-channel-two":{}}}');
 });
+
+it('can send the content-length header when gathering results', function () {
+    $this->usingRedis();
+
+    subscribe('test-channel-one');
+    subscribe('presence-test-channel-two');
+
+    $response = await($this->signedRequest('channels?info=user_count'));
+
+    expect($response->getHeader('Content-Length'))->toBe(['81']);
+});

tests/Feature/Protocols/Pusher/Reverb/ConnectionsControllerTest.php

@@ -27,6 +27,15 @@
     expect($response->getBody()->getContents())->toBe('{"connections":1}');
 });
 
+it('can send the content-length header', function () {
+    subscribe('test-channel-one');
+    subscribe('presence-test-channel-two');
+
+    $response = await($this->signedRequest('connections'));
+
+    expect($response->getHeader('Content-Length'))->toBe(['17']);
+});
+
 it('can gather a connection count', function () {
     $this->usingRedis();
 
@@ -51,3 +60,14 @@
     expect($response->getStatusCode())->toBe(200);
     expect($response->getBody()->getContents())->toBe('{"connections":1}');
 });
+
+it('can send the content-length header when gathering results', function () {
+    $this->usingRedis();
+
+    subscribe('test-channel-one');
+    subscribe('presence-test-channel-two');
+
+    $response = await($this->signedRequest('connections'));
+
+    expect($response->getHeader('Content-Length'))->toBe(['17']);
+});

tests/Feature/Protocols/Pusher/Reverb/EventsBatchControllerTest.php

@@ -87,6 +87,18 @@
     expect($response->getBody()->getContents())->toBe('{"batch":[{"user_count":1},{}]}');
 });
 
+it('can send the content-length header', function () {
+    $response = await($this->signedPostRequest('batch_events', ['batch' => [
+        [
+            'name' => 'NewEvent',
+            'channel' => 'test-channel',
+            'data' => json_encode(['some' => 'data']),
+        ],
+    ]]));
+
+    expect($response->getHeader('Content-Length'))->toBe(['12']);
+});
+
 it('can receive an event batch trigger with multiple events and gather info for each', function () {
     $this->usingRedis();
 
@@ -145,3 +157,17 @@
 
     expect($response->getStatusCode())->toBe(500);
 })->throws(ResponseException::class, exceptionCode: 500);
+
+it('can send the content-length header when gathering results', function () {
+    $this->usingRedis();
+
+    $response = await($this->signedPostRequest('batch_events', ['batch' => [
+        [
+            'name' => 'NewEvent',
+            'channel' => 'test-channel',
+            'data' => json_encode(['some' => 'data']),
+        ],
+    ]]));
+
+    expect($response->getHeader('Content-Length'))->toBe(['12']);
+});

tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php

@@ -197,3 +197,13 @@
 it('fails when app cannot be found', function () {
     await($this->signedPostRequest('events', appId: 'invalid-app-id'));
 })->throws(ResponseException::class, exceptionCode: 404);
+
+it('can send the content-length header', function () {
+    $response = await($this->signedPostRequest('events', [
+        'name' => 'NewEvent',
+        'channel' => 'test-channel',
+        'data' => json_encode(['some' => 'data']),
+    ]));
+
+    expect($response->getHeader('Content-Length'))->toBe(['2']);
+});