Merge pull request #151 from magento-commerce/develop

MCLOUD-13801: Cloud patches release 1.1.9

Author: ashvini22326

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-patches",
     "description": "Provides critical fixes for Magento 2 Enterprise Edition",
     "type": "magento2-component",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "license": "OSL-3.0",
     "repositories": {
         "repo.magento.com": {

patches.json

@@ -301,6 +301,12 @@
     },
     "Patch - Improve-web-api-async-performance": {
       ">=2.4.4 <2.4.4-p13 || >=2.4.5 <2.4.5-p12 || >=2.4.6 <2.4.6-p10 || >=2.4.7 <2.4.7-p5 || 2.4.8": "MCLOUD-13619__Improve_web_api_async_performance__2.4.x.patch"
+    },
+    "Patch for CVE-2025-47109 - Improve-category-view": {
+      "2.4.8": "MCLOUD-13752__Patch_for_CVE-2025-47109_Improve_category_view__2.4.8.patch"
+    },
+    "Patch for CVE-2025-47110 - Improve-admin-cache-efficiency": {
+      ">=2.4.4 <2.4.4-p14 || >=2.4.5 <2.4.5-p13 || >=2.4.6 <2.4.6-p11 || >=2.4.7 <2.4.7-p6 || 2.4.8": "MCLOUD-13753__Patch_for_CVE-2025-47110_improve-admin-cache-efficiency__2.4.x.patch"
     }
   },
   "magento/module-paypal": {

patches/MCLOUD-13752__Patch_for_CVE-2025-47109_Improve_category_view__2.4.8.patch

@@ -0,0 +1,59 @@
+diff --git a/vendor/magento/module-catalog/Helper/Category.php b/vendor/magento/module-catalog/Helper/Category.php
+index fe511d40e9caa..761dc6f62adda 100644
+--- a/vendor/magento/module-catalog/Helper/Category.php
++++ b/vendor/magento/module-catalog/Helper/Category.php
+@@ -10,8 +10,10 @@
+ use Magento\Catalog\Model\CategoryFactory;
+ use Magento\Framework\App\Helper\AbstractHelper;
+ use Magento\Framework\App\Helper\Context;
++use Magento\Framework\App\ObjectManager;
+ use Magento\Framework\Data\CollectionFactory;
+ use Magento\Framework\Data\Tree\Node\Collection;
++use Magento\Framework\Escaper;
+ use Magento\Framework\Exception\NoSuchEntityException;
+ use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+ use Magento\Store\Model\ScopeInterface;
+@@ -63,24 +65,33 @@ class Category extends AbstractHelper implements ResetAfterRequestInterface
+      */
+     protected $categoryRepository;
+ 
++    /**
++     * @var Escaper|null
++     */
++    private ?Escaper $escaper;
++
+     /**
+      * @param Context $context
+      * @param CategoryFactory $categoryFactory
+      * @param StoreManagerInterface $storeManager
+      * @param CollectionFactory $dataCollectionFactory
+      * @param CategoryRepositoryInterface $categoryRepository
++     * @param Escaper|null $escaper
+      */
+     public function __construct(
+         Context $context,
+         CategoryFactory $categoryFactory,
+         StoreManagerInterface $storeManager,
+         CollectionFactory $dataCollectionFactory,
+-        CategoryRepositoryInterface $categoryRepository
++        CategoryRepositoryInterface $categoryRepository,
++        ?Escaper $escaper = null
+     ) {
+         $this->_categoryFactory = $categoryFactory;
+         $this->_storeManager = $storeManager;
+         $this->_dataCollectionFactory = $dataCollectionFactory;
+         $this->categoryRepository = $categoryRepository;
++        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
++
+         parent::__construct($context);
+     }
+ 
+@@ -204,6 +215,7 @@ public function getCanonicalUrl(string $categoryUrl): string
+         if ($params && isset($params['p'])) {
+             $categoryUrl = $categoryUrl . '?p=' . $params['p'];
+         }
+-        return $categoryUrl;
++
++        return $this->escaper->escapeUrl($categoryUrl);
+     }
+ }

patches/MCLOUD-13753__Patch_for_CVE-2025-47110_improve-admin-cache-efficiency__2.4.x.patch

@@ -0,0 +1,25 @@
+diff --git a/vendor/magento/module-email/Model/Template/Filter.php b/vendor/magento/module-email/Model/Template/Filter.php
+index f5b69484285cc..f86deacad3b4e 100644
+--- a/vendor/magento/module-email/Model/Template/Filter.php
++++ b/vendor/magento/module-email/Model/Template/Filter.php
+@@ -1,7 +1,7 @@
+ <?php
+ /**
+- * Copyright © Magento, Inc. All rights reserved.
+- * See COPYING.txt for license details.
++ * Copyright 2011 Adobe
++ * All Rights Reserved.
+  */
+ declare(strict_types=1);
+ 
+@@ -432,6 +432,10 @@ public function blockDirective($construction)
+             $block->setDataUsingMethod($k, $v);
+         }
+ 
++        if (!$block->hasData('cache_key')) {
++            $block->setDataUsingMethod('cache_key', $block->getCacheKey());
++        }
++
+         if (isset($blockParameters['output'])) {
+             $method = $blockParameters['output'];
+         }