B2B-2061: Merge

Author: avattam06

app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidateFactory.php

@@ -6,18 +6,33 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
+use Magento\Framework\ObjectManagerInterface;
+
 /**
  * Class ValidateFactory. Creates Validator with type "ExistingValidate"
  */
 class ValidateFactory
 {
+    /**
+     * @var ObjectManagerInterface
+     */
+    private ObjectManagerInterface $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
     /**
      * Main factory method
      *
-     * @return \Zend_Validate
+     * @return ExistingValidate
      */
     public function create()
     {
-        return new ExistingValidate();
+        return $this->objectManager->create(ExistingValidate::class);
     }
 }

app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php

@@ -133,6 +133,8 @@ protected function parseExtensionsString($extensions)
     }
 
     /**
+     * Adds required validators to th $object
+     *
      * @param \Zend_File_Transfer_Adapter_Http|\Zend_Validate $object
      * @param \Magento\Catalog\Model\Product\Option $option
      * @param array $fileFullPath
@@ -193,10 +195,12 @@ protected function isImage($fileInfo)
         if (!$this->rootDirectory->isReadable($this->rootDirectory->getRelativePath($fileInfo))) {
             return false;
         }
-        $imageInfo = getimagesize($fileInfo);
-        if (!$imageInfo) {
+
+        $fileContent = $this->rootDirectory->readFile($fileInfo);
+        if (empty($fileContent) || !getimagesizefromstring($fileContent)) {
             return false;
         }
+
         return true;
     }
 }

app/code/Magento/RemoteStorage/Plugin/ExistingValidate.php

@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\RemoteStorage\Plugin;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\TargetDirectory;
+use Magento\Framework\Image\Adapter\AbstractAdapter;
+use Magento\RemoteStorage\Model\Config;
+use Psr\Log\LoggerInterface;
+use Magento\Catalog\Model\Product\Option\Type\File\ExistingValidate as Subject;
+
+/**
+ * @see AbstractAdapter
+ */
+class ExistingValidate
+{
+    /**
+     * @var Filesystem\Directory\WriteInterface
+     */
+    private $tmpDirectoryWrite;
+
+    /**
+     * @var Filesystem\Directory\WriteInterface
+     */
+    private $remoteDirectoryWrite;
+
+    /**
+     * @var array
+     */
+    private $tmpFiles = [];
+
+    /**
+     * @var bool
+     */
+    private $isEnabled;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param TargetDirectory $targetDirectory
+     * @param Config $config
+     * @param LoggerInterface $logger
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        TargetDirectory $targetDirectory,
+        Config $config,
+        LoggerInterface $logger
+    ) {
+        $this->tmpDirectoryWrite = $filesystem->getDirectoryWrite(DirectoryList::TMP);
+        $this->remoteDirectoryWrite = $targetDirectory->getDirectoryWrite(DirectoryList::ROOT);
+        $this->isEnabled = $config->isEnabled();
+        $this->logger = $logger;
+    }
+
+    /**
+     * Copies file from the remote server to the tmp directory
+     *
+     * @param Subject $subject
+     * @param string $value
+     * @param string|null $originalName
+     * @return array
+     * @throws FileSystemException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeIsValid(Subject $subject, $value, string $originalName = null)
+    {
+        if ($this->isEnabled) {
+            $value = $this->copyFileToTmp($value);
+        }
+        return [$value, $originalName];
+    }
+
+    /**
+     * Remove created tmp files
+     */
+    public function __destruct()
+    {
+        try {
+            foreach ($this->tmpFiles as $key => $tmpFile) {
+                $this->tmpDirectoryWrite->delete($tmpFile);
+                unset($this->tmpFiles[$key]);
+            }
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+        }
+    }
+
+    /**
+     * Move files from storage to tmp folder
+     *
+     * @param string $filePath
+     * @return string
+     * @throws FileSystemException
+     */
+    private function copyFileToTmp(string $filePath): string
+    {
+        if (isset($this->tmpFiles[$filePath])) {
+            return $this->tmpFiles[$filePath];
+        }
+
+        $absolutePath = $this->remoteDirectoryWrite->getAbsolutePath($filePath);
+        if ($this->remoteDirectoryWrite->isFile($absolutePath)) {
+            $this->tmpDirectoryWrite->create();
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $tmpPath = $this->tmpDirectoryWrite->getAbsolutePath() . basename($filePath);
+            $content = $this->remoteDirectoryWrite->getDriver()->fileGetContents($filePath);
+            if ($this->tmpDirectoryWrite->getDriver()->filePutContents($tmpPath, $content) >= 0) {
+                $filePath = $tmpPath;
+                $this->tmpFiles[$tmpPath] = $tmpPath;
+            }
+        }
+        return $filePath;
+    }
+}

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

@@ -101,6 +101,9 @@
             <argument name="filesystem" xsi:type="object">fullRemoteFilesystem</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Option\Type\File\ExistingValidate">
+        <plugin name="remoteValidatorInfo" type="Magento\RemoteStorage\Plugin\ExistingValidate" sortOrder="10"/>
+    </type>
     <type name="Magento\Framework\Image\Adapter\AbstractAdapter">
         <plugin name="remoteImageFile" type="Magento\RemoteStorage\Plugin\Image" sortOrder="10"/>
     </type>