MC-31362: Media folder update

- Reverted changes to model
- Updated storage path check

Author: Hwashiang Yu

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php

@@ -60,13 +60,6 @@ public function execute()
     {
         try {
             $path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath();
-            if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)
-                || $this->directoryResolver->validateSamePath($path, DirectoryList::MEDIA)
-            ) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Directory %1 is not under storage root path.', $path)
-                );
-            }
             $this->getStorage()->deleteDirectory($path);
 
             return $this->resultRawFactory->create();

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -765,12 +765,13 @@ public function getCmsWysiwygImages()
     protected function _validatePath($path)
     {
         $root = $this->_sanitizePath($this->_cmsWysiwygImages->getStorageRoot());
-        if ($root == $path) {
+        $realPath = realpath($path);
+        if ($root == $realPath) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We can\'t delete root directory %1 right now.', $path)
             );
         }
-        if (strpos($path, (string) $root) !== 0) {
+        if (strpos($realPath, (string) $root) !== 0) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Directory %1 is not under storage root path.', $path)
             );

dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php

@@ -120,50 +120,4 @@ public function validatePathDataProvider()
             ],
         ];
     }
-
-    /**
-     * @param string $path
-     * @param string $directoryConfig
-     * @param bool $expectation
-     * @dataProvider validateSamePathDataProvider
-     * @throws \Magento\Framework\Exception\FileSystemException
-     * @magentoAppIsolation enabled
-     * @return void
-     */
-    public function testValidateSamePath($path, $directoryConfig, $expectation)
-    {
-        $directory = $this->filesystem
-            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
-        $path = $directory->getAbsolutePath() .'/' .$path;
-        $this->assertEquals($expectation, $this->directoryResolver->validateSamePath($path, $directoryConfig));
-    }
-
-    /**
-     * @return array
-     */
-    public function validateSamePathDataProvider()
-    {
-        return [
-            [
-                '/',
-                DirectoryList::MEDIA,
-                true,
-            ],
-            [
-                '/.',
-                DirectoryList::MEDIA,
-                true,
-            ],
-            [
-                '/../../pub/media/.',
-                DirectoryList::MEDIA,
-                true,
-            ],
-            [
-                '/../../pub/',
-                DirectoryList::MEDIA,
-                false,
-            ],
-        ];
-    }
 }

lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php

@@ -55,25 +55,4 @@ public function validatePath($path, $directoryConfig = DirectoryList::MEDIA)
 
         return strpos($realPath, $root) === 0;
     }
-
-    /**
-     * Validate same path.
-     *
-     * Gets real path for directory provided in parameters and compares it with specified root directory.
-     * Will return TRUE if real path of provided value is root directory path and FALSE if not.
-     * Throws the \Magento\Framework\Exception\FileSystemException in case when directory path is absent
-     * in Directories configuration.
-     *
-     * @param string $path
-     * @param string $directoryConfig
-     * @return bool
-     * @throws \Magento\Framework\Exception\FileSystemException
-     */
-    public function validateSamePath($path, $directoryConfig = DirectoryList::MEDIA)
-    {
-        $root = $this->directoryList->getPath($directoryConfig);
-        $traverseRealPath = realpath($path);
-
-        return $root === $traverseRealPath;
-    }
 }