Merge remote-tracking branch 'arcticfoxes/AC-1411' into 2.4-develop-pr

Author: joanhe

dev/tests/integration/testsuite/Magento/Framework/File/UploaderTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Customer\Model\FileProcessor;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
 
 /**
  * Test for \Magento\Framework\File\Uploader
@@ -102,7 +103,7 @@ public function testUploadFileWithExcessiveFolderName(): void
     public function testUploadFileWhenOldMediaGalleryDisabled(string $directoryCode): void
     {
         $destinationDirectory = $this->filesystem->getDirectoryWrite($directoryCode);
-        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP, DriverPool::FILE);
 
         $fileName = 'file.txt';
         $destinationDir = 'tmp';

lib/internal/Magento/Framework/File/Uploader.php

@@ -720,6 +720,7 @@ private function validateFileId(array $fileId): void
             if (preg_match('/\.\.(\\\|\/)/', $tmpName) !== 1) {
                 $allowedFolders = [
                     sys_get_temp_dir(),
+                    $this->directoryList->getPath(DirectoryList::SYS_TMP),
                     $this->directoryList->getPath(DirectoryList::MEDIA),
                     $this->directoryList->getPath(DirectoryList::VAR_DIR),
                     $this->directoryList->getPath(DirectoryList::TMP),