Merge branch 'MC-32427' into MC-33363

Author: vzabaznov

lib/internal/Magento/Framework/Lock/Backend/Cache.php

@@ -37,6 +37,7 @@ class Cache implements \Magento\Framework\Lock\LockManagerInterface
     public function __construct(FrontendInterface $cache)
     {
         $this->cache = $cache;
+        $this->lockSign = $this->generateLockSign();
     }
 
     /**
@@ -45,7 +46,7 @@ public function __construct(FrontendInterface $cache)
     public function lock(string $name, int $timeout = -1): bool
     {
         if (empty($this->lockSign)) {
-            $this->lockSign = \bin2hex(\random_bytes(8));
+            $this->lockSign = $this->generateLockSign();
         }
 
         $data = $this->cache->load($this->getIdentifier($name));
@@ -106,4 +107,27 @@ private function getIdentifier(string $cacheIdentifier): string
     {
         return self::LOCK_PREFIX . $cacheIdentifier;
     }
+
+    /**
+     * Function that generates lock sign that helps to avoid removing a lock that was created by another client.
+     *
+     * @return string
+     */
+    private function generateLockSign()
+    {
+        $sign = implode(
+            '-',
+            [
+                \getmypid(), \crc32(\gethostname())
+            ]
+        );
+
+        try {
+            $sign .= '-' . \bin2hex(\random_bytes(4));
+        } catch (\Exception $e) {
+            $sign .= '-' . \rand(0, 1000);
+        }
+
+        return $sign;
+    }
 }

lib/internal/Magento/Framework/Lock/Test/Unit/Backend/CacheTest.php

@@ -53,6 +53,16 @@ public function testUnlock(): void
     {
         $identifier = 'lock_name';
 
+        $closure = \Closure::bind(function ($cacheInstance) {
+            return $cacheInstance->lockSign;
+        }, null, $this->cache);
+        $lockSign = $closure($this->cache);
+
+        $this->frontendCacheMock
+            ->expects($this->once())->method('load')
+            ->with(self::LOCK_PREFIX . $identifier)
+            ->willReturn($lockSign);
+
         $this->frontendCacheMock
             ->expects($this->once())
             ->method('remove')
@@ -61,4 +71,22 @@ public function testUnlock(): void
 
         $this->assertEquals(true, $this->cache->unlock($identifier));
     }
+
+    /**
+     * Verify that lock will no be released without sign matches.
+     * Sign generates in Cache class constructor.
+     *
+     * @return void
+     */
+    public function testUnlockWithAnotherSign(): void
+    {
+        $identifier = 'lock_name';
+
+        $this->frontendCacheMock
+            ->expects($this->once())->method('load')
+            ->with(self::LOCK_PREFIX . $identifier)
+            ->willReturn(\uniqid('some_rand-'));
+
+        $this->assertEquals(false, $this->cache->unlock($identifier));
+    }
 }