[Mime] Check that the path is a file in the DataPart::fromPath

wkania · chalasr · commit a807523f57d4 · 2022-06-01T21:09:36.000+02:00
diff --git a/src/Symfony/Component/Mime/Part/DataPart.php b/src/Symfony/Component/Mime/Part/DataPart.php
@@ -61,7 +61,7 @@ public static function fromPath(string $path, string $name = null, string $conte
             $contentType = self::$mimeTypes->getMimeTypes($ext)[0] ?? 'application/octet-stream';
         }
 
-        if (false === is_readable($path)) {
+        if (!is_file($path) || !is_readable($path)) {
             throw new InvalidArgumentException(sprintf('Path "%s" is not readable.', $path));
         }
 
diff --git a/src/Symfony/Component/Mime/Tests/Part/DataPartTest.php b/src/Symfony/Component/Mime/Tests/Part/DataPartTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Mime\Tests\Part;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mime\Exception\InvalidArgumentException;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Header\IdentificationHeader;
 use Symfony\Component\Mime\Header\ParameterizedHeader;
@@ -127,6 +128,12 @@ public function testFromPathWithMeta()
         ), $p->getPreparedHeaders());
     }
 
+    public function testFromPathWithNotAFile()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        DataPart::fromPath(__DIR__.'/../Fixtures/mimetypes/');
+    }
+
     public function testHasContentId()
     {
         $p = new DataPart('content');

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static function fromPath(string $path, string $name = null, string $conte`
`61`	`61`	`$contentType = self::$mimeTypes->getMimeTypes($ext)[0] ?? 'application/octet-stream';`
`62`	`62`	`}`
`63`	`63`
`64`		`- if (false === is_readable($path)) {`
	`64`	`+ if (!is_file($path) \|\| !is_readable($path)) {`
`65`	`65`	`throw new InvalidArgumentException(sprintf('Path "%s" is not readable.', $path));`
`66`	`66`	`}`
`67`	`67`