Merge pull request #9352 from magento-cia/cia-2.4.8-beta2-develop-bugfix-11102024

Cia 2.4.8 beta2 develop bugfix 11102024

Author: pawan-adobe-security

app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Download.php

@@ -81,13 +81,11 @@ public function execute()
             return $resultRedirect;
         }
 
-        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        $fileName = basename($fileName);
-
-        $exportDirectory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_IMPORT_EXPORT);
+        $exportDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
 
         try {
-            $fileExist = $exportDirectory->isExist('export/' . $fileName);
+            $fileName  = $exportDirectory->getDriver()->getRealPathSafety(DIRECTORY_SEPARATOR . $fileName);
+            $fileExist = $exportDirectory->isExist('export' . $fileName);
         } catch (Throwable $e) {
             $fileExist = false;
         }
@@ -99,7 +97,7 @@ public function execute()
         }
 
         try {
-            $path = 'export/' . $fileName;
+            $path = 'export' . $fileName;
             $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_IMPORT_EXPORT);
             if ($directory->isFile($path)) {
                 return $this->fileFactory->create(

app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Export/File/DownloadTest.php

@@ -20,6 +20,8 @@
 use Magento\ImportExport\Controller\Adminhtml\Export\File\Download;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -76,6 +78,11 @@ class DownloadTest extends TestCase
      */
     private $directoryMock;
 
+    /**
+     * @var WriteInterface|MockObject
+     */
+    private $exportDirectoryMock;
+
     /**
      * Set up
      */
@@ -89,6 +96,10 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->exportDirectoryMock = $this->getMockBuilder(WriteInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->directoryMock = $this->getMockBuilder(ReadInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -135,6 +146,10 @@ protected function setUp(): void
             ->method('getDirectoryRead')
             ->willReturn($this->directoryMock);
 
+        $this->fileSystemMock->expects($this->any())
+            ->method('getDirectoryWrite')
+            ->willReturn($this->exportDirectoryMock);
+
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->downloadControllerMock = $this->objectManagerHelper->getObject(
             Download::class,
@@ -154,7 +169,18 @@ public function testExecuteSuccess()
         $this->requestMock->method('getParam')
             ->with('filename')
             ->willReturn('sampleFile.csv');
-        $this->directoryMock->expects($this->once())->method('isExist')->willReturn(true);
+
+        $driverMock = $this->getMockBuilder(DriverInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $driverMock->expects($this->once())->method('getRealPathSafety')->willReturn('sampleFile.csv');
+
+        $this->exportDirectoryMock->expects($this->any())
+            ->method('getDriver')
+            ->willReturn($driverMock);
+
+        $this->exportDirectoryMock->expects($this->once())->method('isExist')->willReturn(true);
         $this->directoryMock->expects($this->once())->method('isFile')->willReturn(true);
         $this->fileFactoryMock->expects($this->once())->method('create');
 
@@ -170,8 +196,18 @@ public function testExecuteFileDoesntExists()
             ->with('filename')
             ->willReturn('sampleFile');
 
+        $driverMock = $this->getMockBuilder(DriverInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $driverMock->expects($this->once())->method('getRealPathSafety')->willReturn('sampleFile');
+
+        $this->exportDirectoryMock->expects($this->any())
+            ->method('getDriver')
+            ->willReturn($driverMock);
+
+        $this->exportDirectoryMock->expects($this->once())->method('isExist')->willReturn(true);
         $this->directoryMock->expects($this->once())->method('isFile')->willReturn(false);
-        $this->directoryMock->expects($this->once())->method('isExist')->willReturn(true);
         $this->messageManagerMock->expects($this->once())->method('addErrorMessage');
 
         $this->downloadControllerMock->execute();