Merge pull request #277 from webimpress/hotfix/hash-validator

Fixes File\Hash validator to work with digit-only hashes and match algo

Author: michalbundyra

src/File/Hash.php

@@ -148,9 +148,7 @@ public function isValid($value, $file = null)
             return false;
         }
 
-        $algos  = array_unique(array_values($this->getHash()));
-        $hashes = array_unique(array_keys($this->getHash()));
-
+        $algos = array_unique(array_values($this->getHash()));
         foreach ($algos as $algorithm) {
             $filehash = hash_file($algorithm, $fileInfo['file']);
 
@@ -159,10 +157,8 @@ public function isValid($value, $file = null)
                 return false;
             }
 
-            foreach ($hashes as $hash) {
-                if ($filehash === $hash) {
-                    return true;
-                }
+            if (isset($this->getHash()[$filehash]) && $this->getHash()[$filehash] === $algorithm) {
+                return true;
             }
         }
 

test/File/HashTest.php

@@ -10,9 +10,9 @@
 namespace ZendTest\Validator\File;
 
 use PHPUnit\Framework\TestCase;
-use Zend\Validator\File;
 use ReflectionProperty;
 use Zend\Validator\Exception\InvalidArgumentException;
+use Zend\Validator\File;
 
 /**
  * Hash testbed
@@ -253,4 +253,21 @@ public function testInvalidHashProvidedInArrayFormat($hash)
         $this->expectExceptionMessage('Hash must be a string');
         $validator->addHash([$hash]);
     }
+
+    public function testIntHash()
+    {
+        $validator = new File\Hash('10713230');
+
+        self::assertTrue($validator->isValid(__DIR__ . '/_files/crc32-int.pdf'));
+    }
+
+    public function testHashMustMatchWithTheAlgorithm()
+    {
+        $validator = new File\Hash();
+        // swapped hashes for given algorithms
+        $validator->addHash(['6507f172bceb9ed0cc59246d41569c4d', 'algorithm' => 'crc32']);
+        $validator->addHash(['10713230', 'algorithm' => 'md5']);
+
+        self::assertFalse($validator->isValid(__DIR__ . '/_files/crc32-int.pdf'));
+    }
 }