Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit cabe67275034 · 2019-11-12T14:07:20.000+01:00
* 3.4:
  [HttpFoundation] fix guessing mime-types of files with leading dash
  [Cache] forbid serializing AbstractAdapter and TagAwareAdapter instances
  Use constant time comparison in UriSigner
diff --git a/File/MimeType/FileBinaryMimeTypeGuesser.php b/File/MimeType/FileBinaryMimeTypeGuesser.php
@@ -36,7 +36,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
      *
      * @param string $cmd The command to run to get the mime type of a file
      */
-    public function __construct(string $cmd = 'file -b --mime %s 2>/dev/null')
+    public function __construct(string $cmd = 'file -b --mime -- %s 2>/dev/null')
     {
         $this->cmd = $cmd;
     }
@@ -85,7 +85,7 @@ public function guess($path)
         ob_start();
 
         // need to use --mime instead of -i. see #6641
-        passthru(sprintf($this->cmd, escapeshellarg($path)), $return);
+        passthru(sprintf($this->cmd, escapeshellarg((0 === strpos($path, '-') ? './' : '').$path)), $return);
         if ($return > 0) {
             ob_end_clean();
 
diff --git a/Tests/File/Fixtures/-test b/Tests/File/Fixtures/-test
diff --git a/Tests/File/MimeType/MimeTypeTest.php b/Tests/File/MimeType/MimeTypeTest.php
@@ -21,6 +21,17 @@
  */
 class MimeTypeTest extends TestCase
 {
+    public function testGuessWithLeadingDash()
+    {
+        $cwd = getcwd();
+        chdir(__DIR__.'/../Fixtures');
+        try {
+            $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess('-test'));
+        } finally {
+            chdir($cwd);
+        }
+    }
+
     public function testGuessImageWithoutExtension()
     {
         $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test'));

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface`
`36`	`36`	`*`
`37`	`37`	`* @param string $cmd The command to run to get the mime type of a file`
`38`	`38`	`*/`
`39`		`- public function __construct(string $cmd = 'file -b --mime %s 2>/dev/null')`
	`39`	`+ public function __construct(string $cmd = 'file -b --mime -- %s 2>/dev/null')`
`40`	`40`	`{`
`41`	`41`	`$this->cmd = $cmd;`
`42`	`42`	`}`
`@@ -85,7 +85,7 @@ public function guess($path)`
`85`	`85`	`ob_start();`
`86`	`86`
`87`	`87`	`// need to use --mime instead of -i. see #6641`
`88`		`- passthru(sprintf($this->cmd, escapeshellarg($path)), $return);`
	`88`	`+ passthru(sprintf($this->cmd, escapeshellarg((0 === strpos($path, '-') ? './' : '').$path)), $return);`
`89`	`89`	`if ($return > 0) {`
`90`	`90`	`ob_end_clean();`
`91`	`91`