Merge pull request #29 from biigle/patch-4

Fix maxBytes check

Author: mzur

src/FileCache.php

@@ -575,16 +575,26 @@ protected function cacheFromResource(File $file, $source, $target)
 
         $cachedPath = $this->getCachedPath($file);
         $maxBytes = intval($this->config['max_file_size']);
-        $bytes = stream_copy_to_stream($source, $target, $maxBytes);
-
-        if ($bytes === $maxBytes) {
-            throw new Exception("The file is too large with more than {$maxBytes} bytes.");
+        // Copy one byte more than allowed to detect files that exceed the limit.
+        // Using $maxBytes directly would reject files of exactly $maxBytes bytes.
+        // Clamp at PHP_INT_MAX to avoid overflowing to float for very large limits.
+        if ($maxBytes < 0) {
+            $copyLimit = -1;
+        } elseif ($maxBytes < PHP_INT_MAX) {
+            $copyLimit = $maxBytes + 1;
+        } else {
+            $copyLimit = PHP_INT_MAX;
         }
+        $bytes = stream_copy_to_stream($source, $target, $copyLimit);
 
         if ($bytes === false) {
             throw new Exception('The source resource is invalid.');
         }
 
+        if ($maxBytes >= 0 && $bytes > $maxBytes) {
+            throw new Exception("The file is too large with more than {$maxBytes} bytes.");
+        }
+
         $metadata = stream_get_meta_data($source);
 
         if (array_key_exists('timed_out', $metadata) && $metadata['timed_out']) {

tests/FileCacheTest.php

@@ -95,6 +95,23 @@ public function testGetRemoteTooLarge()
         $this->assertFalse(is_resource($cache->stream));
     }
 
+    public function testGetRemoteExactlyMaxSize()
+    {
+        $file = new GenericFile('https://files/image.jpg');
+        $cache = new FileCacheStub([
+            'path' => $this->cachePath,
+            'max_file_size' => 3,
+        ]);
+
+        $stream = fopen('php://temp', 'r+');
+        fwrite($stream, 'abc');
+        rewind($stream);
+        $cache->stream = $stream;
+        $path = $cache->get($file, $this->noop);
+        $this->assertEquals(3, filesize($path));
+        $this->assertFalse(is_resource($cache->stream));
+    }
+
     public function testGetDiskDoesNotExist()
     {
         $file = new GenericFile('abc://files/image.jpg');
@@ -180,6 +197,30 @@ public function testGetDiskCloudTooLarge()
         $this->assertFalse(is_resource($stream));
     }
 
+    public function testGetDiskCloudExactlyMaxSize()
+    {
+        config(['filesystems.disks.s3' => ['driver' => 's3']]);
+        $file = new GenericFile('s3://files/image.txt');
+
+        $stream = fopen('php://temp', 'r+');
+        fwrite($stream, 'abc');
+        rewind($stream);
+
+        $mock = Mockery::mock();
+        $mock->shouldReceive('disk')->once()->with('s3')->andReturn($mock);
+        $mock->shouldReceive('readStream')->once()->andReturn($stream);
+        $this->app['filesystem'] = $mock;
+
+        $cache = new FileCache([
+            'path' => $this->cachePath,
+            'max_file_size' => 3,
+        ]);
+
+        $path = $cache->get($file, $this->noop);
+        $this->assertEquals(3, filesize($path));
+        $this->assertFalse(is_resource($stream));
+    }
+
     public function testGetThrowOnLock()
     {
         $cache = new FileCache(['path' => $this->cachePath]);