summaryrefslogtreecommitdiffstats
path: root/lib/private/connector/sabre/objecttree.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-04-02 08:48:37 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-04-02 08:48:37 +0200
commit7086c386fdd1cfcec0ddc0db19615bd4586bade3 (patch)
tree26d7a890bc0350af5260bb7a3736610e533e6d3b /lib/private/connector/sabre/objecttree.php
parent229e3dcba86db3bd91bbddd78079bf340edff710 (diff)
parent73dd5ff26c2d7652fd4abacbac53d734f64fde96 (diff)
downloadnextcloud-server-7086c386fdd1cfcec0ddc0db19615bd4586bade3.tar.gz
nextcloud-server-7086c386fdd1cfcec0ddc0db19615bd4586bade3.zip
Merge branch 'master' into append-error-document
Conflicts: lib/private/setup.php lib/private/updater.php
Diffstat (limited to 'lib/private/connector/sabre/objecttree.php')
-rw-r--r--lib/private/connector/sabre/objecttree.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index d2fa425b22c..accf020daa2 100644
--- a/lib/private/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
@@ -94,6 +94,9 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
}
if ($sourceDir !== $destinationDir) {
// for a full move we need update privileges on sourcePath and sourceDir as well as destinationDir
+ if (ltrim($destinationDir, '/') === '' && strtolower($sourceNode->getName()) === 'shared') {
+ throw new \Sabre_DAV_Exception_Forbidden();
+ }
if (!$fs->isUpdatable($sourceDir)) {
throw new \Sabre_DAV_Exception_Forbidden();
}