Merge pull request #4400 from nextcloud/backport/4396/stable31

Author: provokateurin

lib/ACL/ACLManager.php

@@ -137,10 +137,12 @@ private function getRelevantPaths(string $path): array {
 	public function getRelevantRulesForPath(array $paths, bool $cache = true): array {
 		$allPaths = [];
 		foreach ($paths as $path) {
-			$allPaths = array_unique(array_merge($allPaths, $this->getRelevantPaths($path)));
+			foreach ($this->getRelevantPaths($path) as $relevantPath) {
+				$allPaths[$relevantPath] = true;
+			}
 		}
 
-		return $this->getRules($allPaths, $cache);
+		return $this->getRules(array_keys($allPaths), $cache);
 	}
 
 	public function getACLPermissionsForPath(string $path): int {
@@ -169,10 +171,14 @@ public function testACLPermissionsForPath(string $path, array $newRules): int {
 	 */
 	public function getPermissionsForPathFromRules(string $path, array $rules): int {
 		$path = ltrim($path, '/');
-		$relevantPaths = $this->getRelevantPaths($path);
-		$rules = array_intersect_key($rules, array_flip($relevantPaths));
+		$filteredRules = [];
+		foreach ($this->getRelevantPaths($path) as $relevantPath) {
+			if (isset($rules[$relevantPath])) {
+				$filteredRules[$relevantPath] = $rules[$relevantPath];
+			}
+		}
 
-		return $this->calculatePermissionsForPath($rules);
+		return $this->calculatePermissionsForPath($filteredRules);
 	}
 
 	/**