MC-39340: Improve image upload

Viktor Sevch · Viktor Sevch · commit 21c75ecf12e3 · 2020-12-02T10:47:30.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php
@@ -210,6 +210,19 @@ public function uploadActionWithErrorsDataProvider(): array
                     'errorcode' => 0,
                 ],
             ],
+            'upload_wrong_png' => [
+                'file' => [
+                    'copy_file' => true,
+                    'name' => 'magento_wrong.png',
+                    'type' => 'image/png',
+                    'current_path' => '/../../../../_files',
+                ],
+                'expectation' => [
+                    'message' => 'Unsupported image format.',
+                    'errorcode' => 0,
+                    'tmp_media_path' => '/m/w/magento_wrong.png',
+                ],
+            ]
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_wrong.png b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_wrong.png
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Framework\Image\Adapter;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Gd2 adapter.
  *
@@ -56,7 +58,7 @@ protected function _reset()
      *
      * @param string $filename
      * @return void
-     * @throws \OverflowException
+     * @throws \OverflowException|LocalizedException
      */
     public function open($filename)
     {
@@ -71,10 +73,11 @@ public function open($filename)
             throw new \OverflowException('Memory limit has been reached.');
         }
         $this->imageDestroy();
-        $this->_imageHandler = call_user_func(
-            $this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
-            $this->_fileName
-        );
+        try {
+            $this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
+        } catch (\Exception $ex) {
+            throw new LocalizedException(__('Unsupported image format.'));
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace Magento\Framework\Image\Adapter;`
`8`	`8`
	`9`	`+use Magento\Framework\Exception\LocalizedException;`
	`10`	`+`
`9`	`11`	`/**`
`10`	`12`	`* Gd2 adapter.`
`11`	`13`	`*`
`@@ -56,7 +58,7 @@ protected function _reset()`
`56`	`58`	`*`
`57`	`59`	`* @param string $filename`
`58`	`60`	`* @return void`
`59`		`- * @throws \OverflowException`
	`61`	`+ * @throws \OverflowException\|LocalizedException`
`60`	`62`	`*/`
`61`	`63`	`public function open($filename)`
`62`	`64`	`{`
`@@ -71,10 +73,11 @@ public function open($filename)`
`71`	`73`	`throw new \OverflowException('Memory limit has been reached.');`
`72`	`74`	`}`
`73`	`75`	`$this->imageDestroy();`
`74`		`- $this->_imageHandler = call_user_func(`
`75`		`- $this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),`
`76`		`- $this->_fileName`
`77`		`- );`
	`76`	`+ try {`
	`77`	`+ $this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);`
	`78`	`+ } catch (\Exception $ex) {`
	`79`	`+ throw new LocalizedException(__('Unsupported image format.'));`
	`80`	`+ }`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`/**`