wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4428 from nextcloud/file-by-id-limit-user

Browse source 
limit the user when searching for a file by id if we know the user already
This commit is contained in:
Roeland Jago Douma 2017-04-21 19:43:53 +02:00 committed by GitHub
commit d46b155916
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/Files/Config/UserMountCache.php
View file

@ -220,15 +220,20 @@ class UserMountCache implements IUserMountCache {
/**
* @param int $numericStorageId
* @param string|null $user limit the results to a single user
* @return CachedMountInfo[]
*/
public function getMountsForStorageId($numericStorageId) {
public function getMountsForStorageId($numericStorageId, $user = null) {
$builder = $this->connection->getQueryBuilder();
$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path')
->from('mounts', 'm')
->innerJoin('m', 'filecache', 'f' , $builder->expr()->eq('m.root_id', 'f.fileid'))
->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($numericStorageId, IQueryBuilder::PARAM_INT)));
if ($user) {
$query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
}
$rows = $query->execute()->fetchAll();
return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
@ -278,16 +283,17 @@ class UserMountCache implements IUserMountCache {
/**
* @param int $fileId
* @param string|null $user optionally restrict the results to a single user
* @return ICachedMountInfo[]
* @since 9.0.0
*/
public function getMountsForFileId($fileId) {
public function getMountsForFileId($fileId, $user = null) {
try {
list($storageId, $internalPath) = $this->getCacheInfoFromFileId($fileId);
} catch (NotFoundException $e) {
return [];
}
$mountsForStorage = $this->getMountsForStorageId($storageId);
$mountsForStorage = $this->getMountsForStorageId($storageId, $user);
// filter mounts that are from the same storage but a different directory
return array_filter($mountsForStorage, function (ICachedMountInfo $mount) use ($internalPath, $fileId) {

7
lib/private/Files/Node/Folder.php
View file

@ -280,7 +280,12 @@ class Folder extends Node implements \OCP\Files\Folder {
*/
public function getById($id) {
$mountCache = $this->root->getUserMountCache();
$mountsContainingFile = $mountCache->getMountsForFileId((int)$id);
if (strpos($this->getPath(), '/', 1) > 0) {
list(, $user) = explode('/', $this->getPath());
} else {
$user = null;
}
$mountsContainingFile = $mountCache->getMountsForFileId((int)$id, $user);
$mounts = $this->root->getMountsIn($this->path);
$mounts[] = $this->root->getMount($this->path);
/** @var IMountPoint[] $folderMounts */

6
lib/public/Files/Config/IUserMountCache.php
View file

@ -53,10 +53,11 @@ interface IUserMountCache {
* Get all cached mounts by storage
*
* @param int $numericStorageId
* @param string|null $user limit the results to a single user @since 12.0.0
* @return ICachedMountInfo[]
* @since 9.0.0
*/
public function getMountsForStorageId($numericStorageId);
public function getMountsForStorageId($numericStorageId, $user = null);
/**
* Get all cached mounts by root
@ -71,10 +72,11 @@ interface IUserMountCache {
* Get all cached mounts that contain a file
*
* @param int $fileId
* @param string|null $user optionally restrict the results to a single user @since 12.0.0
* @return ICachedMountInfo[]
* @since 9.0.0
*/
public function getMountsForFileId($fileId);
public function getMountsForFileId($fileId, $user = null);
/**
* Remove all cached mounts for a user