diff options
author | Robin Appelman <robin@icewind.nl> | 2019-01-22 17:32:48 +0300 |
---|---|---|
committer | Backportbot <backportbot-noreply@rullzer.com> | 2019-01-22 18:12:46 +0300 |
commit | f7a4f1f1282005fa28a722cdc0c9e13ee384dcf5 (patch) | |
tree | ae3f6666a1001d792dbdbd1763d9d57b00da5273 | |
parent | e1f917fd4c8314f309bf46196096ad89f5c55b8b (diff) |
cleanup shared lock if changing to exclusive lock failed
Signed-off-by: Robin Appelman <robin@icewind.nl>
-rw-r--r-- | lib/private/Files/View.php | 8 | ||||
-rw-r--r-- | tests/lib/Files/ViewTest.php | 31 |
2 files changed, 38 insertions, 1 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 21df67cf557..6066aed411f 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1137,7 +1137,13 @@ class View { list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix); if ($run and $storage) { if (in_array('write', $hooks) || in_array('delete', $hooks)) { - $this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE); + try { + $this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE); + } catch (LockedException $e) { + // release the shared lock we acquired before quiting + $this->unlockFile($path, ILockingProvider::LOCK_SHARED); + throw $e; + } } try { if (!is_null($extraParam)) { diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index 97e3d42684f..7a32736adb3 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -1997,6 +1997,37 @@ class ViewTest extends \Test\TestCase { $this->assertNull($this->getFileLockType($view, $path), 'File got unlocked after exception'); } + public function testLockBasicOperationUnlocksAfterLockException() { + $view = new View('/' . $this->user . '/files/'); + + $storage = new Temporary([]); + + Filesystem::mount($storage, array(), $this->user . '/'); + + $storage->mkdir('files'); + $storage->mkdir('files/dir'); + $storage->file_put_contents('files/test.txt', 'blah'); + $storage->getScanner()->scan('files'); + + // get a shared lock + $handle = $view->fopen('test.txt', 'r'); + + $thrown = false; + try { + // try (and fail) to get a write lock + $view->unlink('test.txt'); + } catch (\Exception $e) { + $thrown = true; + $this->assertInstanceOf(LockedException::class, $e); + } + $this->assertTrue($thrown, 'Exception was rethrown'); + + // clean shared lock + fclose($handle); + + $this->assertNull($this->getFileLockType($view, 'test.txt'), 'File got unlocked'); + } + /** * Test locks for fopen with fclose at the end * |