do not search in $PATH entries not allowed by open_basedir

xabbuh · xabbuh · commit 3f6e956c8692 · 2024-08-14T12:42:42.000+02:00
do not filter
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -48,9 +48,14 @@ public function addSuffix(string $suffix)
      */
     public function find(string $name, ?string $default = null, array $extraDirs = [])
     {
+        $dirs = array_merge(
+            explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
+            $extraDirs
+        );
+
         if (\ini_get('open_basedir')) {
             $searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);
-            $dirs = [];
+
             foreach ($searchPath as $path) {
                 // Silencing against https://bugs.php.net/69240
                 if (@is_dir($path)) {
@@ -61,11 +66,6 @@ public function find(string $name, ?string $default = null, array $extraDirs = [
                     }
                 }
             }
-        } else {
-            $dirs = array_merge(
-                explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
-                $extraDirs
-            );
         }
 
         $suffixes = [''];
diff --git a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
@@ -109,7 +109,13 @@ public function testFindWithOpenBaseDir()
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        $initialOpenBaseDir = ini_set('open_basedir', \dirname(\PHP_BINARY).\PATH_SEPARATOR.'/');
+        $openBaseDir = \dirname(\PHP_BINARY).\PATH_SEPARATOR.sys_get_temp_dir().\PATH_SEPARATOR.getcwd();
+
+        if ($_SERVER['SYMFONY_PHPUNIT_DIR'] ?? null) {
+            $openBaseDir .= \PATH_SEPARATOR.$_SERVER['SYMFONY_PHPUNIT_DIR'];
+        }
+
+        $initialOpenBaseDir = ini_set('open_basedir', $openBaseDir);
 
         try {
             $finder = new ExecutableFinder();
@@ -121,6 +127,38 @@ public function testFindWithOpenBaseDir()
         }
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testFindWithSubdirectoryOfOpenBaseDir()
+    {
+        if (\ini_get('open_basedir')) {
+            $this->markTestSkipped('Cannot test when open_basedir is set');
+        }
+
+        $paths = explode(\PATH_SEPARATOR, getenv('PATH'));
+        $phpBinaryPath = \dirname(\PHP_BINARY);
+
+        if (!in_array($phpBinaryPath, $paths, true)) {
+            $paths[] = $phpBinaryPath;
+        }
+
+        $this->setPath(implode(\PATH_SEPARATOR, $paths));
+
+        $openBaseDir = \dirname(\dirname(\PHP_BINARY)).\PATH_SEPARATOR.sys_get_temp_dir().\PATH_SEPARATOR.getcwd();
+
+        if ($_SERVER['SYMFONY_PHPUNIT_DIR'] ?? null) {
+            $openBaseDir .= \PATH_SEPARATOR.$_SERVER['SYMFONY_PHPUNIT_DIR'];
+        }
+
+        ini_set('open_basedir', $openBaseDir);
+
+        $finder = new ExecutableFinder();
+        $result = $finder->find($this->getPhpBinaryName());
+
+        $this->assertSamePath(\PHP_BINARY, $result);
+    }
+
     /**
      * @runInSeparateProcess
      */

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,14 @@ public function addSuffix(string $suffix)`
`48`	`48`	`*/`
`49`	`49`	`public function find(string $name, ?string $default = null, array $extraDirs = [])`
`50`	`50`	`{`
	`51`	`+ $dirs = array_merge(`
	`52`	`+ explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),`
	`53`	`+ $extraDirs`
	`54`	`+ );`
	`55`	`+`
`51`	`56`	`if (\ini_get('open_basedir')) {`
`52`	`57`	`$searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);`
`53`		`- $dirs = [];`
	`58`	`+`
`54`	`59`	`foreach ($searchPath as $path) {`
`55`	`60`	`// Silencing against https://bugs.php.net/69240`
`56`	`61`	`if (@is_dir($path)) {`
`@@ -61,11 +66,6 @@ public function find(string $name, ?string $default = null, array $extraDirs = [`
`61`	`66`	`}`
`62`	`67`	`}`
`63`	`68`	`}`
`64`		`- } else {`
`65`		`- $dirs = array_merge(`
`66`		`- explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),`
`67`		`- $extraDirs`
`68`		`- );`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`$suffixes = [''];`