Merge pull request #24325 from nextcloud/backport/24103/stable20

MorrisJobke · web-flow · commit 86da5013c802 · 2020-12-01T11:04:22.000+01:00
[stable20] Only check path for being accessible when the storage is a object home
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
@@ -824,7 +824,7 @@ private function isAccessibleResult($data) {
 		$pathSections = explode('/', $data['path'], 2);
 		// FIXME: would not detect rare md5'd home storage case properly
 		if ($pathSections[0] !== 'files'
-				&& in_array(explode(':', $data['storage_string_id'], 2)[0], ['home', 'object'])) {
+			&& (strpos($data['storage_string_id'], 'home::') === 0 || strpos($data['storage_string_id'], 'object::user') === 0)) {
 			return false;
 		}
 		return true;

Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,7 @@ private function isAccessibleResult($data) {`
`824`	`824`	`$pathSections = explode('/', $data['path'], 2);`
`825`	`825`	`// FIXME: would not detect rare md5'd home storage case properly`
`826`	`826`	`if ($pathSections[0] !== 'files'`
`827`		`- && in_array(explode(':', $data['storage_string_id'], 2)[0], ['home', 'object'])) {`
	`827`	`+ && (strpos($data['storage_string_id'], 'home::') === 0 \|\| strpos($data['storage_string_id'], 'object::user') === 0)) {`
`828`	`828`	`return false;`
`829`	`829`	`}`
`830`	`830`	`return true;`