MC-32427: Sign locks in order to prevent unlock from parallel request

Author: vzabaznov

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

@@ -24,6 +24,13 @@ class Cache implements \Magento\Framework\Lock\LockManagerInterface
      */
     private $cache;
 
+    /**
+     * Sign for locks, helps to avoid removing a lock that was created by another client
+     *
+     * @string
+     */
+    private $lockSign;
+
     /**
      * @param FrontendInterface $cache
      */
@@ -37,19 +44,48 @@ public function __construct(FrontendInterface $cache)
      */
     public function lock(string $name, int $timeout = -1): bool
     {
-        if ((bool)$this->cache->test($this->getIdentifier($name))) {
+        if (empty($this->lockSign)) {
+            $this->lockSign = \bin2hex(\random_bytes(8));
+        }
+
+        $data = $this->cache->load($this->getIdentifier($name));
+
+        if (false !== $data) {
              return false;
         }
 
-        return $this->cache->save('1', $this->getIdentifier($name), [], $timeout);
+        $saveResult = $this->cache->save($this->lockSign, $this->getIdentifier($name), [], $timeout * 100);
+
+        $data = $this->cache->load($this->getIdentifier($name));
+
+        if ($data === $this->lockSign && $saveResult) {
+            return true;
+        }
+
+        return false;
     }
 
     /**
      * @inheritdoc
      */
     public function unlock(string $name): bool
     {
-        return (bool)$this->cache->remove($this->getIdentifier($name));
+        if (empty($this->lockSign)) {
+            return false;
+        }
+
+        $data = $this->cache->load($this->getIdentifier($name));
+
+        if (false === $data) {
+            return false;
+        }
+
+        $removeResult = false;
+        if ($data === $this->lockSign) {
+            $removeResult = (bool)$this->cache->remove($this->getIdentifier($name));
+        }
+
+        return $removeResult;
     }
 
     /**