MC-31733: Media gallery breaks in some filesystems

Author: nathanjosiah

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,20 @@ public function getCurrentPath()
             if ($path && $path !== self::NODE_ROOT) {
                 $path = $this->convertIdToPath($path);
 
-                if ($this->mediaDirectoryWrite->isDirectory($path) && 0 === strpos($path, (string) $currentPath)) {
+                $realPath = $this->filesystemDriver->getRealPath(
+                    $this->filesystemDriver->getRealPathSafety($path)
+                );
+
+                $path = $realPath ?: $path;
+
+                if (strpos($path, $currentPath) !== 0) {
+                    $path = $currentPath;
+                }
+
+                if ($this->mediaDirectoryWrite->isDirectory($path)
+                    && strpos($path, $currentPath) === 0
+                    && $path !== $currentPath
+                ) {
                     $currentPath = $this->mediaDirectoryWrite->getRelativePath($path);
                 }
             }

app/code/Magento/Theme/Model/Wysiwyg/Storage.php

@@ -18,11 +18,15 @@ class Storage
 {
     /**
      * Type font
+     *
+     * Represents the font type
      */
     const TYPE_FONT = 'font';
 
     /**
      * Type image
+     *
+     * Represents the image type
      */
     const TYPE_IMAGE = 'image';
 
@@ -328,7 +332,7 @@ public function deleteDirectory($path)
         $rootCmp = rtrim($this->_helper->getStorageRoot(), '/');
         $pathCmp = rtrim($path, '/');
 
-        if ($rootCmp == $pathCmp) {
+        if ($rootCmp == $pathCmp || $rootCmp === $this->mediaWriteDirectory->getAbsolutePath($path)) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We can\'t delete root directory %1 right now.', $path)
             );

app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php

@@ -562,6 +562,30 @@ public function testDeleteRootDirectory()
         $this->_storageModel->deleteDirectory($directoryPath);
     }
 
+    /**
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testDeleteRootDirectoryRelative()
+    {
+        $directoryPath = $this->_storageRoot;
+        $fakePath = 'fake/relative/path';
+
+        $this->directoryWrite->method('getAbsolutePath')
+            ->with($fakePath)
+            ->willReturn($directoryPath);
+
+        $this->_helperStorage->expects(
+            $this->atLeastOnce()
+        )->method(
+            'getStorageRoot'
+        )->will(
+            $this->returnValue($directoryPath)
+        );
+
+        $this->_storageModel->deleteDirectory($fakePath);
+    }
+
     /**
      * @return array
      */

app/code/Magento/Theme/etc/di.xml

@@ -289,4 +289,9 @@
             <argument name="identifierName" xsi:type="string">theme_id</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>