Merge pull request #8493 from magento-cia/cia-2.4.7-beta2-develop-bugfix-08242023

Bugfixes

Author: dvoskoboinikov

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()