mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only lock files in data/username/files/

This commit is contained in:
Joas Schilling 2015-06-11 16:11:16 +02:00
parent cda9685c0e
commit caf16b083e
1 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/private/files/view.php
View File

@ -1663,12 +1663,15 @@ class View {
* @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
*/ */
private function lockPath($path, $type) { private function lockPath($path, $type) {
$absolutePath = $this->getAbsolutePath($path);
if (!$this->shouldLockFile($absolutePath)) {
return;
}
$mount = $this->getMount($path); $mount = $this->getMount($path);
if ($mount) { if ($mount) {
$mount->getStorage()->acquireLock( $mount->getStorage()->acquireLock(
$mount->getInternalPath( $mount->getInternalPath($absolutePath),
$this->getAbsolutePath($path)
),
$type, $type,
$this->lockingProvider $this->lockingProvider
); );
@ -1680,12 +1683,15 @@ class View {
* @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
*/ */
private function changeLock($path, $type) { private function changeLock($path, $type) {
$absolutePath = $this->getAbsolutePath($path);
if (!$this->shouldLockFile($absolutePath)) {
return;
}
$mount = $this->getMount($path); $mount = $this->getMount($path);
if ($mount) { if ($mount) {
$mount->getStorage()->changeLock( $mount->getStorage()->changeLock(
$mount->getInternalPath( $mount->getInternalPath($absolutePath),
$this->getAbsolutePath($path)
),
$type, $type,
$this->lockingProvider $this->lockingProvider
); );
@ -1697,12 +1703,15 @@ class View {
* @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
*/ */
private function unlockPath($path, $type) { private function unlockPath($path, $type) {
$absolutePath = $this->getAbsolutePath($path);
if (!$this->shouldLockFile($absolutePath)) {
return;
}
$mount = $this->getMount($path); $mount = $this->getMount($path);
if ($mount) { if ($mount) {
$mount->getStorage()->releaseLock( $mount->getStorage()->releaseLock(
$mount->getInternalPath( $mount->getInternalPath($absolutePath),
$this->getAbsolutePath($path)
),
$type, $type,
$this->lockingProvider $this->lockingProvider
); );
@ -1717,6 +1726,12 @@ class View {
*/ */
public function lockFile($path, $type) { public function lockFile($path, $type) {
$path = '/' . trim($path, '/'); $path = '/' . trim($path, '/');
$absolutePath = $this->getAbsolutePath($path);
if (!$this->shouldLockFile($absolutePath)) {
return;
}
$this->lockPath($path, $type); $this->lockPath($path, $type);
$parents = $this->getParents($path); $parents = $this->getParents($path);
@ -1733,6 +1748,12 @@ class View {
*/ */
public function unlockFile($path, $type) { public function unlockFile($path, $type) {
$path = rtrim($path, '/'); $path = rtrim($path, '/');
$absolutePath = $this->getAbsolutePath($path);
if (!$this->shouldLockFile($absolutePath)) {
return;
}
$this->unlockPath($path, $type); $this->unlockPath($path, $type);
$parents = $this->getParents($path); $parents = $this->getParents($path);
@ -1740,4 +1761,27 @@ class View {
$this->unlockPath($parent, ILockingProvider::LOCK_SHARED); $this->unlockPath($parent, ILockingProvider::LOCK_SHARED);
} }
} }
/**
* Only lock files in data/user/files/
*
* @param string $path Absolute path to the file/folder we try to (un)lock
* @return bool
*/
protected function shouldLockFile($path) {
$path = Filesystem::normalizePath($path);
if (substr_count($path, '/') >= 3) {
// E.g.: /username/files/path-to-file
$pathSegments = explode('/', $path, 4);
return $pathSegments[2] === 'files';
} else if (substr_count($path, '/') === 2) {
// E.g.: /username/files
$pathSegments = explode('/', $path, 3);
return $pathSegments[2] === 'files';
}
return true;
}
} }