Use resource stream for instead of file path (sunspikes#14)

vigneshgurusamy · Jul 3, 2018 · d52c441 · d52c441
1 parent baf4c90
commit d52c441
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/ClamavValidator/ClamavValidator.php b/src/ClamavValidator/ClamavValidator.php
@@ -61,8 +61,13 @@ public function validateClamav($attribute, $value, $parameters)
         // Create a new instance of the Client
         $quahog = new Client($socket, self::CLAMAV_SOCKET_READ_TIMEOUT, PHP_NORMAL_READ);
 
+        // Check if the file is readable
+        if (! is_readable($file)) {
+            throw new ClamavValidatorException(sprintf('The file "%s" is not readable', $file));
+        }
+
         // Scan the file
-        $result = $quahog->scanFile($file);
+        $result = $quahog->scanResourceStream(fopen($file, 'rb'));
 
         if (self::CLAMAV_STATUS_ERROR === $result['status']) {
             throw new ClamavValidatorException($result['reason']);

diff --git a/tests/ValidatorClamavTest.php b/tests/ValidatorClamavTest.php
@@ -64,6 +64,8 @@ public function testValidatesVirus()
 
     public function testValidatesError()
     {
+        $this->setExpectedException(ClamavValidatorException::class, 'is not readable');
+
         $validator = new ClamavValidator(
             $this->translator,
             $this->error_data,
@@ -73,8 +75,6 @@ public function testValidatesError()
 
         chmod($this->error_data['file'], 0000);
 
-        $this->setExpectedException(ClamavValidatorException::class, 'Access denied.');
-
         $validator->passes();
     }