summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-03-20 12:33:59 +0100
committerVincent Petry <pvince81@owncloud.com>2015-03-20 12:33:59 +0100
commit67160e086130f01fe73d9198f81a4c3f08f3d9c8 (patch)
treebe4794e36a2550ea06be5b783cf3c8b3b292152d
parenta87cc90d1e7380a58bc4a60bd4cc1894ec41c33b (diff)
downloadnextcloud-server-67160e086130f01fe73d9198f81a4c3f08f3d9c8.tar.gz
nextcloud-server-67160e086130f01fe73d9198f81a4c3f08f3d9c8.zip
Do not automatically add "update" permission to shared mounts
In the past it seems the update permission was needed to be able to rename shared mounts, but it doesn't seem to be the case any more. Removing the "update" permission that used to be added automatically fixes the read-only permission check when trying to overwrite a read-only file over WebDAV.
-rw-r--r--apps/files_sharing/tests/sharedstorage.php3
-rw-r--r--lib/private/files/view.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index 2959b9aacfb..46f75b488b5 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -182,9 +182,8 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
// for the share root we expect:
// the shared permissions (1)
// the delete permission (8), to enable unshare
- // the update permission (2), to allow renaming of the mount point
$rootInfo = \OC\Files\Filesystem::getFileInfo($this->folder);
- $this->assertSame(11, $rootInfo->getPermissions());
+ $this->assertSame(9, $rootInfo->getPermissions());
// for the file within the shared folder we expect:
// the shared permissions (1)
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 53e13396621..c95e0545810 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1133,7 +1133,7 @@ class View {
}
if ($mount instanceof MoveableMount && $internalPath === '') {
- $data['permissions'] |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
+ $data['permissions'] |= \OCP\Constants::PERMISSION_DELETE;
}
$data = \OC_FileProxy::runPostProxies('getFileInfo', $path, $data);