Merge branch '2.4.7-beta3-develop' into cia-2.4.7-beta3-develop-bugfix-10272023

Author: pawan-adobe-security

app/code/Magento/Config/Block/System/Config/Form/Field/File.php

@@ -9,6 +9,8 @@
  *
  * @author     Magento Core Team <[email protected]>
  */
+declare(strict_types=1);
+
 namespace Magento\Config\Block\System\Config\Form\Field;
 
 class File extends \Magento\Framework\Data\Form\Element\File
@@ -35,7 +37,7 @@ protected function _getDeleteCheckbox()
         $html = '';
         if ((string)$this->getValue()) {
             $label = __('Delete File');
-            $html .= '<div>' . $this->getValue() . ' ';
+            $html .= '<div>' . $this->_escaper->escapeHtml($this->getValue()) . ' ';
             $html .= '<input type="checkbox" name="' .
                 parent::getName() .
                 '[delete]" value="1" class="checkbox" id="' .

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php

@@ -8,49 +8,85 @@
 namespace Magento\Config\Test\Unit\Block\System\Config\Form\Field;
 
 use Magento\Config\Block\System\Config\Form\Field\File;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
 use Magento\Framework\DataObject;
 use Magento\Framework\Escaper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for \Magento\Framework\Data\Form\Field\File
  */
 class FileTest extends TestCase
 {
+    /**
+     * XSS value
+     */
+    private const XSS_FILE_NAME_TEST = '<img src=x onerror=alert(1)>.crt';
+
+    /**
+     * Input name
+     */
+    private const INPUT_NAME_TEST = 'test_name';
+
     /**
      * @var File
      */
     protected $file;
 
+    /**
+     * @var Factory|MockObject
+     */
+    private $factoryMock;
+
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    private $factoryCollectionMock;
+
+    /**
+     * @var Escaper|MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var array
      */
-    protected $testData;
+    protected array $testData = [
+        'before_element_html' => 'test_before_element_html',
+        'html_id' => 'test_id',
+        'name' => 'test_name',
+        'value' => 'test_value',
+        'title' => 'test_title',
+        'disabled' => true,
+        'after_element_js' => 'test_after_element_js',
+        'after_element_html' => 'test_after_element_html',
+        'html_id_prefix' => 'test_id_prefix_',
+        'html_id_suffix' => '_test_id_suffix',
+    ];
 
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
 
-        $this->testData = [
-            'before_element_html' => 'test_before_element_html',
-            'html_id' => 'test_id',
-            'name' => 'test_name',
-            'value' => 'test_value',
-            'title' => 'test_title',
-            'disabled' => true,
-            'after_element_js'    => 'test_after_element_js',
-            'after_element_html'  => 'test_after_element_html',
-            'html_id_prefix'      => 'test_id_prefix_',
-            'html_id_suffix'      => '_test_id_suffix',
-        ];
-
+        $this->factoryMock = $this->getMockBuilder(Factory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->factoryCollectionMock = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->escaperMock = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->file = $objectManager->getObject(
             File::class,
             [
-                '_escaper' => $objectManager->getObject(Escaper::class),
+                'factoryElement' => $this->factoryMock,
+                'factoryCollection' => $this->factoryCollectionMock,
+                '_escaper' => $this->escaperMock,
                 'data' => $this->testData,
-
             ]
         );
 
@@ -60,13 +96,20 @@ protected function setUp(): void
         $this->file->setForm($formMock);
     }
 
-    public function testGetElementHtml()
+    public function testGetElementHtml(): void
     {
-        $html = $this->file->getElementHtml();
-
         $expectedHtmlId = $this->testData['html_id_prefix']
             . $this->testData['html_id']
             . $this->testData['html_id_suffix'];
+        $this->escaperMock->expects($this->any())->method('escapeHtml')->willReturnMap(
+            [
+                [$expectedHtmlId, null, $expectedHtmlId],
+                [self::XSS_FILE_NAME_TEST, null, self::XSS_FILE_NAME_TEST],
+                [self::INPUT_NAME_TEST, null, self::INPUT_NAME_TEST],
+            ]
+        );
+
+        $html = $this->file->getElementHtml();
 
         $this->assertStringContainsString('<label class="addbefore" for="' . $expectedHtmlId . '"', $html);
         $this->assertStringContainsString($this->testData['before_element_html'], $html);

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php

@@ -3,76 +3,105 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filter\FilterInput;
+use Magento\Framework\Json\Helper\Data;
 use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\DateTime\Filter\Date;
 use Magento\SalesRule\Api\Data\CouponGenerationSpecInterfaceFactory;
+use Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 use Magento\SalesRule\Model\CouponGenerator;
 use Magento\SalesRule\Model\Quote\GetCouponCodeLengthInterface;
+use Magento\SalesRule\Model\RegistryConstants;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\ScopeInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Generate promo quote
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
+class Generate extends Quote implements HttpPostActionInterface
 {
+    /**
+     * Coupon quantity limit config path
+     */
+    private const XML_CONFIG_COUPON_QUANTITY_LIMIT = 'promo/auto_generated_coupon_codes/quantity_limit';
+
     /**
      * @var CouponGenerator
      */
-    private $couponGenerator;
+    private CouponGenerator $couponGenerator;
 
     /**
      * @var PublisherInterface
      */
-    private $messagePublisher;
+    private PublisherInterface $messagePublisher;
 
     /**
      * @var CouponGenerationSpecInterfaceFactory
      */
-    private $generationSpecFactory;
+    private CouponGenerationSpecInterfaceFactory $generationSpecFactory;
 
     /**
      * @var GetCouponCodeLengthInterface
      */
-    private $getCouponCodeLength;
+    private GetCouponCodeLengthInterface $getCouponCodeLength;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private ScopeConfigInterface $scopeConfig;
 
     /**
      * Generate constructor.
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param FileFactory $fileFactory
+     * @param Date $dateFilter
      * @param CouponGenerator|null $couponGenerator
      * @param PublisherInterface|null $publisher
      * @param CouponGenerationSpecInterfaceFactory|null $generationSpecFactory
      * @param GetCouponCodeLengthInterface|null $getCouponCodeLength
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+        Context $context,
+        Registry $coreRegistry,
+        FileFactory $fileFactory,
+        Date $dateFilter,
         CouponGenerator $couponGenerator = null,
         PublisherInterface $publisher = null,
         CouponGenerationSpecInterfaceFactory $generationSpecFactory = null,
-        GetCouponCodeLengthInterface $getCouponCodeLength = null
+        GetCouponCodeLengthInterface $getCouponCodeLength = null,
+        ScopeConfigInterface $scopeConfig = null
     ) {
         parent::__construct($context, $coreRegistry, $fileFactory, $dateFilter);
         $this->couponGenerator = $couponGenerator ?:
             $this->_objectManager->get(CouponGenerator::class);
-        $this->messagePublisher = $publisher ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->messagePublisher = $publisher ?: ObjectManager::getInstance()
             ->get(PublisherInterface::class);
         $this->generationSpecFactory = $generationSpecFactory ?:
-            \Magento\Framework\App\ObjectManager::getInstance()->get(
+            ObjectManager::getInstance()->get(
                 CouponGenerationSpecInterfaceFactory::class
             );
         $this->getCouponCodeLength = $getCouponCodeLength ?:
-            \Magento\Framework\App\ObjectManager::getInstance()->get(
+            ObjectManager::getInstance()->get(
                 GetCouponCodeLengthInterface::class
             );
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -81,7 +110,7 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function execute()
+    public function execute(): void
     {
         if (!$this->getRequest()->isAjax()) {
             $this->_forward('noroute');
@@ -90,13 +119,13 @@ public function execute()
         $result = [];
         $this->_initRule();
 
-        $rule = $this->_coreRegistry->registry(\Magento\SalesRule\Model\RegistryConstants::CURRENT_SALES_RULE);
+        $rule = $this->_coreRegistry->registry(RegistryConstants::CURRENT_SALES_RULE);
 
         $data = $this->getRequest()->getParams();
 
         if (!$rule->getId()) {
             $result['error'] = __('Rule is not defined');
-        } elseif ((int) $rule->getCouponType() !== \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
+        } elseif ((int) $rule->getCouponType() !== Rule::COUPON_TYPE_AUTO
             && !$rule->getUseAutoGeneration()) {
             $result['error'] =
                 __('The rule coupon settings changed. Please save the rule before using auto-generation.');
@@ -123,7 +152,7 @@ public function execute()
                 $result['error'] = __(
                     'Something went wrong while validating coupon code length. Please review the log and try again.'
                 );
-                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->_objectManager->get(LoggerInterface::class)->critical($e);
             }
         } else {
             try {
@@ -132,29 +161,42 @@ public function execute()
                     $data = $inputFilter->getUnescaped();
                 }
 
-                $data['quantity'] = isset($data['qty']) ? $data['qty'] : null;
-
-                $couponSpec = $this->generationSpecFactory->create(['data' => $data]);
-
-                $this->messagePublisher->publish('sales_rule.codegenerator', $couponSpec);
-                $this->messageManager->addSuccessMessage(
-                    __('Message is added to queue, wait to get your coupons soon')
+                $data['quantity'] = $data['qty'] ?? 0;
+                $couponQuantityLimit = (int)$this->scopeConfig->getValue(
+                    self::XML_CONFIG_COUPON_QUANTITY_LIMIT,
+                    ScopeInterface::SCOPE_STORE
                 );
+                // @codingStandardsIgnoreStart
+                if ($data['quantity'] > 0 && ($data['quantity'] <= $couponQuantityLimit || $couponQuantityLimit === 0)) {
+                    $couponSpec = $this->generationSpecFactory->create(['data' => $data]);
+
+                    $this->messagePublisher->publish('sales_rule.codegenerator', $couponSpec);
+                    $this->messageManager->addSuccessMessage(
+                        __('Message is added to queue, wait to get your coupons soon.')
+                    );
+                } else {
+                    $this->messageManager->addErrorMessage(
+                        __(
+                            'Coupon quantity should be less than or equal to the coupon quantity in the store configuration.'
+                        )
+                    );
+                }
+                // @codingStandardsIgnoreEnd
                 $this->_view->getLayout()->initMessages();
                 $result['messages'] = $this->_view->getLayout()->getMessagesBlock()->getGroupedHtml();
-            } catch (\Magento\Framework\Exception\InputException $inputException) {
+            } catch (InputException $inputException) {
                 $result['error'] = __('Invalid data provided');
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (LocalizedException $e) {
                 $result['error'] = $e->getMessage();
             } catch (\Exception $e) {
                 $result['error'] = __(
                     'Something went wrong while generating coupons. Please review the log and try again.'
                 );
-                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->_objectManager->get(LoggerInterface::class)->critical($e);
             }
         }
         $this->getResponse()->representJson(
-            $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($result)
+            $this->_objectManager->get(Data::class)->jsonEncode($result)
         );
     }
 }