Merge remote-tracking branch 'origin/B2B-2069' into B2B-2052

Author: avattam06

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -295,19 +295,20 @@ public function readDirectory($path): array
      */
     public function getRealPathSafety($path)
     {
+        //Removing redundant directory separators
+        $path = preg_replace(
+            '~(?<!:)\/\/+~',
+            '/',
+            $path
+        );
+
         if (strpos($path, '/.') === false) {
             return $path;
         }
 
         $isAbsolute = strpos($path, $this->normalizeAbsolutePath('')) === 0;
         $path = $this->normalizeRelativePath($path);
 
-        //Removing redundant directory separators.
-        $path = preg_replace(
-            '/\\/\\/+/',
-            '/',
-            $path
-        );
         $pathParts = explode('/', $path);
         if (end($pathParts) === '.') {
             $pathParts[count($pathParts) - 1] = '';

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -407,6 +407,18 @@ public function getRealPathSafetyDataProvider(): array
             [
                 'test/test/../test.txt',
                 'test/test.txt'
+            ],
+            [
+                'test//test/../test.txt',
+                'test/test.txt'
+            ],
+            [
+                'test1///test2/..//test3//test.txt',
+                'test1/test3/test.txt'
+            ],
+            [
+                self::URL . '/test1///test2/..//test3//test.txt',
+                self::URL . 'test1/test3/test.txt'
             ]
         ];
     }

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/ImagesTest.php

@@ -138,8 +138,10 @@ private function assertSuccessfulImageSave(array $expectation): void
         $this->assertEquals($expectation['small_image'], $product->getData('small_image'));
         $this->assertEquals($expectation['thumbnail'], $product->getData('thumbnail'));
         $this->assertEquals($expectation['swatch_image'], $product->getData('swatch_image'));
-        $this->assertFileExists(
-            $this->mediaDirectory->getAbsolutePath($this->config->getBaseMediaPath() . $expectation['image'])
+        $this->assertTrue(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getAbsolutePath($this->config->getBaseMediaPath() . $expectation['image'])
+            )
         );
     }
 }