Merge MC-35015-updated into 2.3.6-bugfixes-08072020

Author: dvoskoboinikov

app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php

@@ -102,7 +102,7 @@ public function addError($message)
                 $this->addError($row);
             }
         } else {
-            $this->_messages['error'][] = $message;
+            $this->_messages['error'][] = $this->escapeHtml($message);
         }
         return $this;
     }
@@ -140,7 +140,8 @@ public function addSuccess($message, $appendImportButton = false)
                 $this->addSuccess($row);
             }
         } else {
-            $this->_messages['success'][] = $message . ($appendImportButton ? $this->getImportButtonHtml() : '');
+            $escapedMessage = $this->escapeHtml($message);
+            $this->_messages['success'][] = $escapedMessage . ($appendImportButton ? $this->getImportButtonHtml() : '');
         }
         return $this;
     }

app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php

@@ -56,6 +56,8 @@ public function __construct(
     }
 
     /**
+     * Add Error Messages for Import
+     *
      * @param \Magento\Framework\View\Element\AbstractBlock $resultBlock
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return $this
@@ -68,7 +70,7 @@ protected function addErrorMessages(
             $message = '';
             $counter = 0;
             foreach ($this->getErrorMessages($errorAggregator) as $error) {
-                $message .= ++$counter . '. ' . $error . '<br>';
+                $message .= (++$counter) . '. ' . $error . '<br>';
                 if ($counter >= self::LIMIT_ERRORS_MESSAGE) {
                     break;
                 }
@@ -88,7 +90,7 @@ protected function addErrorMessages(
                     . '<a href="'
                     . $this->createDownloadUrlImportHistoryFile($this->createErrorReport($errorAggregator))
                     . '">' . __('Download full report') . '</a><br>'
-                    . '<div class="import-error-list">' . $message . '</div></div>'
+                    . '<div class="import-error-list">' . $resultBlock->escapeHtml($message) . '</div></div>'
                 );
             } catch (\Exception $e) {
                 foreach ($this->getErrorMessages($errorAggregator) as $errorMessage) {
@@ -101,6 +103,8 @@ protected function addErrorMessages(
     }
 
     /**
+     * Get all Error Messages from Import Results
+     *
      * @param \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface $errorAggregator
      * @return array
      */
@@ -115,6 +119,8 @@ protected function getErrorMessages(ProcessingErrorAggregatorInterface $errorAgg
     }
 
     /**
+     * Get System Generated Exception
+     *
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError[]
      */
@@ -124,6 +130,8 @@ protected function getSystemExceptions(ProcessingErrorAggregatorInterface $error
     }
 
     /**
+     * Generate Error Report File
+     *
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return string
      */
@@ -141,6 +149,8 @@ protected function createErrorReport(ProcessingErrorAggregatorInterface $errorAg
     }
 
     /**
+     * Get Import History Url
+     *
      * @param string $fileName
      * @return string
      */

app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Frame/ResultTest.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Test\Unit\Block\Adminhtml\Import\Frame;
+
+use Magento\Framework\Escaper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Json\EncoderInterface;
+
+/**
+ * Unit test for Magento\ImportExport\Block\Adminhtml\Import\Frame\Result
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ResultTest extends TestCase
+{
+    /**
+     * @var Result
+     */
+    private $result;
+
+    /**
+     * @var EncoderInterface|MockObject
+     */
+    private $encoderMock;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var Escaper|MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * Initialize Class Dependencies
+     *
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->contextMock = $this->createMock(Context::class);
+        $this->encoderMock = $this->getMockBuilder(EncoderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->escaperMock = $this->createPartialMock(Escaper::class, ['escapeHtml']);
+        $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
+        $this->result = new Result(
+            $this->contextMock,
+            $this->encoderMock
+        );
+    }
+
+    /**
+     * Test error message
+     *
+     * @return void
+     */
+    public function testAddError(): void
+    {
+        $errors = ['first error', 'second error','third error'];
+        $this->escaperMock
+            ->expects($this->exactly(count($errors)))
+            ->method('escapeHtml')
+            ->willReturnOnConsecutiveCalls(...array_values($errors));
+
+        $this->result->addError($errors);
+        $this->assertEquals(count($errors), count($this->result->getMessages()['error']));
+    }
+
+    /**
+     * Test success message
+     *
+     * @return void
+     */
+    public function testAddSuccess(): void
+    {
+        $success = ['first message', 'second message','third message'];
+        $this->escaperMock
+            ->expects($this->exactly(count($success)))
+            ->method('escapeHtml')
+            ->willReturnOnConsecutiveCalls(...array_values($success));
+
+        $this->result->addSuccess($success);
+        $this->assertEquals(count($success), count($this->result->getMessages()['success']));
+    }
+
+    /**
+     * Test Add Notice message
+     *
+     * @return void
+     */
+    public function testAddNotice(): void
+    {
+        $notice = ['notice 1', 'notice 2','notice 3'];
+
+        $this->result->addNotice($notice);
+        $this->assertEquals(count($notice), count($this->result->getMessages()['notice']));
+    }
+}