Merge pull request #8603 from magento-cia/cia-2.4.7-beta3-develop-bugfix-10262023

Cia 2.4.7 beta3 develop bugfix 10262023

Author: pawan-adobe-security

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php

@@ -161,8 +161,6 @@ public function executeDataProvider(): array
             ['name with[ bracket.jpg'],
             ['magento_small_image.jpg'],
             ['_.jpg'],
-            [' - .jpg'],
-            ['-.jpg'],
         ];
     }
 

lib/internal/Magento/Framework/Filesystem/Directory/PathValidator.php

@@ -54,8 +54,11 @@ public function validate(
             $actualPath = $this->driver->getRealPathSafety($path);
         }
 
-        if (mb_strpos($actualPath, $realDirectoryPath) !== 0
-            && rtrim($path, DIRECTORY_SEPARATOR) !== $realDirectoryPath
+        if (preg_match('/(?:^-|\s-)/', $path)
+            || (
+                mb_strpos($actualPath, $realDirectoryPath) !== 0
+                && rtrim($path, DIRECTORY_SEPARATOR) !== $realDirectoryPath
+            )
         ) {
             throw new ValidatorException(
                 new Phrase(

lib/internal/Magento/Framework/Filesystem/File/Write.php

@@ -8,6 +8,7 @@
 
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Phrase;
 
 class Write extends Read implements WriteInterface
 {
@@ -28,18 +29,22 @@ public function __construct($path, DriverInterface $driver, $mode)
      * Assert file existence for proper mode
      *
      * @return void
-     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws FileSystemException
      */
     protected function assertValid()
     {
         $fileExists = $this->driver->isExists($this->path);
         $mode = $this->mode ?? '';
-        if (!$fileExists && preg_match('/r/', $mode)) {
+        if (preg_match('/(?:^-|\s-)/', basename($this->path))) {
+            throw new FileSystemException(
+                new Phrase('The filename "%1" contains invalid characters', [basename($this->path)])
+            );
+        } elseif (!$fileExists && preg_match('/r/', $mode)) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('The "%1" file doesn\'t exist.', [$this->path])
+                new Phrase('The "%1" file doesn\'t exist.', [$this->path])
             );
         } elseif ($fileExists && preg_match('/x/', $mode)) {
-            throw new FileSystemException(new \Magento\Framework\Phrase('The file "%1" already exists', [$this->path]));
+            throw new FileSystemException(new Phrase('The file "%1" already exists', [$this->path]));
         }
     }
 
@@ -56,7 +61,7 @@ public function write($data)
             return $this->driver->fileWrite($this->resource, $data);
         } catch (FileSystemException $e) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Cannot write to the "%1" file. %2', [$this->path, $e->getMessage()])
+                new Phrase('Cannot write to the "%1" file. %2', [$this->path, $e->getMessage()])
             );
         }
     }
@@ -76,7 +81,7 @@ public function writeCsv(array $data, $delimiter = ',', $enclosure = '"')
             return $this->driver->filePutCsv($this->resource, $data, $delimiter, $enclosure);
         } catch (FileSystemException $e) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Cannot write to the "%1" file. %2', [$this->path, $e->getMessage()])
+                new Phrase('Cannot write to the "%1" file. %2', [$this->path, $e->getMessage()])
             );
         }
     }
@@ -93,7 +98,7 @@ public function flush()
             return $this->driver->fileFlush($this->resource);
         } catch (FileSystemException $e) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('Cannot flush the "%1" file. %2', [$this->path, $e->getMessage()])
+                new Phrase('Cannot flush the "%1" file. %2', [$this->path, $e->getMessage()])
             );
         }
     }