summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-03-20 12:33:59 +0100
committerVincent Petry <pvince81@owncloud.com>2015-05-21 12:18:12 +0200
commit609da64c3bc816a1d7f7599b39a693fb9913088b (patch)
treea4022c956e8f8f4b7e11d8a510d92968ea1dbe7c
parent4e44d2ecd6cc2ac065342591c1af61532b3ba774 (diff)
downloadnextcloud-server-609da64c3bc816a1d7f7599b39a693fb9913088b.tar.gz
nextcloud-server-609da64c3bc816a1d7f7599b39a693fb9913088b.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 f840b9b964f..119f10f430a 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 b58a8c2d639..6f456d8b759 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1010,7 +1010,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);