Merge pull request #111 from spatie/improve-unserializable-response-h…

…andling

Improve unserializable response handling

src/Exceptions/CouldNotUnserialize.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spatie\ResponseCache\Exceptions;
+
+use Exception;
+
+class CouldNotUnserialize extends Exception
+{
+    public static function serializedResponse(string $serializedResponse): self
+    {
+        return new static("Could not unserialize `{$serializedResponse}`");
+    }
+}

src/ResponseSerializer.php

@@ -3,6 +3,7 @@
 namespace Spatie\ResponseCache;
 
 use Symfony\Component\HttpFoundation\Response;
+use Spatie\ResponseCache\Exceptions\CouldNotUnserialize;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class ResponseSerializer
@@ -19,6 +20,10 @@ public function unserialize(string $serializedResponse): Response
     {
         $responseProperties = unserialize($serializedResponse);
 
+        if (! $this->containsValidResponseProperties($responseProperties)) {
+            throw CouldNotUnserialize::serializedResponse($serializedResponse);
+        }
+
         $response = $this->buildResponse($responseProperties);
 
         $response->headers = $responseProperties['headers'];
@@ -44,6 +49,19 @@ protected function getResponseData(Response $response): array
         return compact('statusCode', 'headers', 'content', 'type');
     }
 
+    protected function containsValidResponseProperties($properties): bool
+    {
+        if (! is_array($properties)) {
+            return false;
+        }
+
+        if (! isset($properties['content'], $properties['statusCode'])) {
+            return false;
+        }
+
+        return true;
+    }
+
     protected function buildResponse(array $responseProperties): Response
     {
         $type = $responseProperties['type'] ?? self::RESPONSE_TYPE_NORMAL;

tests/ResponseSerializerTest.php

@@ -4,6 +4,7 @@
 
 use Spatie\ResponseCache\ResponseSerializer;
 use Symfony\Component\HttpFoundation\Response;
+use Spatie\ResponseCache\Exceptions\CouldNotUnserialize;
 
 class ResponseSerializerTest extends TestCase
 {
@@ -46,4 +47,12 @@ public function it_can_serialize_and_unserialize_a_response()
 
         $this->assertEquals('testValue', $unserializedResponse->headers->get('testHeader'));
     }
+
+    /** @test */
+    public function it_throws_an_exception_when_something_else_than_a_response_is_unserialized()
+    {
+        $this->expectException(CouldNotUnserialize::class);
+
+        $this->responseSerializer->unserialize('b:0;');
+    }
 }