summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-06-16 10:47:08 +0200
committerGitHub <noreply@github.com>2017-06-16 10:47:08 +0200
commit698a7cb7f0d15d2eee1854d1e7412e618dcc059e (patch)
tree4c4cdd99ca8fbffe30caa534ba6684aae465c588 /apps/dav/lib
parent74654288e64cfb80e950d223c8575b32d04682a0 (diff)
parentb6d6f3c521ac119b56c045a2379bbe4c4f416d6c (diff)
downloadnextcloud-server-698a7cb7f0d15d2eee1854d1e7412e618dcc059e.tar.gz
nextcloud-server-698a7cb7f0d15d2eee1854d1e7412e618dcc059e.zip
Merge pull request #5124 from nextcloud/allow-dirlisting-with-unreadable-items
Allow dir-listing also when one child is blocked by access control
Diffstat (limited to 'apps/dav/lib')
-rw-r--r--apps/dav/lib/Connector/Sabre/FilesPlugin.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index 30eeaaacf63..efc9a42e5f5 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -288,10 +288,16 @@ class FilesPlugin extends ServerPlugin {
$httpRequest = $this->server->httpRequest;
if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+ /**
+ * This was disabled, because it made dir listing throw an exception,
+ * so users were unable to navigate into folders where one subitem
+ * is blocked by the files_accesscontrol app, see:
+ * https://github.com/nextcloud/files_accesscontrol/issues/65
if (!$node->getFileInfo()->isReadable()) {
// avoid detecting files through this means
throw new NotFound();
}
+ */
$propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
return $node->getFileId();