merge magento/2.4.0-develop into magento-tsg/2.4.0-develop-pr45

magento-mts-svc · web-flow · commit 32fa6a1adcb5 · 2020-05-27T00:23:09.000-07:00
diff --git a/app/code/Magento/Theme/Helper/Storage.php b/app/code/Magento/Theme/Helper/Storage.php
@@ -11,6 +11,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Handles the storage of media files like images and fonts.
@@ -97,6 +98,10 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * @var \Magento\Framework\Filesystem\Io\File
      */
     private $file;
+    /**
+     * @var DriverInterface
+     */
+    private $filesystemDriver;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
@@ -105,6 +110,7 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\View\Design\Theme\FlyweightFactory $themeFactory
      * @param \Magento\Framework\Filesystem\Io\File|null $file
      *
+     * @param DriverInterface|null $filesystemDriver
      * @throws \Magento\Framework\Exception\FileSystemException
      * @throws \Magento\Framework\Exception\ValidatorException
      */
@@ -113,7 +119,8 @@ public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Backend\Model\Session $session,
         \Magento\Framework\View\Design\Theme\FlyweightFactory $themeFactory,
-        \Magento\Framework\Filesystem\Io\File $file = null
+        \Magento\Framework\Filesystem\Io\File $file = null,
+        DriverInterface $filesystemDriver = null
     ) {
         parent::__construct($context);
         $this->filesystem = $filesystem;
@@ -124,6 +131,7 @@ public function __construct(
         $this->file = $file ?: ObjectManager::getInstance()->get(
             \Magento\Framework\Filesystem\Io\File::class
         );
+        $this->filesystemDriver = $filesystemDriver ?: ObjectManager::getInstance()->get(DriverInterface::class);
     }
 
     /**
@@ -247,7 +255,16 @@ public function getCurrentPath()
             if ($path && $path !== self::NODE_ROOT) {
                 $path = $this->convertIdToPath($path);
 
-                if ($this->mediaDirectoryWrite->isDirectory($path) && 0 === strpos($path, (string) $currentPath)) {
+                $path = $this->filesystemDriver->getRealPathSafety($path);
+
+                if (strpos($path, $currentPath) !== 0) {
+                    $path = $currentPath;
+                }
+
+                if ($this->mediaDirectoryWrite->isDirectory($path)
+                    && strpos($path, $currentPath) === 0
+                    && $path !== $currentPath
+                ) {
                     $currentPath = $this->mediaDirectoryWrite->getRelativePath($path);
                 }
             }
diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Theme wysiwyg storage model
@@ -18,11 +19,15 @@ class Storage
 {
     /**
      * Type font
+     *
+     * Represents the font type
      */
     const TYPE_FONT = 'font';
 
     /**
      * Type image
+     *
+     * Represents the image type
      */
     const TYPE_IMAGE = 'image';
 
@@ -82,6 +87,11 @@ class Storage
      */
     private $file;
 
+    /**
+     * @var DriverInterface
+     */
+    private $filesystemDriver;
+
     /**
      * Initialize dependencies
      *
@@ -92,6 +102,7 @@ class Storage
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
      * @param \Magento\Framework\Filesystem\Io\File|null $file
+     * @param DriverInterface|null $filesystemDriver
      *
      * @throws \Magento\Framework\Exception\FileSystemException
      */
@@ -102,7 +113,8 @@ public function __construct(
         \Magento\Framework\Image\AdapterFactory $imageFactory,
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         \Magento\Framework\Url\DecoderInterface $urlDecoder,
-        \Magento\Framework\Filesystem\Io\File $file = null
+        \Magento\Framework\Filesystem\Io\File $file = null,
+        DriverInterface $filesystemDriver = null
     ) {
         $this->mediaWriteDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->_helper = $helper;
@@ -113,6 +125,8 @@ public function __construct(
         $this->file = $file ?: ObjectManager::getInstance()->get(
             \Magento\Framework\Filesystem\Io\File::class
         );
+        $this->filesystemDriver = $filesystemDriver ?: ObjectManager::getInstance()
+            ->get(DriverInterface::class);
     }
 
     /**
@@ -327,8 +341,12 @@ public function deleteDirectory($path)
     {
         $rootCmp = rtrim($this->_helper->getStorageRoot(), '/');
         $pathCmp = rtrim($path, '/');
+        $absolutePath = rtrim(
+            $this->filesystemDriver->getRealPathSafety($this->mediaWriteDirectory->getAbsolutePath($path)),
+            '/'
+        );
 
-        if ($rootCmp == $pathCmp) {
+        if ($rootCmp == $pathCmp || $rootCmp === $absolutePath) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We can\'t delete root directory %1 right now.', $path)
             );
diff --git a/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php
@@ -19,9 +19,10 @@
 use Magento\Framework\Url\EncoderInterface;
 use Magento\Framework\View\Design\Theme\Customization;
 use Magento\Framework\View\Design\Theme\FlyweightFactory;
+use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Theme\Helper\Storage;
-use Magento\Theme\Model\Theme;
 use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Theme\Model\Theme;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -91,6 +92,11 @@ class StorageTest extends TestCase
 
     protected $requestParams;
 
+    /**
+     * @var DriverInterface|MockObject
+     */
+    private $filesystemDriver;
+
     protected function setUp(): void
     {
         $this->customizationPath = '/' . implode('/', ['var', 'theme']);
@@ -117,6 +123,7 @@ protected function setUp(): void
         $this->contextHelper->expects($this->any())->method('getUrlEncoder')->willReturn($this->urlEncoder);
         $this->contextHelper->expects($this->any())->method('getUrlDecoder')->willReturn($this->urlDecoder);
         $this->themeFactory->expects($this->any())->method('create')->willReturn($this->theme);
+        $this->filesystemDriver = $this->createMock(DriverInterface::class);
 
         $this->theme->expects($this->any())
             ->method('getCustomization')
@@ -135,7 +142,9 @@ protected function setUp(): void
             $this->contextHelper,
             $this->filesystem,
             $this->session,
-            $this->themeFactory
+            $this->themeFactory,
+            null,
+            $this->filesystemDriver
         );
     }
 
@@ -279,6 +288,9 @@ public function testGetThumbnailPathNotFound()
     {
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('The image not found');
+
+        $this->filesystemDriver->method('getRealpathSafety')
+            ->willReturnArgument(0);
         $image = 'notFoundImage.png';
         $root = '/image';
         $sourceNode = '/not/a/root';
@@ -456,4 +468,67 @@ public function testGetThemeNotFound()
         );
         $helper->getStorageRoot();
     }
+
+    /**
+     * @dataProvider getCurrentPathDataProvider
+     */
+    public function testGetCurrentPathCachesResult()
+    {
+        $this->request->expects($this->once())
+            ->method('getParam')
+            ->with(Storage::PARAM_NODE)
+            ->willReturn(Storage::NODE_ROOT);
+
+        $actualPath = $this->helper->getCurrentPath();
+        self::assertSame('/image', $actualPath);
+    }
+
+    /**
+     * @dataProvider getCurrentPathDataProvider
+     */
+    public function testGetCurrentPath(
+        string $expectedPath,
+        string $requestedPath,
+        ?bool $isDirectory = null,
+        ?string $relativePath = null,
+        ?string $resolvedPath = null
+    ) {
+        $this->directoryWrite->method('isDirectory')
+            ->willReturn($isDirectory);
+
+        $this->directoryWrite->method('getRelativePath')
+            ->willReturn($relativePath);
+
+        $this->urlDecoder->method('decode')
+            ->willReturnArgument(0);
+
+        if ($resolvedPath) {
+            $this->filesystemDriver->method('getRealpathSafety')
+                ->willReturn($resolvedPath);
+        } else {
+            $this->filesystemDriver->method('getRealpathSafety')
+                ->willReturnArgument(0);
+        }
+
+        $this->request->method('getParam')
+            ->with(Storage::PARAM_NODE)
+            ->willReturn($requestedPath);
+
+        $actualPath = $this->helper->getCurrentPath();
+
+        self::assertSame($expectedPath, $actualPath);
+    }
+
+    public function getCurrentPathDataProvider(): array
+    {
+        $rootPath = '/' . \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE;
+
+        return [
+            'requested path "root" should short-circuit' => [$rootPath, Storage::NODE_ROOT],
+            'non-existent directory should default to the base path' => [$rootPath, $rootPath . '/foo'],
+            'requested path that resolves to a bad path should default to root' =>
+                [$rootPath, $rootPath . '/something', true, null, '/bar'],
+            'real path should resolve to relative path' => ['foo/', $rootPath . '/foo', true, 'foo/'],
+        ];
+    }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
@@ -23,6 +23,7 @@
 use Magento\Theme\Helper\Storage;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -74,6 +75,11 @@ class StorageTest extends TestCase
      */
     protected $urlDecoder;
 
+    /**
+     * @var DriverInterface|MockObject
+     */
+    private $filesystemDriver;
+
     protected function setUp(): void
     {
         $this->_filesystem = $this->createMock(Filesystem::class);
@@ -114,6 +120,7 @@ function ($path) {
         $this->directoryWrite = $this->createMock(Write::class);
         $this->urlEncoder = $this->createPartialMock(EncoderInterface::class, ['encode']);
         $this->urlDecoder = $this->createPartialMock(DecoderInterface::class, ['decode']);
+        $this->filesystemDriver = $this->createMock(DriverInterface::class);
 
         $this->_filesystem->expects(
             $this->once()
@@ -129,7 +136,9 @@ function ($path) {
             $this->_objectManager,
             $this->_imageFactory,
             $this->urlEncoder,
-            $this->urlDecoder
+            $this->urlDecoder,
+            null,
+            $this->filesystemDriver
         );
 
         $this->_storageRoot = '/root';
@@ -577,6 +586,33 @@ public function testDeleteRootDirectory()
         $this->_storageModel->deleteDirectory($directoryPath);
     }
 
+    /**
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
+     */
+    public function testDeleteRootDirectoryRelative()
+    {
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class
+        );
+
+        $directoryPath = $this->_storageRoot;
+        $fakePath = 'fake/relative/path';
+
+        $this->directoryWrite->method('getAbsolutePath')
+            ->with($fakePath)
+            ->willReturn($directoryPath);
+
+        $this->filesystemDriver->method('getRealPathSafety')
+            ->with($directoryPath)
+            ->willReturn($directoryPath);
+
+        $this->_helperStorage
+            ->method('getStorageRoot')
+            ->willReturn($directoryPath);
+
+        $this->_storageModel->deleteDirectory($fakePath);
+    }
+
     /**
      * @return array
      */
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
@@ -309,4 +309,9 @@
             <argument name="cache" xsi:type="object">configured_design_cache</argument>
         </arguments>
     </type>
+    <type name="Magento\Theme\Helper\Storage">
+        <arguments>
+            <argument name="filesystemDriver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
 </config>
