Merge pull request #26677 from nextcloud/backport/26658/stable21

rullzer · web-flow · commit 52c070acaa34 · 2021-04-21T19:54:12.000+02:00
[stable21] Do not stop directory listing when ACL is blocking access
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -261,7 +261,7 @@ protected function getFolderContents($path): iterable {
 						// additionally, it's better to have false negatives here then false positives
 						if ($acl->denies(ACL::MASK_READ) || $acl->denies(ACL::MASK_EXECUTE)) {
 							$this->logger->debug('Hiding non readable entry ' . $file->getName());
-							return false;
+							continue;
 						}
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ protected function getFolderContents($path): iterable {`
`261`	`261`	`// additionally, it's better to have false negatives here then false positives`
`262`	`262`	`if ($acl->denies(ACL::MASK_READ) \|\| $acl->denies(ACL::MASK_EXECUTE)) {`
`263`	`263`	`$this->logger->debug('Hiding non readable entry ' . $file->getName());`
`264`		`- return false;`
	`264`	`+ continue;`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`