bug #45676 [Process] Don't return executable directories in PhpExecutableFinder (fancyweb)

fabpot · fabpot · commit 63be6fa27ee2 · 2022-03-12T10:11:29.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Process] Don't return executable directories in PhpExecutableFinder | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #45620 | License | MIT | Doc PR | - Directories can be executable and be wrongly returned if some env vars have directory paths as their values. Commits ------- 947152b [Process] Don't return executable directories in PhpExecutableFinder
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -47,6 +47,10 @@ public function find($includeArgs = true)
                 }
             }
 
+            if (@is_dir($php)) {
+                return false;
+            }
+
             return $php;
         }
 
@@ -59,20 +63,20 @@ public function find($includeArgs = true)
         }
 
         if ($php = getenv('PHP_PATH')) {
-            if (!@is_executable($php)) {
+            if (!@is_executable($php) || @is_dir($php)) {
                 return false;
             }
 
             return $php;
         }
 
         if ($php = getenv('PHP_PEAR_PHP_BIN')) {
-            if (@is_executable($php)) {
+            if (@is_executable($php) && !@is_dir($php)) {
                 return $php;
             }
         }
 
-        if (@is_executable($php = \PHP_BINDIR.('\\' === \DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {
+        if (@is_executable($php = \PHP_BINDIR.('\\' === \DIRECTORY_SEPARATOR ? '\\php.exe' : '/php')) && !@is_dir($php)) {
             return $php;
         }
 
diff --git a/src/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
@@ -50,12 +50,32 @@ public function testFindArguments()
     public function testNotExitsBinaryFile()
     {
         $f = new PhpExecutableFinder();
-        $phpBinaryEnv = \PHP_BINARY;
-        putenv('PHP_BINARY=/usr/local/php/bin/php-invalid');
 
-        $this->assertFalse($f->find(), '::find() returns false because of not exist file');
-        $this->assertFalse($f->find(false), '::find(false) returns false because of not exist file');
+        $originalPhpBinary = getenv('PHP_BINARY');
 
-        putenv('PHP_BINARY='.$phpBinaryEnv);
+        try {
+            putenv('PHP_BINARY=/usr/local/php/bin/php-invalid');
+
+            $this->assertFalse($f->find(), '::find() returns false because of not exist file');
+            $this->assertFalse($f->find(false), '::find(false) returns false because of not exist file');
+        } finally {
+            putenv('PHP_BINARY='.$originalPhpBinary);
+        }
+    }
+
+    public function testFindWithExecutableDirectory()
+    {
+        $originalPhpBinary = getenv('PHP_BINARY');
+
+        try {
+            $executableDirectoryPath = sys_get_temp_dir().'/PhpExecutableFinderTest_testFindWithExecutableDirectory';
+            @mkdir($executableDirectoryPath);
+            $this->assertTrue(is_executable($executableDirectoryPath));
+            putenv('PHP_BINARY='.$executableDirectoryPath);
+
+            $this->assertFalse((new PhpExecutableFinder())->find());
+        } finally {
+            putenv('PHP_BINARY='.$originalPhpBinary);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ public function find($includeArgs = true)`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ if (@is_dir($php)) {`
	`51`	`+ return false;`
	`52`	`+ }`
	`53`	`+`
`50`	`54`	`return $php;`
`51`	`55`	`}`
`52`	`56`
`@@ -59,20 +63,20 @@ public function find($includeArgs = true)`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`if ($php = getenv('PHP_PATH')) {`
`62`		`- if (!@is_executable($php)) {`
	`66`	`+ if (!@is_executable($php) \|\| @is_dir($php)) {`
`63`	`67`	`return false;`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`return $php;`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`if ($php = getenv('PHP_PEAR_PHP_BIN')) {`
`70`		`- if (@is_executable($php)) {`
	`74`	`+ if (@is_executable($php) && !@is_dir($php)) {`
`71`	`75`	`return $php;`
`72`	`76`	`}`
`73`	`77`	`}`
`74`	`78`
`75`		`- if (@is_executable($php = \PHP_BINDIR.('\\' === \DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {`
	`79`	`+ if (@is_executable($php = \PHP_BINDIR.('\\' === \DIRECTORY_SEPARATOR ? '\\php.exe' : '/php')) && !@is_dir($php)) {`
`76`	`80`	`return $php;`
`77`	`81`	`}`
`78`	`82`