summaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-05-26 12:36:42 +0200
committerJoas Schilling <coding@schilljs.com>2017-05-26 15:54:39 +0200
commitd0c614a322566003205d3599a4215836da19dde5 (patch)
tree9bebbad924205857d694db6ec8af64df144c7ece /apps/dav
parentc1925ddfd03c6e12874137fb1ba497aad8fc0c41 (diff)
downloadnextcloud-server-d0c614a322566003205d3599a4215836da19dde5.tar.gz
nextcloud-server-d0c614a322566003205d3599a4215836da19dde5.zip
Allow dir-listing also when one child is blocked by access control
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/dav')
-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();