AC-8477: /page_cache/block/esi handles param enhancement

Author: rizwankhgl

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

@@ -11,6 +11,8 @@
 use Magento\Framework\Validator\RegexFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Layout\LayoutCacheKeyInterface;
+use Magento\PageCache\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 abstract class Block extends \Magento\Framework\App\Action\Action
 {
@@ -51,21 +53,28 @@ 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;
+
     /**
      * @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 $config
      */
     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 +86,7 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(LayoutCacheKeyInterface::class);
         $this->regexValidatorFactory = $regexValidatorFactory
             ?: ObjectManager::getInstance()->get(RegexFactory::class);
+        $this->config = $scopeConfig;
     }
 
     /**
@@ -94,6 +104,10 @@ protected function _getBlocks()
         }
         $blocks = $this->jsonSerializer->unserialize($blocks);
         $handles = $this->base64jsonSerializer->unserialize($handles);
+
+        $handles_size = $this->config->getValue(Config::XML_HANDLES_SIZE);
+        $handles = (count($handles) > $handles_size) ? array_splice($handles, 0, $handles_size) : $handles;
+
         if (!$this->validateHandleParam($handles)) {
             return [];
         }

app/code/Magento/PageCache/Model/Config.php

@@ -34,6 +34,8 @@ class Config
      */
     public const XML_PAGECACHE_TTL = 'system/full_page_cache/ttl';
 
+    public const XML_HANDLES_SIZE = 'system/full_page_cache/handles_size';
+
     public const XML_PAGECACHE_TYPE = 'system/full_page_cache/caching_application';
 
     public const XML_VARNISH_PAGECACHE_ACCESS_LIST = 'system/full_page_cache/varnish/access_list';
@@ -125,6 +127,16 @@ public function getType()
         return (int)$this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
     }
 
+    /**
+     * Return hnadles param size
+     *
+     * @return int
+     */
+    public function getHandlesSize()
+    {
+        return (int)$this->_scopeConfig->getValue(self::XML_HANDLES_SIZE);
+    }
+
     /**
      * Return page lifetime
      *

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, Max value 239. </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">