updates validation

Author: joedixon

src/Protocols/Pusher/ClientEvent.php

@@ -2,6 +2,7 @@
 
 namespace Laravel\Reverb\Protocols\Pusher;
 
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Laravel\Reverb\Contracts\Connection;
 
@@ -12,6 +13,12 @@ class ClientEvent
      */
     public static function handle(Connection $connection, array $event): ?ClientEvent
     {
+        Validator::make($event, [
+            'event' => ['required', 'string'],
+            'channel' => ['required', 'string'],
+            'data' => ['required', 'array'],
+        ])->validate();
+
         if (! Str::startsWith($event['event'], 'client-')) {
             return null;
         }

src/Protocols/Pusher/EventHandler.php

@@ -3,6 +3,7 @@
 namespace Laravel\Reverb\Protocols\Pusher;
 
 use Exception;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Laravel\Reverb\Contracts\Connection;
 use Laravel\Reverb\Protocols\Pusher\Channels\CacheChannel;
@@ -24,14 +25,11 @@ public function __construct(protected ChannelManager $channels)
      */
     public function handle(Connection $connection, string $event, array $payload = []): void
     {
-        match (Str::after($event, 'pusher:')) {
+        $event = Str::after($event, 'pusher:');
+
+        match ($event) {
             'connection_established' => $this->acknowledge($connection),
-            'subscribe' => $this->subscribe(
-                $connection,
-                $payload['channel'],
-                $payload['auth'] ?? null,
-                $payload['channel_data'] ?? null
-            ),
+            'subscribe' => $this->subscribe($connection, $payload),
             'unsubscribe' => $this->unsubscribe($connection, $payload['channel']),
             'ping' => $this->pong($connection),
             'pong' => $connection->touch(),
@@ -53,13 +51,19 @@ public function acknowledge(Connection $connection): void
     /**
      * Subscribe to the given channel.
      */
-    public function subscribe(Connection $connection, string $channel, ?string $auth = null, ?string $data = null): void
+    public function subscribe(Connection $connection, array $payload): void
     {
+        $validated = Validator::make($payload, [
+            'channel' => ['required', 'string'],
+            'auth' => ['nullable', 'string'],
+            'channel_data' => ['nullable', 'json'],
+        ])->validate();
+
         $channel = $this->channels
             ->for($connection->app())
-            ->findOrCreate($channel);
+            ->findOrCreate($channel = $validated['channel']);  
 
-        $channel->subscribe($connection, $auth, $data);
+        $channel->subscribe($connection, $validated['auth'] ?? null, $validated['channel_data'] ?? null);
 
         $this->afterSubscribe($channel, $connection);
     }

src/Protocols/Pusher/Server.php

@@ -13,6 +13,7 @@
 use Laravel\Reverb\Protocols\Pusher\Exceptions\PusherException;
 use Ratchet\RFC6455\Messaging\Frame;
 use Ratchet\RFC6455\Messaging\FrameInterface;
+use Throwable;
 
 class Server
 {
@@ -55,29 +56,21 @@ public function message(Connection $from, string $message): void
         try {
             $event = json_decode($message, associative: true, flags: JSON_THROW_ON_ERROR);
 
-            Validator::make($event, [
-                'event' => ['required', 'string'],
-                'data' => ['nullable', 'array'],
-                'channel' => ['nullable', 'string'],
-                'data.channel' => ['required', 'string'],
-                'data.auth' => ['nullable', 'string'],
-                'data.channel_data' => ['nullable', 'json'],
-            ])->validate();
+            Validator::make($event, ['event' => ['required', 'string']])->validate();
 
             match (Str::startsWith($event['event'], 'pusher:')) {
                 true => $this->handler->handle(
                     $from,
                     $event['event'],
                     empty($event['data']) ? [] : $event['data'],
-                    $event['channel'] ?? null
                 ),
                 default => ClientEvent::handle($from, $event)
             };
 
             Log::info('Message Handled', $from->id());
 
             MessageReceived::dispatch($from, $message);
-        } catch (Exception $e) {
+        } catch (Throwable $e) {
             $this->error($from, $e);
         }
     }
@@ -114,7 +107,7 @@ public function close(Connection $connection): void
     /**
      * Handle an error.
      */
-    public function error(Connection $connection, Exception $exception): void
+    public function error(Connection $connection, Throwable $exception): void
     {
         if ($exception instanceof PusherException) {
             $connection->send(json_encode($exception->payload()));

tests/Unit/Protocols/Pusher/ServerTest.php

@@ -331,7 +331,6 @@
 ]);
 
 it('sends an error if something fails for event type', function () {
-
     $this->server->message(
         $connection = new FakeConnection,
         json_encode([
@@ -349,7 +348,6 @@
 });
 
 it('sends an error if something fails for data type', function () {
-
     $this->server->message(
         $connection = new FakeConnection,
         json_encode([
@@ -368,7 +366,6 @@
 });
 
 it('sends an error if something fails for data channel type', function () {
-
     $this->server->message(
         $connection = new FakeConnection,
         json_encode([
@@ -407,7 +404,6 @@
 });
 
 it('sends an error if something fails for data auth type', function () {
-
     $this->server->message(
         $connection = new FakeConnection,
         json_encode([
@@ -429,7 +425,6 @@
 });
 
 it('sends an error if something fails for data channel_data type', function () {
-
     $this->server->message(
         $connection = new FakeConnection,
         json_encode([
@@ -472,7 +467,6 @@
 });
 
 it('sends an error if something fails for channel type', function () {
-
     $this->server->message(
         $connection = new FakeConnection,
         json_encode([