Merge pull request #30 from biigle/patch-5

Fix max size check for remote files

Author: mzur

src/FileCache.php

@@ -319,10 +319,21 @@ protected function existsRemote($file)
         }
 
         $maxBytes = intval($this->config['max_file_size']);
-        $size = intval($response->getHeaderLine('content-length'));
 
-        if ($maxBytes >= 0 && $size > $maxBytes) {
-            throw new Exception("The file is too large with more than {$maxBytes} bytes.");
+        if ($maxBytes >= 0) {
+            $contentLength = $response->getHeaderLine('content-length');
+
+            $contentLength = filter_var($contentLength, FILTER_VALIDATE_INT, [
+                'options' => ['min_range' => 0],
+            ]);
+
+            if ($contentLength === false) {
+                throw new Exception("File size could not be determined (missing or invalid content-length header).");
+            }
+
+            if ($contentLength > $maxBytes) {
+                throw new Exception("The file is too large with more than {$maxBytes} bytes.");
+            }
         }
 
         return true;

tests/FileCacheTest.php

@@ -557,6 +557,50 @@ public function testExistsRemoteMimeNotAllowed()
             $this->assertStringContainsString("type 'application/json' not allowed", $e->getMessage());
         }
     }
+
+    public function testExistsRemoteMissingContentLength()
+    {
+        // A response without content-length when max_file_size is set must fail,
+        // because the size cannot be verified upfront.
+        $mock = new MockHandler([new Response(200)]);
+        $handlerStack = HandlerStack::create($mock);
+        $client = new Client([
+            'handler' => $handlerStack,
+            'http_errors' => false,
+        ]);
+
+        $file = new GenericFile('https://example.com/file');
+        $cache = new FileCache([
+            'path' => $this->cachePath,
+            'max_file_size' => 50,
+        ], client: $client);
+
+        try {
+            $cache->exists($file);
+            $this->fail('Expected an Exception to be thrown.');
+        } catch (Exception $e) {
+            $this->assertStringContainsString('content-length', $e->getMessage());
+        }
+    }
+
+    public function testExistsRemoteMissingContentLengthNoLimit()
+    {
+        // When max_file_size is -1 (no limit), a missing content-length is fine.
+        $mock = new MockHandler([new Response(200)]);
+        $handlerStack = HandlerStack::create($mock);
+        $client = new Client([
+            'handler' => $handlerStack,
+            'http_errors' => false,
+        ]);
+
+        $file = new GenericFile('https://example.com/file');
+        $cache = new FileCache([
+            'path' => $this->cachePath,
+            'max_file_size' => -1,
+        ], client: $client);
+
+        $this->assertTrue($cache->exists($file));
+    }
 }
 
 class FileCacheStub extends FileCache