Skip to content

[stable18] Fix releasing a shared lock multiple times #21711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
backportbot-nextcloud wants to merge 2 commits into from
Closed

[stable18] Fix releasing a shared lock multiple times #21711

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21fc013
Fix releasing a shared lock multiple times
jvsalo May 24, 2020
d6df3a5
In LockPlugin, only release a lock if it was acquired
jvsalo May 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
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 <[email protected]>
  • Loading branch information
@jvsalo @backportbot
jvsalo authored and backportbot[bot] committed Jul 6, 2020
commit d6df3a50cdc11c8b6e3d995a13fd1db116986d7f
13 changes: 13 additions & 0 deletions apps/dav/lib/Connector/Sabre/LockPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ class LockPlugin extends ServerPlugin {
*/
private $server;

/**
* State of the lock
*
* @var bool
*/
private $isLocked;

/**
* {@inheritdoc}
*/
Expand All @@ -66,10 +73,15 @@ public function getLock(RequestInterface $request) {
} 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;
}
Expand All @@ -80,6 +92,7 @@ public function releaseLock(RequestInterface $request) {
}
if ($node instanceof Node) {
$node->releaseLock(ILockingProvider::LOCK_SHARED);
$this->isLocked = false;
}
}
}