MC-36640: Validation Update

- Fixed stoage upload file pathing for directories
- Updated read directory exist logic

Author: Hwashiang Yu

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

@@ -543,7 +543,11 @@ public function deleteFile($target)
      */
     public function uploadFile($targetPath, $type = null)
     {
-        $targetPath = $this->file->getRealPathSafety($targetPath) . DIRECTORY_SEPARATOR;
+        $targetPath = $this->file->getRealPathSafety($targetPath);
+
+        if ($this->file->isDirectory($targetPath)) {
+            $targetPath = $targetPath . DIRECTORY_SEPARATOR;
+        }
 
         if (!$this->isPathAllowed($targetPath, $this->getConditionsForExcludeDirs()) || strlen($targetPath) > 255) {
             throw new \Magento\Framework\Exception\LocalizedException(

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

@@ -209,14 +209,16 @@ public function isExist($path = null)
     {
         $this->validatePath($path);
 
-        return $this->driver->isExists($this->driver->getAbsolutePath($this->path, $path));
+        return $this->driver->isExists(
+            $this->driver->getRealPathSafety($this->driver->getAbsolutePath($this->path, $path))
+        );
     }
 
     /**
      * Gathers the statistics of the given path
      *
      * @param string $path
-     * @return array
+     * @return arrays
      * @throws \Magento\Framework\Exception\FileSystemException
      * @throws ValidatorException
      */