From 6886b46ee28addba626cc1e8a87181ca2800de25 Mon Sep 17 00:00:00 2001 From: Jaakko Salo Date: Sun, 24 May 2020 20:03:48 +0300 Subject: [PATCH] In LockPlugin, only release a lock if it was acquired When uploading new files, getNodeForPath() will not succeed yet so the lock cannot be acquired. In that case, don't try to unlock it either. Signed-off-by: Jaakko Salo --- apps/dav/lib/Connector/Sabre/LockPlugin.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/apps/dav/lib/Connector/Sabre/LockPlugin.php b/apps/dav/lib/Connector/Sabre/LockPlugin.php index 7c07f45fc7..bdb681be8d 100644 --- a/apps/dav/lib/Connector/Sabre/LockPlugin.php +++ b/apps/dav/lib/Connector/Sabre/LockPlugin.php @@ -41,6 +41,13 @@ class LockPlugin extends ServerPlugin { */ private $server; + /** + * State of the lock + * + * @var bool + */ + private $isLocked; + /** * {@inheritdoc} */ @@ -48,6 +55,7 @@ class LockPlugin extends ServerPlugin { $this->server = $server; $this->server->on('beforeMethod:*', [$this, 'getLock'], 50); $this->server->on('afterMethod:*', [$this, 'releaseLock'], 50); + $this->isLocked = false; } public function getLock(RequestInterface $request) { @@ -67,10 +75,15 @@ class LockPlugin extends ServerPlugin { } catch (LockedException $e) { throw new FileLocked($e->getMessage(), $e->getCode(), $e); } + $this->isLocked = true; } } public function releaseLock(RequestInterface $request) { + // don't try to release the lock if we never locked one + if ($this->isLocked === false) { + return; + } if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) { return; } @@ -81,6 +94,7 @@ class LockPlugin extends ServerPlugin { } if ($node instanceof Node) { $node->releaseLock(ILockingProvider::LOCK_SHARED); + $this->isLocked = false; } } }