Merge branch '2.4.7-beta2-develop' into ACP2E-2355-2.4.7-beta2-develop

Author: dhorytskyi

app/code/Magento/PageCache/Controller/Block.php

@@ -4,13 +4,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\PageCache\Controller;
 
 use Magento\Framework\Serialize\Serializer\Base64Json;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Validator\RegexFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Layout\LayoutCacheKeyInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 abstract class Block extends \Magento\Framework\App\Action\Action
 {
@@ -51,21 +54,33 @@ abstract class Block extends \Magento\Framework\App\Action\Action
      */
     private const VALIDATION_RULE_PATTERN = '/^[a-z0-9]+[a-z0-9_]*$/i';
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * Handle size system name
+     */
+    private const XML_HANDLES_SIZE = 'system/full_page_cache/handles_size';
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
      * @param Json $jsonSerializer
      * @param Base64Json $base64jsonSerializer
      * @param LayoutCacheKeyInterface $layoutCacheKey
      * @param RegexFactory|null $regexValidatorFactory
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\Translate\InlineInterface $translateInline,
         Json $jsonSerializer = null,
         Base64Json $base64jsonSerializer = null,
         LayoutCacheKeyInterface $layoutCacheKey = null,
-        ?RegexFactory $regexValidatorFactory = null
+        ?RegexFactory $regexValidatorFactory = null,
+        ScopeConfigInterface $scopeConfig = null
     ) {
         parent::__construct($context);
         $this->translateInline = $translateInline;
@@ -77,6 +92,7 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(LayoutCacheKeyInterface::class);
         $this->regexValidatorFactory = $regexValidatorFactory
             ?: ObjectManager::getInstance()->get(RegexFactory::class);
+        $this->config = $scopeConfig;
     }
 
     /**
@@ -94,6 +110,11 @@ protected function _getBlocks()
         }
         $blocks = $this->jsonSerializer->unserialize($blocks);
         $handles = $this->base64jsonSerializer->unserialize($handles);
+
+        $handleSize = (int) $this->config->getValue(self::XML_HANDLES_SIZE);
+        $handles = ($handleSize && count($handles) > $handleSize)
+            ? array_splice($handles, 0, $handleSize) : $handles;
+
         if (!$this->validateHandleParam($handles)) {
             return [];
         }

app/code/Magento/PageCache/etc/adminhtml/system.xml

@@ -78,6 +78,10 @@
                     <comment>Public content cache lifetime in seconds. If field is empty default value 86400 will be saved. </comment>
                     <backend_model>Magento\PageCache\Model\System\Config\Backend\Ttl</backend_model>
                 </field>
+                <field id="handles_size" type="text" translate="label comment" sortOrder="5" showInDefault="1" canRestore="1">
+                    <label>Handles params size</label>
+                    <comment>Handles params size. For better performance use handles parameter size between 50 and 100. </comment>
+                </field>
             </group>
         </section>
     </system>

app/code/Magento/PageCache/etc/config.xml

@@ -24,6 +24,7 @@
                     <path>varnish4.vcl</path>
                 </varnish4>
                 <ttl>86400</ttl>
+                <handles_size>100</handles_size>
                 <caching_application>1</caching_application>
                 <default>
                     <access_list>localhost</access_list>

app/code/Magento/PageCache/etc/di.xml

@@ -35,6 +35,7 @@
     <type name="Magento\PageCache\Controller\Block">
         <arguments>
             <argument name="layoutCacheKey" xsi:type="object">Magento\Framework\View\Layout\LayoutCacheKeyInterface</argument>
+            <argument name="scopeConfig" xsi:type="object">Magento\Framework\App\Config\ScopeConfigInterface\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\App\Cache\RuntimeStaleCacheStateModifier">

lib/internal/Magento/Framework/App/Http/Context.php

@@ -7,7 +7,9 @@
 
 namespace Magento\Framework\App\Http;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 
@@ -40,6 +42,11 @@ class Context implements ResetAfterRequestInterface
      */
     private $serializer;
 
+    /**
+     * @var DeploymentConfig|null
+     */
+    private ?DeploymentConfig $deploymentConfig = null;
+
     /**
      * @param array $data
      * @param array $default
@@ -117,8 +124,11 @@ public function getVaryString()
     {
         $data = $this->getData();
         if (!empty($data)) {
+            $salt = (string)$this->getDeploymentConfig()->get(
+                ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY
+            );
             ksort($data);
-            return sha1($this->serializer->serialize($data));
+            return hash('sha256', $this->serializer->serialize($data) . '|' . $salt);
         }
         return null;
     }
@@ -144,4 +154,18 @@ public function _resetState(): void
         $this->data = [];
         $this->default = [];
     }
+
+    /**
+     * Get DeploymentConfig
+     *
+     * @return DeploymentConfig
+     */
+    private function getDeploymentConfig() : DeploymentConfig
+    {
+        if ($this->deploymentConfig === null) {
+            $this->deploymentConfig = ObjectManager::getInstance()
+                ->get(DeploymentConfig::class);
+        }
+        return $this->deploymentConfig;
+    }
 }

lib/internal/Magento/Framework/App/Test/Unit/Http/ContextTest.php

@@ -7,7 +7,10 @@
 
 namespace Magento\Framework\App\Test\Unit\Http;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Http\Context;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -25,13 +28,29 @@ class ContextTest extends TestCase
      */
     protected $object;
 
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $objectManagerMock;
+
     /**
      * @var Json|MockObject
      */
     private $serializerMock;
 
     protected function setUp(): void
     {
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['create'])
+            ->getMockForAbstractClass();
+        \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerMock);
+
         $this->objectManager = new ObjectManager($this);
         $this->serializerMock = $this->getMockBuilder(Json::class)
             ->setMethods(['serialize'])
@@ -50,6 +69,10 @@ function ($value) {
                 'serializer' => $this->serializerMock
             ]
         );
+        $this->deploymentConfig = $this->createPartialMock(
+            DeploymentConfig::class,
+            ['get']
+        );
     }
 
     public function testGetValue()
@@ -81,14 +104,28 @@ public function testGetData()
 
     public function testGetVaryString()
     {
+        $this->objectManagerMock->expects($this->any())
+            ->method('get')
+            ->with(DeploymentConfig::class)
+            ->willReturn($this->deploymentConfig);
+
+        $this->deploymentConfig->expects($this->any())
+            ->method('get')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY)
+            ->willReturn('448198e08af35844a42d3c93c1ef4e03');
+
         $this->object->setValue('key2', 'value2', 'default2');
         $this->object->setValue('key1', 'value1', 'default1');
         $data = [
             'key2' => 'value2',
             'key1' => 'value1'
         ];
         ksort($data);
-        $this->assertEquals(sha1(json_encode($data)), $this->object->getVaryString());
+
+        $salt = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY);
+        $cacheKey = hash('sha256', $this->serializerMock->serialize($data) . '|' . $salt);
+
+        $this->assertEquals($cacheKey, $this->object->getVaryString());
     }
 
     public function testToArray()