Fix proper permissions for multiple file access
Fixes #8890 In case you have access to a file via multiple ways, for example: 1. the file is shared with you with permission read only 2. the folder containing the file is shared with your read/write Requesting the getById function on the userFolder would give back two entries but both with the same permissions. Depending on the node you picked this is not right. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
f843b7edfe
commit
4e1161d254
|
@ -302,18 +302,15 @@ class Folder extends Node implements \OCP\Files\Folder {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
// we only need to get the cache info once, since all mounts we found point to the same storage
|
$nodes = array_map(function (ICachedMountInfo $cachedMountInfo) use ($folderMounts, $id) {
|
||||||
|
|
||||||
$mount = $folderMounts[$mountsContainingFile[0]->getMountPoint()];
|
|
||||||
$cacheEntry = $mount->getStorage()->getCache()->get((int)$id);
|
|
||||||
if (!$cacheEntry) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
// cache jails will hide the "true" internal path
|
|
||||||
$internalPath = ltrim($mountsContainingFile[0]->getRootInternalPath() . '/' . $cacheEntry->getPath(), '/');
|
|
||||||
|
|
||||||
$nodes = array_map(function (ICachedMountInfo $cachedMountInfo) use ($cacheEntry, $folderMounts, $internalPath) {
|
|
||||||
$mount = $folderMounts[$cachedMountInfo->getMountPoint()];
|
$mount = $folderMounts[$cachedMountInfo->getMountPoint()];
|
||||||
|
$cacheEntry = $mount->getStorage()->getCache()->get((int)$id);
|
||||||
|
if (!$cacheEntry) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// cache jails will hide the "true" internal path
|
||||||
|
$internalPath = ltrim($cachedMountInfo->getRootInternalPath() . '/' . $cacheEntry->getPath(), '/');
|
||||||
$pathRelativeToMount = substr($internalPath, strlen($cachedMountInfo->getRootInternalPath()));
|
$pathRelativeToMount = substr($internalPath, strlen($cachedMountInfo->getRootInternalPath()));
|
||||||
$pathRelativeToMount = ltrim($pathRelativeToMount, '/');
|
$pathRelativeToMount = ltrim($pathRelativeToMount, '/');
|
||||||
$absolutePath = $cachedMountInfo->getMountPoint() . $pathRelativeToMount;
|
$absolutePath = $cachedMountInfo->getMountPoint() . $pathRelativeToMount;
|
||||||
|
@ -323,6 +320,8 @@ class Folder extends Node implements \OCP\Files\Folder {
|
||||||
));
|
));
|
||||||
}, $mountsContainingFile);
|
}, $mountsContainingFile);
|
||||||
|
|
||||||
|
$nodes = array_filter($nodes);
|
||||||
|
|
||||||
return array_filter($nodes, function (Node $node) {
|
return array_filter($nodes, function (Node $node) {
|
||||||
return $this->getRelativePath($node->getPath());
|
return $this->getRelativePath($node->getPath());
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue