nextcloud / server

lib/private/Cache/CappedMemoryCache.php

Indentation +89 added lines, -89 removed lines

@@ -30,93 +30,93 @@
  * @template T
  */
 class CappedMemoryCache implements ICache, \ArrayAccess {
-	private $capacity;
-	/** @var T[] */
-	private $cache = [];
-
-	public function __construct($capacity = 512) {
-		$this->capacity = $capacity;
-	}
-
-	public function hasKey($key): bool {
-		return isset($this->cache[$key]);
-	}
-
-	/**
-	 * @return ?T
-	 */
-	public function get($key) {
-		return $this->cache[$key] ?? null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param T $value
-	 * @param int $ttl
-	 * @return bool
-	 */
-	public function set($key, $value, $ttl = 0): bool {
-		if (is_null($key)) {
-			$this->cache[] = $value;
-		} else {
-			$this->cache[$key] = $value;
-		}
-		$this->garbageCollect();
-		return true;
-	}
-
-	public function remove($key) {
-		unset($this->cache[$key]);
-		return true;
-	}
-
-	public function clear($prefix = '') {
-		$this->cache = [];
-		return true;
-	}
-
-	public function offsetExists($offset): bool {
-		return $this->hasKey($offset);
-	}
-
-	/**
-	 * @return T
-	 */
-	#[\ReturnTypeWillChange]
-	public function &offsetGet($offset) {
-		return $this->cache[$offset];
-	}
-
-	/**
-	 * @param string $offset
-	 * @param T $value
-	 * @return void
-	 */
-	public function offsetSet($offset, $value): void {
-		$this->set($offset, $value);
-	}
-
-	public function offsetUnset($offset): void {
-		$this->remove($offset);
-	}
-
-	/**
-	 * @return T[]
-	 */
-	public function getData() {
-		return $this->cache;
-	}
-
-
-	private function garbageCollect() {
-		while (count($this->cache) > $this->capacity) {
-			reset($this->cache);
-			$key = key($this->cache);
-			$this->remove($key);
-		}
-	}
-
-	public static function isAvailable(): bool {
-		return true;
-	}
+    private $capacity;
+    /** @var T[] */
+    private $cache = [];
+
+    public function __construct($capacity = 512) {
+        $this->capacity = $capacity;
+    }
+
+    public function hasKey($key): bool {
+        return isset($this->cache[$key]);
+    }
+
+    /**
+     * @return ?T
+     */
+    public function get($key) {
+        return $this->cache[$key] ?? null;
+    }
+
+    /**
+     * @param string $key
+     * @param T $value
+     * @param int $ttl
+     * @return bool
+     */
+    public function set($key, $value, $ttl = 0): bool {
+        if (is_null($key)) {
+            $this->cache[] = $value;
+        } else {
+            $this->cache[$key] = $value;
+        }
+        $this->garbageCollect();
+        return true;
+    }
+
+    public function remove($key) {
+        unset($this->cache[$key]);
+        return true;
+    }
+
+    public function clear($prefix = '') {
+        $this->cache = [];
+        return true;
+    }
+
+    public function offsetExists($offset): bool {
+        return $this->hasKey($offset);
+    }
+
+    /**
+     * @return T
+     */
+    #[\ReturnTypeWillChange]
+    public function &offsetGet($offset) {
+        return $this->cache[$offset];
+    }
+
+    /**
+     * @param string $offset
+     * @param T $value
+     * @return void
+     */
+    public function offsetSet($offset, $value): void {
+        $this->set($offset, $value);
+    }
+
+    public function offsetUnset($offset): void {
+        $this->remove($offset);
+    }
+
+    /**
+     * @return T[]
+     */
+    public function getData() {
+        return $this->cache;
+    }
+
+
+    private function garbageCollect() {
+        while (count($this->cache) > $this->capacity) {
+            reset($this->cache);
+            $key = key($this->cache);
+            $this->remove($key);
+        }
+    }
+
+    public static function isAvailable(): bool {
+        return true;
+    }
 }

lib/private/Files/Config/UserMountCache.php

Indentation +421 added lines, -421 removed lines

@@ -45,425 +45,425 @@
  * Cache mounts points per user in the cache so we can easilly look them up
  */
 class UserMountCache implements IUserMountCache {
-	private IDBConnection $connection;
-	private IUserManager $userManager;
-
-	/**
-	 * Cached mount info.
-	 * @var CappedMemoryCache<ICachedMountInfo[]>
-	 **/
-	private CappedMemoryCache $mountsForUsers;
-	private LoggerInterface $logger;
-	/** @var CappedMemoryCache<array> */
-	private CappedMemoryCache $cacheInfoCache;
-
-	/**
-	 * UserMountCache constructor.
-	 */
-	public function __construct(IDBConnection $connection, IUserManager $userManager, LoggerInterface $logger) {
-		$this->connection = $connection;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
-
-	public function registerMounts(IUser $user, array $mounts, array $mountProviderClasses = null) {
-		// filter out non-proper storages coming from unit tests
-		$mounts = array_filter($mounts, function (IMountPoint $mount) {
-			return $mount instanceof SharedMount || ($mount->getStorage() && $mount->getStorage()->getCache());
-		});
-		/** @var ICachedMountInfo[] $newMounts */
-		$newMounts = array_map(function (IMountPoint $mount) use ($user) {
-			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
-			if ($mount->getStorageRootId() === -1) {
-				return null;
-			} else {
-				return new LazyStorageMountInfo($user, $mount);
-			}
-		}, $mounts);
-		$newMounts = array_values(array_filter($newMounts));
-		$newMountRootIds = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getRootId();
-		}, $newMounts);
-		$newMounts = array_combine($newMountRootIds, $newMounts);
-
-		$cachedMounts = $this->getMountsForUser($user);
-		if (is_array($mountProviderClasses)) {
-			$cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses) {
-				return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
-			});
-		}
-		$cachedMountRootIds = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getRootId();
-		}, $cachedMounts);
-		$cachedMounts = array_combine($cachedMountRootIds, $cachedMounts);
-
-		$addedMounts = [];
-		$removedMounts = [];
-
-		foreach ($newMounts as $rootId => $newMount) {
-			if (!isset($cachedMounts[$rootId])) {
-				$addedMounts[] = $newMount;
-			}
-		}
-
-		foreach ($cachedMounts as $rootId => $cachedMount) {
-			if (!isset($newMounts[$rootId])) {
-				$removedMounts[] = $cachedMount;
-			}
-		}
-
-		$changedMounts = $this->findChangedMounts($newMounts, $cachedMounts);
-
-		foreach ($addedMounts as $mount) {
-			$this->addToCache($mount);
-			/** @psalm-suppress InvalidArgument */
-			$this->mountsForUsers[$user->getUID()][] = $mount;
-		}
-		foreach ($removedMounts as $mount) {
-			$this->removeFromCache($mount);
-			$index = array_search($mount, $this->mountsForUsers[$user->getUID()]);
-			unset($this->mountsForUsers[$user->getUID()][$index]);
-		}
-		foreach ($changedMounts as $mount) {
-			$this->updateCachedMount($mount);
-		}
-	}
-
-	/**
-	 * @param ICachedMountInfo[] $newMounts
-	 * @param ICachedMountInfo[] $cachedMounts
-	 * @return ICachedMountInfo[]
-	 */
-	private function findChangedMounts(array $newMounts, array $cachedMounts) {
-		$new = [];
-		foreach ($newMounts as $mount) {
-			$new[$mount->getRootId()] = $mount;
-		}
-		$changed = [];
-		foreach ($cachedMounts as $cachedMount) {
-			$rootId = $cachedMount->getRootId();
-			if (isset($new[$rootId])) {
-				$newMount = $new[$rootId];
-				if (
-					$newMount->getMountPoint() !== $cachedMount->getMountPoint() ||
-					$newMount->getStorageId() !== $cachedMount->getStorageId() ||
-					$newMount->getMountId() !== $cachedMount->getMountId() ||
-					$newMount->getMountProvider() !== $cachedMount->getMountProvider()
-				) {
-					$changed[] = $newMount;
-				}
-			}
-		}
-		return $changed;
-	}
-
-	private function addToCache(ICachedMountInfo $mount) {
-		if ($mount->getStorageId() !== -1) {
-			$this->connection->insertIfNotExist('*PREFIX*mounts', [
-				'storage_id' => $mount->getStorageId(),
-				'root_id' => $mount->getRootId(),
-				'user_id' => $mount->getUser()->getUID(),
-				'mount_point' => $mount->getMountPoint(),
-				'mount_id' => $mount->getMountId(),
-				'mount_provider_class' => $mount->getMountProvider(),
-			], ['root_id', 'user_id']);
-		} else {
-			// in some cases this is legitimate, like orphaned shares
-			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
-		}
-	}
-
-	private function updateCachedMount(ICachedMountInfo $mount) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('mounts')
-			->set('storage_id', $builder->createNamedParameter($mount->getStorageId()))
-			->set('mount_point', $builder->createNamedParameter($mount->getMountPoint()))
-			->set('mount_id', $builder->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT))
-			->set('mount_provider_class', $builder->createNamedParameter($mount->getMountProvider()))
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
-			->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
-
-		$query->execute();
-	}
-
-	private function removeFromCache(ICachedMountInfo $mount) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
-			->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	private function dbRowToMountInfo(array $row) {
-		$user = $this->userManager->get($row['user_id']);
-		if (is_null($user)) {
-			return null;
-		}
-		$mount_id = $row['mount_id'];
-		if (!is_null($mount_id)) {
-			$mount_id = (int)$mount_id;
-		}
-		return new CachedMountInfo(
-			$user,
-			(int)$row['storage_id'],
-			(int)$row['root_id'],
-			$row['mount_point'],
-			$row['mount_provider_class'] ?? '',
-			$mount_id,
-			isset($row['path']) ? $row['path'] : '',
-		);
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return ICachedMountInfo[]
-	 */
-	public function getMountsForUser(IUser $user) {
-		if (!isset($this->mountsForUsers[$user->getUID()])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-				->from('mounts', 'm')
-				->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-				->where($builder->expr()->eq('user_id', $builder->createPositionalParameter($user->getUID())));
-
-			$result = $query->execute();
-			$rows = $result->fetchAll();
-			$result->closeCursor();
-
-			$this->mountsForUsers[$user->getUID()] = array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-		}
-		return $this->mountsForUsers[$user->getUID()];
-	}
-
-	/**
-	 * @param int $numericStorageId
-	 * @param string|null $user limit the results to a single user
-	 * @return CachedMountInfo[]
-	 */
-	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', 'mount_provider_class')
-			->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)));
-		}
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-	}
-
-	/**
-	 * @param int $rootFileId
-	 * @return CachedMountInfo[]
-	 */
-	public function getMountsForRootId($rootFileId) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('root_id', $builder->createPositionalParameter($rootFileId, IQueryBuilder::PARAM_INT)));
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-	}
-
-	/**
-	 * @param $fileId
-	 * @return array{int, string, int}
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function getCacheInfoFromFileId($fileId): array {
-		if (!isset($this->cacheInfoCache[$fileId])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select('storage', 'path', 'mimetype')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-
-			$result = $query->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
-
-			if (is_array($row)) {
-				$this->cacheInfoCache[$fileId] = [
-					(int)$row['storage'],
-					(string)$row['path'],
-					(int)$row['mimetype']
-				];
-			} else {
-				throw new NotFoundException('File with id "' . $fileId . '" not found');
-			}
-		}
-		return $this->cacheInfoCache[$fileId];
-	}
-
-	/**
-	 * @param int $fileId
-	 * @param string|null $user optionally restrict the results to a single user
-	 * @return ICachedMountFileInfo[]
-	 * @since 9.0.0
-	 */
-	public function getMountsForFileId($fileId, $user = null) {
-		try {
-			[$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
-		} catch (NotFoundException $e) {
-			return [];
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($storageId, IQueryBuilder::PARAM_INT)));
-
-		if ($user) {
-			$query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
-		}
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-		// filter mounts that are from the same storage but a different directory
-		$filteredMounts = array_filter($rows, function (array $row) use ($internalPath, $fileId) {
-			if ($fileId === (int)$row['root_id']) {
-				return true;
-			}
-			$internalMountPath = $row['path'] ?? '';
-
-			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
-		});
-
-		$filteredMounts = array_filter(array_map([$this, 'dbRowToMountInfo'], $filteredMounts));
-		return array_map(function (ICachedMountInfo $mount) use ($internalPath) {
-			return new CachedMountFileInfo(
-				$mount->getUser(),
-				$mount->getStorageId(),
-				$mount->getRootId(),
-				$mount->getMountPoint(),
-				$mount->getMountId(),
-				$mount->getMountProvider(),
-				$mount->getRootInternalPath(),
-				$internalPath
-			);
-		}, $filteredMounts);
-	}
-
-	/**
-	 * Remove all cached mounts for a user
-	 *
-	 * @param IUser $user
-	 */
-	public function removeUserMounts(IUser $user) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
-		$query->execute();
-	}
-
-	public function removeUserStorageMount($storageId, $userId) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
-			->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	public function remoteStorageMounts($storageId) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * @param array $users
-	 * @return array
-	 */
-	public function getUsedSpaceForUsers(array $users) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$slash = $builder->createNamedParameter('/');
-
-		$mountPoint = $builder->func()->concat(
-			$builder->func()->concat($slash, 'user_id'),
-			$slash
-		);
-
-		$userIds = array_map(function (IUser $user) {
-			return $user->getUID();
-		}, $users);
-
-		$query = $builder->select('m.user_id', 'f.size')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f',
-				$builder->expr()->andX(
-					$builder->expr()->eq('m.storage_id', 'f.storage'),
-					$builder->expr()->eq('f.path_hash', $builder->createNamedParameter(md5('files')))
-				))
-			->where($builder->expr()->eq('m.mount_point', $mountPoint))
-			->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$result = $query->execute();
-
-		$results = [];
-		while ($row = $result->fetch()) {
-			$results[$row['user_id']] = $row['size'];
-		}
-		$result->closeCursor();
-		return $results;
-	}
-
-	public function clear(): void {
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
-
-	public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
-		$mounts = $this->getMountsForUser($user);
-		$mountPoints = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getMountPoint();
-		}, $mounts);
-		$mounts = array_combine($mountPoints, $mounts);
-
-		$current = $path;
-		// walk up the directory tree until we find a path that has a mountpoint set
-		// the loop will return if a mountpoint is found or break if none are found
-		while (true) {
-			$mountPoint = $current . '/';
-			if (isset($mounts[$mountPoint])) {
-				return $mounts[$mountPoint];
-			} elseif ($current === '') {
-				break;
-			}
-
-			$current = dirname($current);
-			if ($current === '.' || $current === '/') {
-				$current = '';
-			}
-		}
-
-		throw new NotFoundException("No cached mount for path " . $path);
-	}
-
-	public function getMountsInPath(IUser $user, string $path): array {
-		$path = rtrim($path, '/') . '/';
-		$mounts = $this->getMountsForUser($user);
-		return array_filter($mounts, function (ICachedMountInfo $mount) use ($path) {
-			return $mount->getMountPoint() !== $path && strpos($mount->getMountPoint(), $path) === 0;
-		});
-	}
+    private IDBConnection $connection;
+    private IUserManager $userManager;
+
+    /**
+     * Cached mount info.
+     * @var CappedMemoryCache<ICachedMountInfo[]>
+     **/
+    private CappedMemoryCache $mountsForUsers;
+    private LoggerInterface $logger;
+    /** @var CappedMemoryCache<array> */
+    private CappedMemoryCache $cacheInfoCache;
+
+    /**
+     * UserMountCache constructor.
+     */
+    public function __construct(IDBConnection $connection, IUserManager $userManager, LoggerInterface $logger) {
+        $this->connection = $connection;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
+
+    public function registerMounts(IUser $user, array $mounts, array $mountProviderClasses = null) {
+        // filter out non-proper storages coming from unit tests
+        $mounts = array_filter($mounts, function (IMountPoint $mount) {
+            return $mount instanceof SharedMount || ($mount->getStorage() && $mount->getStorage()->getCache());
+        });
+        /** @var ICachedMountInfo[] $newMounts */
+        $newMounts = array_map(function (IMountPoint $mount) use ($user) {
+            // filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
+            if ($mount->getStorageRootId() === -1) {
+                return null;
+            } else {
+                return new LazyStorageMountInfo($user, $mount);
+            }
+        }, $mounts);
+        $newMounts = array_values(array_filter($newMounts));
+        $newMountRootIds = array_map(function (ICachedMountInfo $mount) {
+            return $mount->getRootId();
+        }, $newMounts);
+        $newMounts = array_combine($newMountRootIds, $newMounts);
+
+        $cachedMounts = $this->getMountsForUser($user);
+        if (is_array($mountProviderClasses)) {
+            $cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses) {
+                return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
+            });
+        }
+        $cachedMountRootIds = array_map(function (ICachedMountInfo $mount) {
+            return $mount->getRootId();
+        }, $cachedMounts);
+        $cachedMounts = array_combine($cachedMountRootIds, $cachedMounts);
+
+        $addedMounts = [];
+        $removedMounts = [];
+
+        foreach ($newMounts as $rootId => $newMount) {
+            if (!isset($cachedMounts[$rootId])) {
+                $addedMounts[] = $newMount;
+            }
+        }
+
+        foreach ($cachedMounts as $rootId => $cachedMount) {
+            if (!isset($newMounts[$rootId])) {
+                $removedMounts[] = $cachedMount;
+            }
+        }
+
+        $changedMounts = $this->findChangedMounts($newMounts, $cachedMounts);
+
+        foreach ($addedMounts as $mount) {
+            $this->addToCache($mount);
+            /** @psalm-suppress InvalidArgument */
+            $this->mountsForUsers[$user->getUID()][] = $mount;
+        }
+        foreach ($removedMounts as $mount) {
+            $this->removeFromCache($mount);
+            $index = array_search($mount, $this->mountsForUsers[$user->getUID()]);
+            unset($this->mountsForUsers[$user->getUID()][$index]);
+        }
+        foreach ($changedMounts as $mount) {
+            $this->updateCachedMount($mount);
+        }
+    }
+
+    /**
+     * @param ICachedMountInfo[] $newMounts
+     * @param ICachedMountInfo[] $cachedMounts
+     * @return ICachedMountInfo[]
+     */
+    private function findChangedMounts(array $newMounts, array $cachedMounts) {
+        $new = [];
+        foreach ($newMounts as $mount) {
+            $new[$mount->getRootId()] = $mount;
+        }
+        $changed = [];
+        foreach ($cachedMounts as $cachedMount) {
+            $rootId = $cachedMount->getRootId();
+            if (isset($new[$rootId])) {
+                $newMount = $new[$rootId];
+                if (
+                    $newMount->getMountPoint() !== $cachedMount->getMountPoint() ||
+                    $newMount->getStorageId() !== $cachedMount->getStorageId() ||
+                    $newMount->getMountId() !== $cachedMount->getMountId() ||
+                    $newMount->getMountProvider() !== $cachedMount->getMountProvider()
+                ) {
+                    $changed[] = $newMount;
+                }
+            }
+        }
+        return $changed;
+    }
+
+    private function addToCache(ICachedMountInfo $mount) {
+        if ($mount->getStorageId() !== -1) {
+            $this->connection->insertIfNotExist('*PREFIX*mounts', [
+                'storage_id' => $mount->getStorageId(),
+                'root_id' => $mount->getRootId(),
+                'user_id' => $mount->getUser()->getUID(),
+                'mount_point' => $mount->getMountPoint(),
+                'mount_id' => $mount->getMountId(),
+                'mount_provider_class' => $mount->getMountProvider(),
+            ], ['root_id', 'user_id']);
+        } else {
+            // in some cases this is legitimate, like orphaned shares
+            $this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
+        }
+    }
+
+    private function updateCachedMount(ICachedMountInfo $mount) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('mounts')
+            ->set('storage_id', $builder->createNamedParameter($mount->getStorageId()))
+            ->set('mount_point', $builder->createNamedParameter($mount->getMountPoint()))
+            ->set('mount_id', $builder->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT))
+            ->set('mount_provider_class', $builder->createNamedParameter($mount->getMountProvider()))
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
+            ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
+
+        $query->execute();
+    }
+
+    private function removeFromCache(ICachedMountInfo $mount) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
+            ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    private function dbRowToMountInfo(array $row) {
+        $user = $this->userManager->get($row['user_id']);
+        if (is_null($user)) {
+            return null;
+        }
+        $mount_id = $row['mount_id'];
+        if (!is_null($mount_id)) {
+            $mount_id = (int)$mount_id;
+        }
+        return new CachedMountInfo(
+            $user,
+            (int)$row['storage_id'],
+            (int)$row['root_id'],
+            $row['mount_point'],
+            $row['mount_provider_class'] ?? '',
+            $mount_id,
+            isset($row['path']) ? $row['path'] : '',
+        );
+    }
+
+    /**
+     * @param IUser $user
+     * @return ICachedMountInfo[]
+     */
+    public function getMountsForUser(IUser $user) {
+        if (!isset($this->mountsForUsers[$user->getUID()])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+                ->from('mounts', 'm')
+                ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+                ->where($builder->expr()->eq('user_id', $builder->createPositionalParameter($user->getUID())));
+
+            $result = $query->execute();
+            $rows = $result->fetchAll();
+            $result->closeCursor();
+
+            $this->mountsForUsers[$user->getUID()] = array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+        }
+        return $this->mountsForUsers[$user->getUID()];
+    }
+
+    /**
+     * @param int $numericStorageId
+     * @param string|null $user limit the results to a single user
+     * @return CachedMountInfo[]
+     */
+    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', 'mount_provider_class')
+            ->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)));
+        }
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+    }
+
+    /**
+     * @param int $rootFileId
+     * @return CachedMountInfo[]
+     */
+    public function getMountsForRootId($rootFileId) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('root_id', $builder->createPositionalParameter($rootFileId, IQueryBuilder::PARAM_INT)));
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+    }
+
+    /**
+     * @param $fileId
+     * @return array{int, string, int}
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function getCacheInfoFromFileId($fileId): array {
+        if (!isset($this->cacheInfoCache[$fileId])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select('storage', 'path', 'mimetype')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+
+            $result = $query->execute();
+            $row = $result->fetch();
+            $result->closeCursor();
+
+            if (is_array($row)) {
+                $this->cacheInfoCache[$fileId] = [
+                    (int)$row['storage'],
+                    (string)$row['path'],
+                    (int)$row['mimetype']
+                ];
+            } else {
+                throw new NotFoundException('File with id "' . $fileId . '" not found');
+            }
+        }
+        return $this->cacheInfoCache[$fileId];
+    }
+
+    /**
+     * @param int $fileId
+     * @param string|null $user optionally restrict the results to a single user
+     * @return ICachedMountFileInfo[]
+     * @since 9.0.0
+     */
+    public function getMountsForFileId($fileId, $user = null) {
+        try {
+            [$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
+        } catch (NotFoundException $e) {
+            return [];
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($storageId, IQueryBuilder::PARAM_INT)));
+
+        if ($user) {
+            $query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
+        }
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+        // filter mounts that are from the same storage but a different directory
+        $filteredMounts = array_filter($rows, function (array $row) use ($internalPath, $fileId) {
+            if ($fileId === (int)$row['root_id']) {
+                return true;
+            }
+            $internalMountPath = $row['path'] ?? '';
+
+            return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
+        });
+
+        $filteredMounts = array_filter(array_map([$this, 'dbRowToMountInfo'], $filteredMounts));
+        return array_map(function (ICachedMountInfo $mount) use ($internalPath) {
+            return new CachedMountFileInfo(
+                $mount->getUser(),
+                $mount->getStorageId(),
+                $mount->getRootId(),
+                $mount->getMountPoint(),
+                $mount->getMountId(),
+                $mount->getMountProvider(),
+                $mount->getRootInternalPath(),
+                $internalPath
+            );
+        }, $filteredMounts);
+    }
+
+    /**
+     * Remove all cached mounts for a user
+     *
+     * @param IUser $user
+     */
+    public function removeUserMounts(IUser $user) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
+        $query->execute();
+    }
+
+    public function removeUserStorageMount($storageId, $userId) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
+            ->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    public function remoteStorageMounts($storageId) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * @param array $users
+     * @return array
+     */
+    public function getUsedSpaceForUsers(array $users) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $slash = $builder->createNamedParameter('/');
+
+        $mountPoint = $builder->func()->concat(
+            $builder->func()->concat($slash, 'user_id'),
+            $slash
+        );
+
+        $userIds = array_map(function (IUser $user) {
+            return $user->getUID();
+        }, $users);
+
+        $query = $builder->select('m.user_id', 'f.size')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f',
+                $builder->expr()->andX(
+                    $builder->expr()->eq('m.storage_id', 'f.storage'),
+                    $builder->expr()->eq('f.path_hash', $builder->createNamedParameter(md5('files')))
+                ))
+            ->where($builder->expr()->eq('m.mount_point', $mountPoint))
+            ->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $result = $query->execute();
+
+        $results = [];
+        while ($row = $result->fetch()) {
+            $results[$row['user_id']] = $row['size'];
+        }
+        $result->closeCursor();
+        return $results;
+    }
+
+    public function clear(): void {
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
+
+    public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
+        $mounts = $this->getMountsForUser($user);
+        $mountPoints = array_map(function (ICachedMountInfo $mount) {
+            return $mount->getMountPoint();
+        }, $mounts);
+        $mounts = array_combine($mountPoints, $mounts);
+
+        $current = $path;
+        // walk up the directory tree until we find a path that has a mountpoint set
+        // the loop will return if a mountpoint is found or break if none are found
+        while (true) {
+            $mountPoint = $current . '/';
+            if (isset($mounts[$mountPoint])) {
+                return $mounts[$mountPoint];
+            } elseif ($current === '') {
+                break;
+            }
+
+            $current = dirname($current);
+            if ($current === '.' || $current === '/') {
+                $current = '';
+            }
+        }
+
+        throw new NotFoundException("No cached mount for path " . $path);
+    }
+
+    public function getMountsInPath(IUser $user, string $path): array {
+        $path = rtrim($path, '/') . '/';
+        $mounts = $this->getMountsForUser($user);
+        return array_filter($mounts, function (ICachedMountInfo $mount) use ($path) {
+            return $mount->getMountPoint() !== $path && strpos($mount->getMountPoint(), $path) === 0;
+        });
+    }
 }

lib/private/Files/AppData/AppData.php

Indentation +131 added lines, -131 removed lines

@@ -38,135 +38,135 @@
 use OCP\Files\SimpleFS\ISimpleFolder;
 
 class AppData implements IAppData {
-	private IRootFolder $rootFolder;
-	private SystemConfig $config;
-	private string $appId;
-	private ?Folder $folder = null;
-	/** @var CappedMemoryCache<ISimpleFolder|NotFoundException> */
-	private CappedMemoryCache $folders;
-
-	/**
-	 * AppData constructor.
-	 *
-	 * @param IRootFolder $rootFolder
-	 * @param SystemConfig $systemConfig
-	 * @param string $appId
-	 */
-	public function __construct(IRootFolder $rootFolder,
-								SystemConfig $systemConfig,
-								string $appId) {
-		$this->rootFolder = $rootFolder;
-		$this->config = $systemConfig;
-		$this->appId = $appId;
-		$this->folders = new CappedMemoryCache();
-	}
-
-	private function getAppDataFolderName() {
-		$instanceId = $this->config->getValue('instanceid', null);
-		if ($instanceId === null) {
-			throw new \RuntimeException('no instance id!');
-		}
-
-		return 'appdata_' . $instanceId;
-	}
-
-	protected function getAppDataRootFolder(): Folder {
-		$name = $this->getAppDataFolderName();
-
-		try {
-			/** @var Folder $node */
-			$node = $this->rootFolder->get($name);
-			return $node;
-		} catch (NotFoundException $e) {
-			try {
-				return $this->rootFolder->newFolder($name);
-			} catch (NotPermittedException $e) {
-				throw new \RuntimeException('Could not get appdata folder');
-			}
-		}
-	}
-
-	/**
-	 * @return Folder
-	 * @throws \RuntimeException
-	 */
-	private function getAppDataFolder(): Folder {
-		if ($this->folder === null) {
-			$name = $this->getAppDataFolderName();
-
-			try {
-				$this->folder = $this->rootFolder->get($name . '/' . $this->appId);
-			} catch (NotFoundException $e) {
-				$appDataRootFolder = $this->getAppDataRootFolder();
-
-				try {
-					$this->folder = $appDataRootFolder->get($this->appId);
-				} catch (NotFoundException $e) {
-					try {
-						$this->folder = $appDataRootFolder->newFolder($this->appId);
-					} catch (NotPermittedException $e) {
-						throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
-					}
-				}
-			}
-		}
-
-		return $this->folder;
-	}
-
-	public function getFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
-		if ($cachedFolder = $this->folders->get($key)) {
-			if ($cachedFolder instanceof \Exception) {
-				throw $cachedFolder;
-			} else {
-				return $cachedFolder;
-			}
-		}
-		try {
-			// Hardening if somebody wants to retrieve '/'
-			if ($name === '/') {
-				$node = $this->getAppDataFolder();
-			} else {
-				$path = $this->getAppDataFolderName() . '/' . $this->appId . '/' . $name;
-				$node = $this->rootFolder->get($path);
-			}
-		} catch (NotFoundException $e) {
-			$this->folders->set($key, $e);
-			throw $e;
-		}
-
-		/** @var Folder $node */
-		$folder = new SimpleFolder($node);
-		$this->folders->set($key, $folder);
-		return $folder;
-	}
-
-	public function newFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
-		$folder = $this->getAppDataFolder()->newFolder($name);
-
-		$simpleFolder = new SimpleFolder($folder);
-		$this->folders->set($key, $simpleFolder);
-		return $simpleFolder;
-	}
-
-	public function getDirectoryListing(): array {
-		$listing = $this->getAppDataFolder()->getDirectoryListing();
-
-		$fileListing = array_map(function (Node $folder) {
-			if ($folder instanceof Folder) {
-				return new SimpleFolder($folder);
-			}
-			return null;
-		}, $listing);
-
-		$fileListing = array_filter($fileListing);
-
-		return array_values($fileListing);
-	}
-
-	public function getId(): int {
-		return $this->getAppDataFolder()->getId();
-	}
+    private IRootFolder $rootFolder;
+    private SystemConfig $config;
+    private string $appId;
+    private ?Folder $folder = null;
+    /** @var CappedMemoryCache<ISimpleFolder|NotFoundException> */
+    private CappedMemoryCache $folders;
+
+    /**
+     * AppData constructor.
+     *
+     * @param IRootFolder $rootFolder
+     * @param SystemConfig $systemConfig
+     * @param string $appId
+     */
+    public function __construct(IRootFolder $rootFolder,
+                                SystemConfig $systemConfig,
+                                string $appId) {
+        $this->rootFolder = $rootFolder;
+        $this->config = $systemConfig;
+        $this->appId = $appId;
+        $this->folders = new CappedMemoryCache();
+    }
+
+    private function getAppDataFolderName() {
+        $instanceId = $this->config->getValue('instanceid', null);
+        if ($instanceId === null) {
+            throw new \RuntimeException('no instance id!');
+        }
+
+        return 'appdata_' . $instanceId;
+    }
+
+    protected function getAppDataRootFolder(): Folder {
+        $name = $this->getAppDataFolderName();
+
+        try {
+            /** @var Folder $node */
+            $node = $this->rootFolder->get($name);
+            return $node;
+        } catch (NotFoundException $e) {
+            try {
+                return $this->rootFolder->newFolder($name);
+            } catch (NotPermittedException $e) {
+                throw new \RuntimeException('Could not get appdata folder');
+            }
+        }
+    }
+
+    /**
+     * @return Folder
+     * @throws \RuntimeException
+     */
+    private function getAppDataFolder(): Folder {
+        if ($this->folder === null) {
+            $name = $this->getAppDataFolderName();
+
+            try {
+                $this->folder = $this->rootFolder->get($name . '/' . $this->appId);
+            } catch (NotFoundException $e) {
+                $appDataRootFolder = $this->getAppDataRootFolder();
+
+                try {
+                    $this->folder = $appDataRootFolder->get($this->appId);
+                } catch (NotFoundException $e) {
+                    try {
+                        $this->folder = $appDataRootFolder->newFolder($this->appId);
+                    } catch (NotPermittedException $e) {
+                        throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
+                    }
+                }
+            }
+        }
+
+        return $this->folder;
+    }
+
+    public function getFolder(string $name): ISimpleFolder {
+        $key = $this->appId . '/' . $name;
+        if ($cachedFolder = $this->folders->get($key)) {
+            if ($cachedFolder instanceof \Exception) {
+                throw $cachedFolder;
+            } else {
+                return $cachedFolder;
+            }
+        }
+        try {
+            // Hardening if somebody wants to retrieve '/'
+            if ($name === '/') {
+                $node = $this->getAppDataFolder();
+            } else {
+                $path = $this->getAppDataFolderName() . '/' . $this->appId . '/' . $name;
+                $node = $this->rootFolder->get($path);
+            }
+        } catch (NotFoundException $e) {
+            $this->folders->set($key, $e);
+            throw $e;
+        }
+
+        /** @var Folder $node */
+        $folder = new SimpleFolder($node);
+        $this->folders->set($key, $folder);
+        return $folder;
+    }
+
+    public function newFolder(string $name): ISimpleFolder {
+        $key = $this->appId . '/' . $name;
+        $folder = $this->getAppDataFolder()->newFolder($name);
+
+        $simpleFolder = new SimpleFolder($folder);
+        $this->folders->set($key, $simpleFolder);
+        return $simpleFolder;
+    }
+
+    public function getDirectoryListing(): array {
+        $listing = $this->getAppDataFolder()->getDirectoryListing();
+
+        $fileListing = array_map(function (Node $folder) {
+            if ($folder instanceof Folder) {
+                return new SimpleFolder($folder);
+            }
+            return null;
+        }, $listing);
+
+        $fileListing = array_filter($fileListing);
+
+        return array_values($fileListing);
+    }
+
+    public function getId(): int {
+        return $this->getAppDataFolder()->getId();
+    }
 }

lib/private/Diagnostics/QueryLogger.php

Indentation +52 added lines, -52 removed lines

@@ -28,64 +28,64 @@
 use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
-	protected int $index = 0;
-	protected ?Query $activeQuery = null;
-	/** @var CappedMemoryCache<Query> */
-	protected CappedMemoryCache $queries;
+    protected int $index = 0;
+    protected ?Query $activeQuery = null;
+    /** @var CappedMemoryCache<Query> */
+    protected CappedMemoryCache $queries;
 
-	/**
-	 * QueryLogger constructor.
-	 */
-	public function __construct() {
-		$this->queries = new CappedMemoryCache(1024);
-	}
+    /**
+     * QueryLogger constructor.
+     */
+    public function __construct() {
+        $this->queries = new CappedMemoryCache(1024);
+    }
 
 
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function startQuery($sql, array $params = null, array $types = null) {
-		if ($this->activated) {
-			$this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function startQuery($sql, array $params = null, array $types = null) {
+        if ($this->activated) {
+            $this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
+        }
+    }
 
-	private function getStack() {
-		$stack = debug_backtrace();
-		array_shift($stack);
-		array_shift($stack);
-		array_shift($stack);
-		return $stack;
-	}
+    private function getStack() {
+        $stack = debug_backtrace();
+        array_shift($stack);
+        array_shift($stack);
+        array_shift($stack);
+        return $stack;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function stopQuery() {
-		if ($this->activated && $this->activeQuery) {
-			$this->activeQuery->end(microtime(true));
-			$this->queries[(string)$this->index] = $this->activeQuery;
-			$this->index++;
-			$this->activeQuery = null;
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function stopQuery() {
+        if ($this->activated && $this->activeQuery) {
+            $this->activeQuery->end(microtime(true));
+            $this->queries[(string)$this->index] = $this->activeQuery;
+            $this->index++;
+            $this->activeQuery = null;
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getQueries() {
-		return $this->queries->getData();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getQueries() {
+        return $this->queries->getData();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	public function stopQuery() {
 		if ($this->activated && $this->activeQuery) {
 			$this->activeQuery->end(microtime(true));
-			$this->queries[(string)$this->index] = $this->activeQuery;
+			$this->queries[(string) $this->index] = $this->activeQuery;
 			$this->index++;
 			$this->activeQuery = null;
 		}

lib/private/Encryption/File.php

Indentation +92 added lines, -92 removed lines

@@ -35,96 +35,96 @@
 
 class File implements \OCP\Encryption\IFile {
 
-	/** @var Util */
-	protected $util;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IManager */
-	private $shareManager;
-
-	/**
-	 * cache results of already checked folders
-	 *
-	 * @var CappedMemoryCache<array>
-	 */
-	protected CappedMemoryCache $cache;
-
-	public function __construct(Util $util,
-								IRootFolder $rootFolder,
-								IManager $shareManager) {
-		$this->util = $util;
-		$this->cache = new CappedMemoryCache();
-		$this->rootFolder = $rootFolder;
-		$this->shareManager = $shareManager;
-	}
-
-
-	/**
-	 * Get list of users with access to the file
-	 *
-	 * @param string $path to the file
-	 * @return array{users: string[], public: bool}
-	 */
-	public function getAccessList($path) {
-
-		// Make sure that a share key is generated for the owner too
-		[$owner, $ownerPath] = $this->util->getUidAndFilename($path);
-
-		// always add owner to the list of users with access to the file
-		$userIds = [$owner];
-
-		if (!$this->util->isFile($owner . '/' . $ownerPath)) {
-			return ['users' => $userIds, 'public' => false];
-		}
-
-		$ownerPath = substr($ownerPath, strlen('/files'));
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		try {
-			$file = $userFolder->get($ownerPath);
-		} catch (NotFoundException $e) {
-			$file = null;
-		}
-		$ownerPath = $this->util->stripPartialFileExtension($ownerPath);
-
-		// first get the shares for the parent and cache the result so that we don't
-		// need to check all parents for every file
-		$parent = dirname($ownerPath);
-		$parentNode = $userFolder->get($parent);
-		if (isset($this->cache[$parent])) {
-			$resultForParents = $this->cache[$parent];
-		} else {
-			$resultForParents = $this->shareManager->getAccessList($parentNode);
-			$this->cache[$parent] = $resultForParents;
-		}
-		$userIds = array_merge($userIds, $resultForParents['users']);
-		$public = $resultForParents['public'] || $resultForParents['remote'];
-
-
-		// Find out who, if anyone, is sharing the file
-		if ($file !== null) {
-			$resultForFile = $this->shareManager->getAccessList($file, false);
-			$userIds = array_merge($userIds, $resultForFile['users']);
-			$public = $resultForFile['public'] || $resultForFile['remote'] || $public;
-		}
-
-		// check if it is a group mount
-		if (\OCP\App::isEnabled("files_external")) {
-			/** @var GlobalStoragesService $storageService */
-			$storageService = \OC::$server->get(GlobalStoragesService::class);
-			$storages = $storageService->getAllStorages();
-			foreach ($storages as $storage) {
-				if ($storage->getMountPoint() == substr($ownerPath, 0, strlen($storage->getMountPoint()))) {
-					$mountedFor = $this->util->getUserWithAccessToMountPoint($storage->getApplicableUsers(), $storage->getApplicableGroups());
-					$userIds = array_merge($userIds, $mountedFor);
-				}
-			}
-		}
-
-		// Remove duplicate UIDs
-		$uniqueUserIds = array_unique($userIds);
-
-		return ['users' => $uniqueUserIds, 'public' => $public];
-	}
+    /** @var Util */
+    protected $util;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IManager */
+    private $shareManager;
+
+    /**
+     * cache results of already checked folders
+     *
+     * @var CappedMemoryCache<array>
+     */
+    protected CappedMemoryCache $cache;
+
+    public function __construct(Util $util,
+                                IRootFolder $rootFolder,
+                                IManager $shareManager) {
+        $this->util = $util;
+        $this->cache = new CappedMemoryCache();
+        $this->rootFolder = $rootFolder;
+        $this->shareManager = $shareManager;
+    }
+
+
+    /**
+     * Get list of users with access to the file
+     *
+     * @param string $path to the file
+     * @return array{users: string[], public: bool}
+     */
+    public function getAccessList($path) {
+
+        // Make sure that a share key is generated for the owner too
+        [$owner, $ownerPath] = $this->util->getUidAndFilename($path);
+
+        // always add owner to the list of users with access to the file
+        $userIds = [$owner];
+
+        if (!$this->util->isFile($owner . '/' . $ownerPath)) {
+            return ['users' => $userIds, 'public' => false];
+        }
+
+        $ownerPath = substr($ownerPath, strlen('/files'));
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        try {
+            $file = $userFolder->get($ownerPath);
+        } catch (NotFoundException $e) {
+            $file = null;
+        }
+        $ownerPath = $this->util->stripPartialFileExtension($ownerPath);
+
+        // first get the shares for the parent and cache the result so that we don't
+        // need to check all parents for every file
+        $parent = dirname($ownerPath);
+        $parentNode = $userFolder->get($parent);
+        if (isset($this->cache[$parent])) {
+            $resultForParents = $this->cache[$parent];
+        } else {
+            $resultForParents = $this->shareManager->getAccessList($parentNode);
+            $this->cache[$parent] = $resultForParents;
+        }
+        $userIds = array_merge($userIds, $resultForParents['users']);
+        $public = $resultForParents['public'] || $resultForParents['remote'];
+
+
+        // Find out who, if anyone, is sharing the file
+        if ($file !== null) {
+            $resultForFile = $this->shareManager->getAccessList($file, false);
+            $userIds = array_merge($userIds, $resultForFile['users']);
+            $public = $resultForFile['public'] || $resultForFile['remote'] || $public;
+        }
+
+        // check if it is a group mount
+        if (\OCP\App::isEnabled("files_external")) {
+            /** @var GlobalStoragesService $storageService */
+            $storageService = \OC::$server->get(GlobalStoragesService::class);
+            $storages = $storageService->getAllStorages();
+            foreach ($storages as $storage) {
+                if ($storage->getMountPoint() == substr($ownerPath, 0, strlen($storage->getMountPoint()))) {
+                    $mountedFor = $this->util->getUserWithAccessToMountPoint($storage->getApplicableUsers(), $storage->getApplicableGroups());
+                    $userIds = array_merge($userIds, $mountedFor);
+                }
+            }
+        }
+
+        // Remove duplicate UIDs
+        $uniqueUserIds = array_unique($userIds);
+
+        return ['users' => $uniqueUserIds, 'public' => $public];
+    }
 }

lib/private/Encryption/Util.php

Indentation +366 added lines, -366 removed lines

@@ -39,370 +39,370 @@
 use OCP\IUser;
 
 class Util {
-	public const HEADER_START = 'HBEGIN';
-	public const HEADER_END = 'HEND';
-	public const HEADER_PADDING_CHAR = '-';
-
-	public const HEADER_ENCRYPTION_MODULE_KEY = 'oc_encryption_module';
-
-	/**
-	 * block size will always be 8192 for a PHP stream
-	 * @see https://bugs.php.net/bug.php?id=21641
-	 * @var integer
-	 */
-	protected $headerSize = 8192;
-
-	/**
-	 * block size will always be 8192 for a PHP stream
-	 * @see https://bugs.php.net/bug.php?id=21641
-	 * @var integer
-	 */
-	protected $blockSize = 8192;
-
-	/** @var View */
-	protected $rootView;
-
-	/** @var array */
-	protected $ocHeaderKeys;
-
-	/** @var \OC\User\Manager */
-	protected $userManager;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var array paths excluded from encryption */
-	protected $excludedPaths;
-
-	/** @var \OC\Group\Manager $manager */
-	protected $groupManager;
-
-	/**
-	 *
-	 * @param View $rootView
-	 * @param \OC\User\Manager $userManager
-	 * @param \OC\Group\Manager $groupManager
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		View $rootView,
-		\OC\User\Manager $userManager,
-		\OC\Group\Manager $groupManager,
-		IConfig $config) {
-		$this->ocHeaderKeys = [
-			self::HEADER_ENCRYPTION_MODULE_KEY
-		];
-
-		$this->rootView = $rootView;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->config = $config;
-
-		$this->excludedPaths[] = 'files_encryption';
-		$this->excludedPaths[] = 'appdata_' . $config->getSystemValue('instanceid', null);
-		$this->excludedPaths[] = 'files_external';
-	}
-
-	/**
-	 * read encryption module ID from header
-	 *
-	 * @param array $header
-	 * @return string
-	 * @throws ModuleDoesNotExistsException
-	 */
-	public function getEncryptionModuleId(array $header = null) {
-		$id = '';
-		$encryptionModuleKey = self::HEADER_ENCRYPTION_MODULE_KEY;
-
-		if (isset($header[$encryptionModuleKey])) {
-			$id = $header[$encryptionModuleKey];
-		} elseif (isset($header['cipher'])) {
-			if (class_exists('\OCA\Encryption\Crypto\Encryption')) {
-				// fall back to default encryption if the user migrated from
-				// ownCloud <= 8.0 with the old encryption
-				$id = \OCA\Encryption\Crypto\Encryption::ID;
-			} else {
-				throw new ModuleDoesNotExistsException('Default encryption module missing');
-			}
-		}
-
-		return $id;
-	}
-
-	/**
-	 * create header for encrypted file
-	 *
-	 * @param array $headerData
-	 * @param IEncryptionModule $encryptionModule
-	 * @return string
-	 * @throws EncryptionHeaderToLargeException if header has to many arguments
-	 * @throws EncryptionHeaderKeyExistsException if header key is already in use
-	 */
-	public function createHeader(array $headerData, IEncryptionModule $encryptionModule) {
-		$header = self::HEADER_START . ':' . self::HEADER_ENCRYPTION_MODULE_KEY . ':' . $encryptionModule->getId() . ':';
-		foreach ($headerData as $key => $value) {
-			if (in_array($key, $this->ocHeaderKeys)) {
-				throw new EncryptionHeaderKeyExistsException($key);
-			}
-			$header .= $key . ':' . $value . ':';
-		}
-		$header .= self::HEADER_END;
-
-		if (strlen($header) > $this->getHeaderSize()) {
-			throw new EncryptionHeaderToLargeException();
-		}
-
-		$paddedHeader = str_pad($header, $this->headerSize, self::HEADER_PADDING_CHAR, STR_PAD_RIGHT);
-
-		return $paddedHeader;
-	}
-
-	/**
-	 * go recursively through a dir and collect all files and sub files.
-	 *
-	 * @param string $dir relative to the users files folder
-	 * @return array with list of files relative to the users files folder
-	 */
-	public function getAllFiles($dir) {
-		$result = [];
-		$dirList = [$dir];
-
-		while ($dirList) {
-			$dir = array_pop($dirList);
-			$content = $this->rootView->getDirectoryContent($dir);
-
-			foreach ($content as $c) {
-				if ($c->getType() === 'dir') {
-					$dirList[] = $c->getPath();
-				} else {
-					$result[] = $c->getPath();
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * check if it is a file uploaded by the user stored in data/user/files
-	 * or a metadata file
-	 *
-	 * @param string $path relative to the data/ folder
-	 * @return boolean
-	 */
-	public function isFile($path) {
-		$parts = explode('/', Filesystem::normalizePath($path), 4);
-		if (isset($parts[2]) && $parts[2] === 'files') {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * return size of encryption header
-	 *
-	 * @return integer
-	 */
-	public function getHeaderSize() {
-		return $this->headerSize;
-	}
-
-	/**
-	 * return size of block read by a PHP stream
-	 *
-	 * @return integer
-	 */
-	public function getBlockSize() {
-		return $this->blockSize;
-	}
-
-	/**
-	 * get the owner and the path for the file relative to the owners files folder
-	 *
-	 * @param string $path
-	 * @return array{0: string, 1: string}
-	 * @throws \BadMethodCallException
-	 */
-	public function getUidAndFilename($path) {
-		$parts = explode('/', $path);
-		$uid = '';
-		if (count($parts) > 2) {
-			$uid = $parts[1];
-		}
-		if (!$this->userManager->userExists($uid)) {
-			throw new \BadMethodCallException(
-				'path needs to be relative to the system wide data folder and point to a user specific file'
-			);
-		}
-
-		$ownerPath = implode('/', array_slice($parts, 2));
-
-		return [$uid, Filesystem::normalizePath($ownerPath)];
-	}
-
-	/**
-	 * Remove .path extension from a file path
-	 * @param string $path Path that may identify a .part file
-	 * @return string File path without .part extension
-	 * @note this is needed for reusing keys
-	 */
-	public function stripPartialFileExtension($path) {
-		$extension = pathinfo($path, PATHINFO_EXTENSION);
-
-		if ($extension === 'part') {
-			$newLength = strlen($path) - 5; // 5 = strlen(".part")
-			$fPath = substr($path, 0, $newLength);
-
-			// if path also contains a transaction id, we remove it too
-			$extension = pathinfo($fPath, PATHINFO_EXTENSION);
-			if (substr($extension, 0, 12) === 'ocTransferId') { // 12 = strlen("ocTransferId")
-				$newLength = strlen($fPath) - strlen($extension) - 1;
-				$fPath = substr($fPath, 0, $newLength);
-			}
-			return $fPath;
-		} else {
-			return $path;
-		}
-	}
-
-	public function getUserWithAccessToMountPoint($users, $groups) {
-		$result = [];
-		if ($users === [] && $groups === []) {
-			$users = $this->userManager->search('', null, null);
-			$result = array_map(function (IUser $user) {
-				return $user->getUID();
-			}, $users);
-		} else {
-			$result = array_merge($result, $users);
-
-			$groupManager = \OC::$server->getGroupManager();
-			foreach ($groups as $group) {
-				$groupObject = $groupManager->get($group);
-				if ($groupObject) {
-					$foundUsers = $groupObject->searchUsers('', -1, 0);
-					$userIds = [];
-					foreach ($foundUsers as $user) {
-						$userIds[] = $user->getUID();
-					}
-					$result = array_merge($result, $userIds);
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * check if the file is stored on a system wide mount point
-	 * @param string $path relative to /data/user with leading '/'
-	 * @param string $uid
-	 * @return boolean
-	 */
-	public function isSystemWideMountPoint($path, $uid) {
-		if (\OCP\App::isEnabled("files_external")) {
-			/** @var GlobalStoragesService $storageService */
-			$storageService = \OC::$server->get(GlobalStoragesService::class);
-			$storages = $storageService->getAllStorages();
-			foreach ($storages as $storage) {
-				if (strpos($path, '/files/' . $storage->getMountPoint()) === 0) {
-					if ($this->isMountPointApplicableToUser($storage, $uid)) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * check if mount point is applicable to user
-	 *
-	 * @param StorageConfig $mount
-	 * @param string $uid
-	 * @return boolean
-	 */
-	private function isMountPointApplicableToUser(StorageConfig $mount, string $uid) {
-		if ($mount->getApplicableUsers() === [] && $mount->getApplicableGroups() === []) {
-			// applicable for everyone
-			return true;
-		}
-		// check if mount point is applicable for the user
-		if (array_search($uid, $mount->getApplicableUsers()) !== false) {
-			return true;
-		}
-		// check if mount point is applicable for group where the user is a member
-		foreach ($mount->getApplicableGroups() as $gid) {
-			if ($this->groupManager->isInGroup($uid, $gid)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * check if it is a path which is excluded by ownCloud from encryption
-	 *
-	 * @param string $path
-	 * @return boolean
-	 */
-	public function isExcluded($path) {
-		$normalizedPath = Filesystem::normalizePath($path);
-		$root = explode('/', $normalizedPath, 4);
-		if (count($root) > 1) {
-
-			// detect alternative key storage root
-			$rootDir = $this->getKeyStorageRoot();
-			if ($rootDir !== '' &&
-				0 === strpos(
-					Filesystem::normalizePath($path),
-					Filesystem::normalizePath($rootDir)
-				)
-			) {
-				return true;
-			}
-
-
-			//detect system wide folders
-			if (in_array($root[1], $this->excludedPaths)) {
-				return true;
-			}
-
-			// detect user specific folders
-			if ($this->userManager->userExists($root[1])
-				&& in_array($root[2], $this->excludedPaths)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * check if recovery key is enabled for user
-	 *
-	 * @param string $uid
-	 * @return boolean
-	 */
-	public function recoveryEnabled($uid) {
-		$enabled = $this->config->getUserValue($uid, 'encryption', 'recovery_enabled', '0');
-
-		return $enabled === '1';
-	}
-
-	/**
-	 * set new key storage root
-	 *
-	 * @param string $root new key store root relative to the data folder
-	 */
-	public function setKeyStorageRoot($root) {
-		$this->config->setAppValue('core', 'encryption_key_storage_root', $root);
-	}
-
-	/**
-	 * get key storage root
-	 *
-	 * @return string key storage root
-	 */
-	public function getKeyStorageRoot() {
-		return $this->config->getAppValue('core', 'encryption_key_storage_root', '');
-	}
+    public const HEADER_START = 'HBEGIN';
+    public const HEADER_END = 'HEND';
+    public const HEADER_PADDING_CHAR = '-';
+
+    public const HEADER_ENCRYPTION_MODULE_KEY = 'oc_encryption_module';
+
+    /**
+     * block size will always be 8192 for a PHP stream
+     * @see https://bugs.php.net/bug.php?id=21641
+     * @var integer
+     */
+    protected $headerSize = 8192;
+
+    /**
+     * block size will always be 8192 for a PHP stream
+     * @see https://bugs.php.net/bug.php?id=21641
+     * @var integer
+     */
+    protected $blockSize = 8192;
+
+    /** @var View */
+    protected $rootView;
+
+    /** @var array */
+    protected $ocHeaderKeys;
+
+    /** @var \OC\User\Manager */
+    protected $userManager;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var array paths excluded from encryption */
+    protected $excludedPaths;
+
+    /** @var \OC\Group\Manager $manager */
+    protected $groupManager;
+
+    /**
+     *
+     * @param View $rootView
+     * @param \OC\User\Manager $userManager
+     * @param \OC\Group\Manager $groupManager
+     * @param IConfig $config
+     */
+    public function __construct(
+        View $rootView,
+        \OC\User\Manager $userManager,
+        \OC\Group\Manager $groupManager,
+        IConfig $config) {
+        $this->ocHeaderKeys = [
+            self::HEADER_ENCRYPTION_MODULE_KEY
+        ];
+
+        $this->rootView = $rootView;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->config = $config;
+
+        $this->excludedPaths[] = 'files_encryption';
+        $this->excludedPaths[] = 'appdata_' . $config->getSystemValue('instanceid', null);
+        $this->excludedPaths[] = 'files_external';
+    }
+
+    /**
+     * read encryption module ID from header
+     *
+     * @param array $header
+     * @return string
+     * @throws ModuleDoesNotExistsException
+     */
+    public function getEncryptionModuleId(array $header = null) {
+        $id = '';
+        $encryptionModuleKey = self::HEADER_ENCRYPTION_MODULE_KEY;
+
+        if (isset($header[$encryptionModuleKey])) {
+            $id = $header[$encryptionModuleKey];
+        } elseif (isset($header['cipher'])) {
+            if (class_exists('\OCA\Encryption\Crypto\Encryption')) {
+                // fall back to default encryption if the user migrated from
+                // ownCloud <= 8.0 with the old encryption
+                $id = \OCA\Encryption\Crypto\Encryption::ID;
+            } else {
+                throw new ModuleDoesNotExistsException('Default encryption module missing');
+            }
+        }
+
+        return $id;
+    }
+
+    /**
+     * create header for encrypted file
+     *
+     * @param array $headerData
+     * @param IEncryptionModule $encryptionModule
+     * @return string
+     * @throws EncryptionHeaderToLargeException if header has to many arguments
+     * @throws EncryptionHeaderKeyExistsException if header key is already in use
+     */
+    public function createHeader(array $headerData, IEncryptionModule $encryptionModule) {
+        $header = self::HEADER_START . ':' . self::HEADER_ENCRYPTION_MODULE_KEY . ':' . $encryptionModule->getId() . ':';
+        foreach ($headerData as $key => $value) {
+            if (in_array($key, $this->ocHeaderKeys)) {
+                throw new EncryptionHeaderKeyExistsException($key);
+            }
+            $header .= $key . ':' . $value . ':';
+        }
+        $header .= self::HEADER_END;
+
+        if (strlen($header) > $this->getHeaderSize()) {
+            throw new EncryptionHeaderToLargeException();
+        }
+
+        $paddedHeader = str_pad($header, $this->headerSize, self::HEADER_PADDING_CHAR, STR_PAD_RIGHT);
+
+        return $paddedHeader;
+    }
+
+    /**
+     * go recursively through a dir and collect all files and sub files.
+     *
+     * @param string $dir relative to the users files folder
+     * @return array with list of files relative to the users files folder
+     */
+    public function getAllFiles($dir) {
+        $result = [];
+        $dirList = [$dir];
+
+        while ($dirList) {
+            $dir = array_pop($dirList);
+            $content = $this->rootView->getDirectoryContent($dir);
+
+            foreach ($content as $c) {
+                if ($c->getType() === 'dir') {
+                    $dirList[] = $c->getPath();
+                } else {
+                    $result[] = $c->getPath();
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * check if it is a file uploaded by the user stored in data/user/files
+     * or a metadata file
+     *
+     * @param string $path relative to the data/ folder
+     * @return boolean
+     */
+    public function isFile($path) {
+        $parts = explode('/', Filesystem::normalizePath($path), 4);
+        if (isset($parts[2]) && $parts[2] === 'files') {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * return size of encryption header
+     *
+     * @return integer
+     */
+    public function getHeaderSize() {
+        return $this->headerSize;
+    }
+
+    /**
+     * return size of block read by a PHP stream
+     *
+     * @return integer
+     */
+    public function getBlockSize() {
+        return $this->blockSize;
+    }
+
+    /**
+     * get the owner and the path for the file relative to the owners files folder
+     *
+     * @param string $path
+     * @return array{0: string, 1: string}
+     * @throws \BadMethodCallException
+     */
+    public function getUidAndFilename($path) {
+        $parts = explode('/', $path);
+        $uid = '';
+        if (count($parts) > 2) {
+            $uid = $parts[1];
+        }
+        if (!$this->userManager->userExists($uid)) {
+            throw new \BadMethodCallException(
+                'path needs to be relative to the system wide data folder and point to a user specific file'
+            );
+        }
+
+        $ownerPath = implode('/', array_slice($parts, 2));
+
+        return [$uid, Filesystem::normalizePath($ownerPath)];
+    }
+
+    /**
+     * Remove .path extension from a file path
+     * @param string $path Path that may identify a .part file
+     * @return string File path without .part extension
+     * @note this is needed for reusing keys
+     */
+    public function stripPartialFileExtension($path) {
+        $extension = pathinfo($path, PATHINFO_EXTENSION);
+
+        if ($extension === 'part') {
+            $newLength = strlen($path) - 5; // 5 = strlen(".part")
+            $fPath = substr($path, 0, $newLength);
+
+            // if path also contains a transaction id, we remove it too
+            $extension = pathinfo($fPath, PATHINFO_EXTENSION);
+            if (substr($extension, 0, 12) === 'ocTransferId') { // 12 = strlen("ocTransferId")
+                $newLength = strlen($fPath) - strlen($extension) - 1;
+                $fPath = substr($fPath, 0, $newLength);
+            }
+            return $fPath;
+        } else {
+            return $path;
+        }
+    }
+
+    public function getUserWithAccessToMountPoint($users, $groups) {
+        $result = [];
+        if ($users === [] && $groups === []) {
+            $users = $this->userManager->search('', null, null);
+            $result = array_map(function (IUser $user) {
+                return $user->getUID();
+            }, $users);
+        } else {
+            $result = array_merge($result, $users);
+
+            $groupManager = \OC::$server->getGroupManager();
+            foreach ($groups as $group) {
+                $groupObject = $groupManager->get($group);
+                if ($groupObject) {
+                    $foundUsers = $groupObject->searchUsers('', -1, 0);
+                    $userIds = [];
+                    foreach ($foundUsers as $user) {
+                        $userIds[] = $user->getUID();
+                    }
+                    $result = array_merge($result, $userIds);
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * check if the file is stored on a system wide mount point
+     * @param string $path relative to /data/user with leading '/'
+     * @param string $uid
+     * @return boolean
+     */
+    public function isSystemWideMountPoint($path, $uid) {
+        if (\OCP\App::isEnabled("files_external")) {
+            /** @var GlobalStoragesService $storageService */
+            $storageService = \OC::$server->get(GlobalStoragesService::class);
+            $storages = $storageService->getAllStorages();
+            foreach ($storages as $storage) {
+                if (strpos($path, '/files/' . $storage->getMountPoint()) === 0) {
+                    if ($this->isMountPointApplicableToUser($storage, $uid)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * check if mount point is applicable to user
+     *
+     * @param StorageConfig $mount
+     * @param string $uid
+     * @return boolean
+     */
+    private function isMountPointApplicableToUser(StorageConfig $mount, string $uid) {
+        if ($mount->getApplicableUsers() === [] && $mount->getApplicableGroups() === []) {
+            // applicable for everyone
+            return true;
+        }
+        // check if mount point is applicable for the user
+        if (array_search($uid, $mount->getApplicableUsers()) !== false) {
+            return true;
+        }
+        // check if mount point is applicable for group where the user is a member
+        foreach ($mount->getApplicableGroups() as $gid) {
+            if ($this->groupManager->isInGroup($uid, $gid)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * check if it is a path which is excluded by ownCloud from encryption
+     *
+     * @param string $path
+     * @return boolean
+     */
+    public function isExcluded($path) {
+        $normalizedPath = Filesystem::normalizePath($path);
+        $root = explode('/', $normalizedPath, 4);
+        if (count($root) > 1) {
+
+            // detect alternative key storage root
+            $rootDir = $this->getKeyStorageRoot();
+            if ($rootDir !== '' &&
+                0 === strpos(
+                    Filesystem::normalizePath($path),
+                    Filesystem::normalizePath($rootDir)
+                )
+            ) {
+                return true;
+            }
+
+
+            //detect system wide folders
+            if (in_array($root[1], $this->excludedPaths)) {
+                return true;
+            }
+
+            // detect user specific folders
+            if ($this->userManager->userExists($root[1])
+                && in_array($root[2], $this->excludedPaths)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * check if recovery key is enabled for user
+     *
+     * @param string $uid
+     * @return boolean
+     */
+    public function recoveryEnabled($uid) {
+        $enabled = $this->config->getUserValue($uid, 'encryption', 'recovery_enabled', '0');
+
+        return $enabled === '1';
+    }
+
+    /**
+     * set new key storage root
+     *
+     * @param string $root new key store root relative to the data folder
+     */
+    public function setKeyStorageRoot($root) {
+        $this->config->setAppValue('core', 'encryption_key_storage_root', $root);
+    }
+
+    /**
+     * get key storage root
+     *
+     * @return string key storage root
+     */
+    public function getKeyStorageRoot() {
+        return $this->config->getAppValue('core', 'encryption_key_storage_root', '');
+    }
 }

apps/files_sharing/lib/SharedMount.php

Indentation +243 added lines, -243 removed lines

@@ -45,247 +45,247 @@
  * Shared mount points can be moved by the user
  */
 class SharedMount extends MountPoint implements MoveableMount {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage $storage
-	 */
-	protected $storage = null;
-
-	/**
-	 * @var \OC\Files\View
-	 */
-	private $recipientView;
-
-	private IUser $user;
-
-	/** @var \OCP\Share\IShare */
-	private $superShare;
-
-	/** @var \OCP\Share\IShare[] */
-	private $groupedShares;
-
-	private IEventDispatcher $eventDispatcher;
-
-	private ICache $cache;
-
-	public function __construct(
-		$storage,
-		array $mountpoints,
-		$arguments,
-		IStorageFactory $loader,
-		View $recipientView,
-		CappedMemoryCache $folderExistCache,
-		IEventDispatcher $eventDispatcher,
-		IUser $user,
-		ICache $cache
-	) {
-		$this->user = $user;
-		$this->recipientView = $recipientView;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->cache = $cache;
-
-		$this->superShare = $arguments['superShare'];
-		$this->groupedShares = $arguments['groupedShares'];
-
-		$newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache);
-		$absMountPoint = '/' . $user->getUID() . '/files' . $newMountPoint;
-		parent::__construct($storage, $absMountPoint, $arguments, $loader, null, null, MountProvider::class);
-	}
-
-	/**
-	 * check if the parent folder exists otherwise move the mount point up
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param SharedMount[] $mountpoints
-	 * @param CappedMemoryCache<bool> $folderExistCache
-	 * @return string
-	 */
-	private function verifyMountPoint(
-		\OCP\Share\IShare $share,
-		array $mountpoints,
-		CappedMemoryCache $folderExistCache
-	) {
-		$cacheKey = $this->user->getUID() . '/' . $share->getTarget();
-		$cached = $this->cache->get($cacheKey);
-		if ($cached !== null) {
-			return $cached;
-		}
-
-		$mountPoint = basename($share->getTarget());
-		$parent = dirname($share->getTarget());
-
-		$event = new VerifyMountPointEvent($share, $this->recipientView, $parent);
-		$this->eventDispatcher->dispatchTyped($event);
-		$parent = $event->getParent();
-
-		if ($folderExistCache->hasKey($parent)) {
-			$parentExists = $folderExistCache->get($parent);
-		} else {
-			$parentExists = $this->recipientView->is_dir($parent);
-			$folderExistCache->set($parent, $parentExists);
-		}
-		if (!$parentExists) {
-			$parent = Helper::getShareFolder($this->recipientView, $this->user->getUID());
-		}
-
-		$newMountPoint = $this->generateUniqueTarget(
-			\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
-			$this->recipientView,
-			$mountpoints
-		);
-
-		if ($newMountPoint !== $share->getTarget()) {
-			$this->updateFileTarget($newMountPoint, $share);
-		}
-
-		$this->cache->set($cacheKey, $newMountPoint, 60 * 60);
-
-		return $newMountPoint;
-	}
-
-	/**
-	 * update fileTarget in the database if the mount point changed
-	 *
-	 * @param string $newPath
-	 * @param \OCP\Share\IShare $share
-	 * @return bool
-	 */
-	private function updateFileTarget($newPath, &$share) {
-		$share->setTarget($newPath);
-
-		foreach ($this->groupedShares as $tmpShare) {
-			$tmpShare->setTarget($newPath);
-			\OC::$server->getShareManager()->moveShare($tmpShare, $this->user->getUID());
-		}
-
-		$this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent($this->user));
-	}
-
-
-	/**
-	 * @param string $path
-	 * @param View $view
-	 * @param SharedMount[] $mountpoints
-	 * @return mixed
-	 */
-	private function generateUniqueTarget($path, $view, array $mountpoints) {
-		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$dir = $pathinfo['dirname'];
-
-		$i = 2;
-		$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
-		while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
-			$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
-			$i++;
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Format a path to be relative to the /user/files/ directory
-	 *
-	 * @param string $path the absolute path
-	 * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
-	 * @throws \OCA\Files_Sharing\Exceptions\BrokenPath
-	 */
-	protected function stripUserFilesPath($path) {
-		$trimmed = ltrim($path, '/');
-		$split = explode('/', $trimmed);
-
-		// it is not a file relative to data/user/files
-		if (count($split) < 3 || $split[1] !== 'files') {
-			\OC::$server->getLogger()->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
-			throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10);
-		}
-
-		// skip 'user' and 'files'
-		$sliced = array_slice($split, 2);
-		$relPath = implode('/', $sliced);
-
-		return '/' . $relPath;
-	}
-
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$relTargetPath = $this->stripUserFilesPath($target);
-		$share = $this->storage->getShare();
-
-		$result = true;
-
-		try {
-			$this->updateFileTarget($relTargetPath, $share);
-			$this->setMountPoint($target);
-			$this->storage->setMountPoint($relTargetPath);
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, ['app' => 'files_sharing', 'message' => 'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"']);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$mountManager = \OC\Files\Filesystem::getMountManager();
-		/** @var \OCA\Files_Sharing\SharedStorage $storage */
-		$storage = $this->getStorage();
-		$result = $storage->unshareStorage();
-		$mountManager->removeMount($this->mountPoint);
-
-		return $result;
-	}
-
-	/**
-	 * @return \OCP\Share\IShare
-	 */
-	public function getShare() {
-		return $this->superShare;
-	}
-
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 */
-	public function getStorageRootId() {
-		return $this->getShare()->getNodeId();
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		if (!is_null($this->getShare()->getNodeCacheEntry())) {
-			return $this->getShare()->getNodeCacheEntry()->getStorageId();
-		} else {
-			$builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-
-			$query = $builder->select('storage')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
-
-			$result = $query->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
-			if ($row) {
-				return (int)$row['storage'];
-			}
-			return -1;
-		}
-	}
-
-	public function getMountType() {
-		return 'shared';
-	}
+    /**
+     * @var \OCA\Files_Sharing\SharedStorage $storage
+     */
+    protected $storage = null;
+
+    /**
+     * @var \OC\Files\View
+     */
+    private $recipientView;
+
+    private IUser $user;
+
+    /** @var \OCP\Share\IShare */
+    private $superShare;
+
+    /** @var \OCP\Share\IShare[] */
+    private $groupedShares;
+
+    private IEventDispatcher $eventDispatcher;
+
+    private ICache $cache;
+
+    public function __construct(
+        $storage,
+        array $mountpoints,
+        $arguments,
+        IStorageFactory $loader,
+        View $recipientView,
+        CappedMemoryCache $folderExistCache,
+        IEventDispatcher $eventDispatcher,
+        IUser $user,
+        ICache $cache
+    ) {
+        $this->user = $user;
+        $this->recipientView = $recipientView;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->cache = $cache;
+
+        $this->superShare = $arguments['superShare'];
+        $this->groupedShares = $arguments['groupedShares'];
+
+        $newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache);
+        $absMountPoint = '/' . $user->getUID() . '/files' . $newMountPoint;
+        parent::__construct($storage, $absMountPoint, $arguments, $loader, null, null, MountProvider::class);
+    }
+
+    /**
+     * check if the parent folder exists otherwise move the mount point up
+     *
+     * @param \OCP\Share\IShare $share
+     * @param SharedMount[] $mountpoints
+     * @param CappedMemoryCache<bool> $folderExistCache
+     * @return string
+     */
+    private function verifyMountPoint(
+        \OCP\Share\IShare $share,
+        array $mountpoints,
+        CappedMemoryCache $folderExistCache
+    ) {
+        $cacheKey = $this->user->getUID() . '/' . $share->getTarget();
+        $cached = $this->cache->get($cacheKey);
+        if ($cached !== null) {
+            return $cached;
+        }
+
+        $mountPoint = basename($share->getTarget());
+        $parent = dirname($share->getTarget());
+
+        $event = new VerifyMountPointEvent($share, $this->recipientView, $parent);
+        $this->eventDispatcher->dispatchTyped($event);
+        $parent = $event->getParent();
+
+        if ($folderExistCache->hasKey($parent)) {
+            $parentExists = $folderExistCache->get($parent);
+        } else {
+            $parentExists = $this->recipientView->is_dir($parent);
+            $folderExistCache->set($parent, $parentExists);
+        }
+        if (!$parentExists) {
+            $parent = Helper::getShareFolder($this->recipientView, $this->user->getUID());
+        }
+
+        $newMountPoint = $this->generateUniqueTarget(
+            \OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
+            $this->recipientView,
+            $mountpoints
+        );
+
+        if ($newMountPoint !== $share->getTarget()) {
+            $this->updateFileTarget($newMountPoint, $share);
+        }
+
+        $this->cache->set($cacheKey, $newMountPoint, 60 * 60);
+
+        return $newMountPoint;
+    }
+
+    /**
+     * update fileTarget in the database if the mount point changed
+     *
+     * @param string $newPath
+     * @param \OCP\Share\IShare $share
+     * @return bool
+     */
+    private function updateFileTarget($newPath, &$share) {
+        $share->setTarget($newPath);
+
+        foreach ($this->groupedShares as $tmpShare) {
+            $tmpShare->setTarget($newPath);
+            \OC::$server->getShareManager()->moveShare($tmpShare, $this->user->getUID());
+        }
+
+        $this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent($this->user));
+    }
+
+
+    /**
+     * @param string $path
+     * @param View $view
+     * @param SharedMount[] $mountpoints
+     * @return mixed
+     */
+    private function generateUniqueTarget($path, $view, array $mountpoints) {
+        $pathinfo = pathinfo($path);
+        $ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
+        $name = $pathinfo['filename'];
+        $dir = $pathinfo['dirname'];
+
+        $i = 2;
+        $absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+        while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) {
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
+            $absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+            $i++;
+        }
+
+        return $path;
+    }
+
+    /**
+     * Format a path to be relative to the /user/files/ directory
+     *
+     * @param string $path the absolute path
+     * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
+     * @throws \OCA\Files_Sharing\Exceptions\BrokenPath
+     */
+    protected function stripUserFilesPath($path) {
+        $trimmed = ltrim($path, '/');
+        $split = explode('/', $trimmed);
+
+        // it is not a file relative to data/user/files
+        if (count($split) < 3 || $split[1] !== 'files') {
+            \OC::$server->getLogger()->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
+            throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10);
+        }
+
+        // skip 'user' and 'files'
+        $sliced = array_slice($split, 2);
+        $relPath = implode('/', $sliced);
+
+        return '/' . $relPath;
+    }
+
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $relTargetPath = $this->stripUserFilesPath($target);
+        $share = $this->storage->getShare();
+
+        $result = true;
+
+        try {
+            $this->updateFileTarget($relTargetPath, $share);
+            $this->setMountPoint($target);
+            $this->storage->setMountPoint($relTargetPath);
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, ['app' => 'files_sharing', 'message' => 'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $mountManager = \OC\Files\Filesystem::getMountManager();
+        /** @var \OCA\Files_Sharing\SharedStorage $storage */
+        $storage = $this->getStorage();
+        $result = $storage->unshareStorage();
+        $mountManager->removeMount($this->mountPoint);
+
+        return $result;
+    }
+
+    /**
+     * @return \OCP\Share\IShare
+     */
+    public function getShare() {
+        return $this->superShare;
+    }
+
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     */
+    public function getStorageRootId() {
+        return $this->getShare()->getNodeId();
+    }
+
+    /**
+     * @return int
+     */
+    public function getNumericStorageId() {
+        if (!is_null($this->getShare()->getNodeCacheEntry())) {
+            return $this->getShare()->getNodeCacheEntry()->getStorageId();
+        } else {
+            $builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+
+            $query = $builder->select('storage')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
+
+            $result = $query->execute();
+            $row = $result->fetch();
+            $result->closeCursor();
+            if ($row) {
+                return (int)$row['storage'];
+            }
+            return -1;
+        }
+    }
+
+    public function getMountType() {
+        return 'shared';
+    }
 }

apps/files_sharing/lib/MountProvider.php

Indentation +227 added lines, -227 removed lines

@@ -42,231 +42,231 @@
 use OCP\Share\IShare;
 
 class MountProvider implements IMountProvider {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var IManager
-	 */
-	protected $shareManager;
-
-	/**
-	 * @var ILogger
-	 */
-	protected $logger;
-
-	/** @var IEventDispatcher */
-	protected $eventDispatcher;
-
-	/** @var ICacheFactory */
-	protected $cacheFactory;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param IManager $shareManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		IConfig $config,
-		IManager $shareManager,
-		ILogger $logger,
-		IEventDispatcher $eventDispatcher,
-		ICacheFactory $cacheFactory
-	) {
-		$this->config = $config;
-		$this->shareManager = $shareManager;
-		$this->logger = $logger;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->cacheFactory = $cacheFactory;
-	}
-
-
-	/**
-	 * Get all mountpoints applicable for the user and check for shares where we need to update the etags
-	 *
-	 * @param \OCP\IUser $user
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_USER, null, -1);
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_CIRCLE, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_ROOM, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_DECK, null, -1));
-
-
-		// filter out excluded shares and group shares that includes self
-		$shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
-			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
-		});
-
-		$superShares = $this->buildSuperShares($shares, $user);
-
-		$mounts = [];
-		$view = new View('/' . $user->getUID() . '/files');
-		$ownerViews = [];
-		$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
-		/** @var CappedMemoryCache<bool> $folderExistCache */
-		$foldersExistCache = new CappedMemoryCache();
-		foreach ($superShares as $share) {
-			try {
-				/** @var \OCP\Share\IShare $parentShare */
-				$parentShare = $share[0];
-
-				if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED &&
-					($parentShare->getShareType() === IShare::TYPE_GROUP ||
-						$parentShare->getShareType() === IShare::TYPE_USERGROUP ||
-						$parentShare->getShareType() === IShare::TYPE_USER)) {
-					continue;
-				}
-
-				$owner = $parentShare->getShareOwner();
-				if (!isset($ownerViews[$owner])) {
-					$ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
-				}
-				$mount = new SharedMount(
-					'\OCA\Files_Sharing\SharedStorage',
-					$mounts,
-					[
-						'user' => $user->getUID(),
-						// parent share
-						'superShare' => $parentShare,
-						// children/component of the superShare
-						'groupedShares' => $share[1],
-						'ownerView' => $ownerViews[$owner],
-						'sharingDisabledForUser' => $sharingDisabledForUser
-					],
-					$loader,
-					$view,
-					$foldersExistCache,
-					$this->eventDispatcher,
-					$user,
-					$this->cacheFactory->createLocal('share-valid-mountpoint')
-				);
-
-				$event = new ShareMountedEvent($mount);
-				$this->eventDispatcher->dispatchTyped($event);
-
-				$mounts[$mount->getMountPoint()] = $mount;
-				foreach ($event->getAdditionalMounts() as $additionalMount) {
-					$mounts[$additionalMount->getMountPoint()] = $additionalMount;
-				}
-			} catch (\Exception $e) {
-				$this->logger->logException($e);
-				$this->logger->error('Error while trying to create shared mount');
-			}
-		}
-
-		// array_filter removes the null values from the array
-		return array_values(array_filter($mounts));
-	}
-
-	/**
-	 * Groups shares by path (nodeId) and target path
-	 *
-	 * @param \OCP\Share\IShare[] $shares
-	 * @return \OCP\Share\IShare[][] array of grouped shares, each element in the
-	 * array is a group which itself is an array of shares
-	 */
-	private function groupShares(array $shares) {
-		$tmp = [];
-
-		foreach ($shares as $share) {
-			if (!isset($tmp[$share->getNodeId()])) {
-				$tmp[$share->getNodeId()] = [];
-			}
-			$tmp[$share->getNodeId()][] = $share;
-		}
-
-		$result = [];
-		// sort by stime, the super share will be based on the least recent share
-		foreach ($tmp as &$tmp2) {
-			@usort($tmp2, function ($a, $b) {
-				$aTime = $a->getShareTime()->getTimestamp();
-				$bTime = $b->getShareTime()->getTimestamp();
-				if ($aTime === $bTime) {
-					return $a->getId() < $b->getId() ? -1 : 1;
-				}
-				return $aTime < $bTime ? -1 : 1;
-			});
-			$result[] = $tmp2;
-		}
-
-		return array_values($result);
-	}
-
-	/**
-	 * Build super shares (virtual share) by grouping them by node id and target,
-	 * then for each group compute the super share and return it along with the matching
-	 * grouped shares. The most permissive permissions are used based on the permissions
-	 * of all shares within the group.
-	 *
-	 * @param \OCP\Share\IShare[] $allShares
-	 * @param \OCP\IUser $user user
-	 * @return array Tuple of [superShare, groupedShares]
-	 */
-	private function buildSuperShares(array $allShares, \OCP\IUser $user) {
-		$result = [];
-
-		$groupedShares = $this->groupShares($allShares);
-
-		/** @var \OCP\Share\IShare[] $shares */
-		foreach ($groupedShares as $shares) {
-			if (count($shares) === 0) {
-				continue;
-			}
-
-			$superShare = $this->shareManager->newShare();
-
-			// compute super share based on first entry of the group
-			$superShare->setId($shares[0]->getId())
-				->setShareOwner($shares[0]->getShareOwner())
-				->setNodeId($shares[0]->getNodeId())
-				->setShareType($shares[0]->getShareType())
-				->setTarget($shares[0]->getTarget());
-
-			// use most permissive permissions
-			$permissions = 0;
-			$status = IShare::STATUS_PENDING;
-			foreach ($shares as $share) {
-				$permissions |= $share->getPermissions();
-				$status = max($status, $share->getStatus());
-
-				if ($share->getTarget() !== $superShare->getTarget()) {
-					// adjust target, for database consistency
-					$share->setTarget($superShare->getTarget());
-					try {
-						$this->shareManager->moveShare($share, $user->getUID());
-					} catch (\InvalidArgumentException $e) {
-						// ignore as it is not important and we don't want to
-						// block FS setup
-
-						// the subsequent code anyway only uses the target of the
-						// super share
-
-						// such issue can usually happen when dealing with
-						// null groups which usually appear with group backend
-						// caching inconsistencies
-						$this->logger->debug(
-							'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
-							['app' => 'files_sharing']
-						);
-					}
-				}
-				if (!is_null($share->getNodeCacheEntry())) {
-					$superShare->setNodeCacheEntry($share->getNodeCacheEntry());
-				}
-			}
-
-			$superShare->setPermissions($permissions)
-				->setStatus($status);
-
-			$result[] = [$superShare, $shares];
-		}
-
-		return $result;
-	}
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var IManager
+     */
+    protected $shareManager;
+
+    /**
+     * @var ILogger
+     */
+    protected $logger;
+
+    /** @var IEventDispatcher */
+    protected $eventDispatcher;
+
+    /** @var ICacheFactory */
+    protected $cacheFactory;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param IManager $shareManager
+     * @param ILogger $logger
+     */
+    public function __construct(
+        IConfig $config,
+        IManager $shareManager,
+        ILogger $logger,
+        IEventDispatcher $eventDispatcher,
+        ICacheFactory $cacheFactory
+    ) {
+        $this->config = $config;
+        $this->shareManager = $shareManager;
+        $this->logger = $logger;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->cacheFactory = $cacheFactory;
+    }
+
+
+    /**
+     * Get all mountpoints applicable for the user and check for shares where we need to update the etags
+     *
+     * @param \OCP\IUser $user
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_USER, null, -1);
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, -1));
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_CIRCLE, null, -1));
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_ROOM, null, -1));
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_DECK, null, -1));
+
+
+        // filter out excluded shares and group shares that includes self
+        $shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
+            return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
+        });
+
+        $superShares = $this->buildSuperShares($shares, $user);
+
+        $mounts = [];
+        $view = new View('/' . $user->getUID() . '/files');
+        $ownerViews = [];
+        $sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
+        /** @var CappedMemoryCache<bool> $folderExistCache */
+        $foldersExistCache = new CappedMemoryCache();
+        foreach ($superShares as $share) {
+            try {
+                /** @var \OCP\Share\IShare $parentShare */
+                $parentShare = $share[0];
+
+                if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED &&
+                    ($parentShare->getShareType() === IShare::TYPE_GROUP ||
+                        $parentShare->getShareType() === IShare::TYPE_USERGROUP ||
+                        $parentShare->getShareType() === IShare::TYPE_USER)) {
+                    continue;
+                }
+
+                $owner = $parentShare->getShareOwner();
+                if (!isset($ownerViews[$owner])) {
+                    $ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
+                }
+                $mount = new SharedMount(
+                    '\OCA\Files_Sharing\SharedStorage',
+                    $mounts,
+                    [
+                        'user' => $user->getUID(),
+                        // parent share
+                        'superShare' => $parentShare,
+                        // children/component of the superShare
+                        'groupedShares' => $share[1],
+                        'ownerView' => $ownerViews[$owner],
+                        'sharingDisabledForUser' => $sharingDisabledForUser
+                    ],
+                    $loader,
+                    $view,
+                    $foldersExistCache,
+                    $this->eventDispatcher,
+                    $user,
+                    $this->cacheFactory->createLocal('share-valid-mountpoint')
+                );
+
+                $event = new ShareMountedEvent($mount);
+                $this->eventDispatcher->dispatchTyped($event);
+
+                $mounts[$mount->getMountPoint()] = $mount;
+                foreach ($event->getAdditionalMounts() as $additionalMount) {
+                    $mounts[$additionalMount->getMountPoint()] = $additionalMount;
+                }
+            } catch (\Exception $e) {
+                $this->logger->logException($e);
+                $this->logger->error('Error while trying to create shared mount');
+            }
+        }
+
+        // array_filter removes the null values from the array
+        return array_values(array_filter($mounts));
+    }
+
+    /**
+     * Groups shares by path (nodeId) and target path
+     *
+     * @param \OCP\Share\IShare[] $shares
+     * @return \OCP\Share\IShare[][] array of grouped shares, each element in the
+     * array is a group which itself is an array of shares
+     */
+    private function groupShares(array $shares) {
+        $tmp = [];
+
+        foreach ($shares as $share) {
+            if (!isset($tmp[$share->getNodeId()])) {
+                $tmp[$share->getNodeId()] = [];
+            }
+            $tmp[$share->getNodeId()][] = $share;
+        }
+
+        $result = [];
+        // sort by stime, the super share will be based on the least recent share
+        foreach ($tmp as &$tmp2) {
+            @usort($tmp2, function ($a, $b) {
+                $aTime = $a->getShareTime()->getTimestamp();
+                $bTime = $b->getShareTime()->getTimestamp();
+                if ($aTime === $bTime) {
+                    return $a->getId() < $b->getId() ? -1 : 1;
+                }
+                return $aTime < $bTime ? -1 : 1;
+            });
+            $result[] = $tmp2;
+        }
+
+        return array_values($result);
+    }
+
+    /**
+     * Build super shares (virtual share) by grouping them by node id and target,
+     * then for each group compute the super share and return it along with the matching
+     * grouped shares. The most permissive permissions are used based on the permissions
+     * of all shares within the group.
+     *
+     * @param \OCP\Share\IShare[] $allShares
+     * @param \OCP\IUser $user user
+     * @return array Tuple of [superShare, groupedShares]
+     */
+    private function buildSuperShares(array $allShares, \OCP\IUser $user) {
+        $result = [];
+
+        $groupedShares = $this->groupShares($allShares);
+
+        /** @var \OCP\Share\IShare[] $shares */
+        foreach ($groupedShares as $shares) {
+            if (count($shares) === 0) {
+                continue;
+            }
+
+            $superShare = $this->shareManager->newShare();
+
+            // compute super share based on first entry of the group
+            $superShare->setId($shares[0]->getId())
+                ->setShareOwner($shares[0]->getShareOwner())
+                ->setNodeId($shares[0]->getNodeId())
+                ->setShareType($shares[0]->getShareType())
+                ->setTarget($shares[0]->getTarget());
+
+            // use most permissive permissions
+            $permissions = 0;
+            $status = IShare::STATUS_PENDING;
+            foreach ($shares as $share) {
+                $permissions |= $share->getPermissions();
+                $status = max($status, $share->getStatus());
+
+                if ($share->getTarget() !== $superShare->getTarget()) {
+                    // adjust target, for database consistency
+                    $share->setTarget($superShare->getTarget());
+                    try {
+                        $this->shareManager->moveShare($share, $user->getUID());
+                    } catch (\InvalidArgumentException $e) {
+                        // ignore as it is not important and we don't want to
+                        // block FS setup
+
+                        // the subsequent code anyway only uses the target of the
+                        // super share
+
+                        // such issue can usually happen when dealing with
+                        // null groups which usually appear with group backend
+                        // caching inconsistencies
+                        $this->logger->debug(
+                            'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+                            ['app' => 'files_sharing']
+                        );
+                    }
+                }
+                if (!is_null($share->getNodeCacheEntry())) {
+                    $superShare->setNodeCacheEntry($share->getNodeCacheEntry());
+                }
+            }
+
+            $superShare->setPermissions($permissions)
+                ->setStatus($status);
+
+            $result[] = [$superShare, $shares];
+        }
+
+        return $result;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -99,14 +99,14 @@ 
 
 
 		// filter out excluded shares and group shares that includes self
-		$shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
+		$shares = array_filter($shares, function(\OCP\Share\IShare $share) use ($user) {
 			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
 		});
 
 		$superShares = $this->buildSuperShares($shares, $user);
 
 		$mounts = [];
-		$view = new View('/' . $user->getUID() . '/files');
+		$view = new View('/'.$user->getUID().'/files');
 		$ownerViews = [];
 		$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
 		/** @var CappedMemoryCache<bool> $folderExistCache */
@@ -125,7 +125,7 @@ 
 
 				$owner = $parentShare->getShareOwner();
 				if (!isset($ownerViews[$owner])) {
-					$ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
+					$ownerViews[$owner] = new View('/'.$parentShare->getShareOwner().'/files');
 				}
 				$mount = new SharedMount(
 					'\OCA\Files_Sharing\SharedStorage',
@@ -184,7 +184,7 @@ 
 		$result = [];
 		// sort by stime, the super share will be based on the least recent share
 		foreach ($tmp as &$tmp2) {
-			@usort($tmp2, function ($a, $b) {
+			@usort($tmp2, function($a, $b) {
 				$aTime = $a->getShareTime()->getTimestamp();
 				$bTime = $b->getShareTime()->getTimestamp();
 				if ($aTime === $bTime) {
@@ -251,7 +251,7 @@ 
 						// null groups which usually appear with group backend
 						// caching inconsistencies
 						$this->logger->debug(
-							'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+							'Could not adjust share target for share '.$share->getId().' to make it consistent: '.$e->getMessage(),
 							['app' => 'files_sharing']
 						);
 					}

apps/workflowengine/lib/Manager.php

Indentation +668 added lines, -668 removed lines

@@ -70,672 +70,672 @@
 
 class Manager implements IManager {
 
-	/** @var IStorage */
-	protected $storage;
-
-	/** @var string */
-	protected $path;
-
-	/** @var object */
-	protected $entity;
-
-	/** @var array[] */
-	protected $operations = [];
-
-	/** @var array[] */
-	protected $checks = [];
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IServerContainer|\OC\Server */
-	protected $container;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var LegacyDispatcher */
-	protected $legacyEventDispatcher;
-
-	/** @var IEntity[] */
-	protected $registeredEntities = [];
-
-	/** @var IOperation[] */
-	protected $registeredOperators = [];
-
-	/** @var ICheck[] */
-	protected $registeredChecks = [];
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var CappedMemoryCache<int[]> */
-	protected CappedMemoryCache $operationsByScope;
-
-	/** @var IUserSession */
-	protected $session;
-
-	/** @var IEventDispatcher */
-	private $dispatcher;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(
-		IDBConnection $connection,
-		IServerContainer $container,
-		IL10N $l,
-		LegacyDispatcher $eventDispatcher,
-		ILogger $logger,
-		IUserSession $session,
-		IEventDispatcher $dispatcher,
-		IConfig $config
-	) {
-		$this->connection = $connection;
-		$this->container = $container;
-		$this->l = $l;
-		$this->legacyEventDispatcher = $eventDispatcher;
-		$this->logger = $logger;
-		$this->operationsByScope = new CappedMemoryCache(64);
-		$this->session = $session;
-		$this->dispatcher = $dispatcher;
-		$this->config = $config;
-	}
-
-	public function getRuleMatcher(): IRuleMatcher {
-		return new RuleMatcher(
-			$this->session,
-			$this->container,
-			$this->l,
-			$this,
-			$this->container->query(Logger::class)
-		);
-	}
-
-	public function getAllConfiguredEvents() {
-		$query = $this->connection->getQueryBuilder();
-
-		$query->select('class', 'entity')
-			->selectAlias($query->expr()->castColumn('events', IQueryBuilder::PARAM_STR), 'events')
-			->from('flow_operations')
-			->where($query->expr()->neq('events', $query->createNamedParameter('[]'), IQueryBuilder::PARAM_STR))
-			->groupBy('class', 'entity', $query->expr()->castColumn('events', IQueryBuilder::PARAM_STR));
-
-		$result = $query->execute();
-		$operations = [];
-		while ($row = $result->fetch()) {
-			$eventNames = \json_decode($row['events']);
-
-			$operation = $row['class'];
-			$entity = $row['entity'];
-
-			$operations[$operation] = $operations[$row['class']] ?? [];
-			$operations[$operation][$entity] = $operations[$operation][$entity] ?? [];
-
-			$operations[$operation][$entity] = array_unique(array_merge($operations[$operation][$entity], $eventNames ?? []));
-		}
-		$result->closeCursor();
-
-		return $operations;
-	}
-
-	/**
-	 * @param string $operationClass
-	 * @return ScopeContext[]
-	 */
-	public function getAllConfiguredScopesForOperation(string $operationClass): array {
-		static $scopesByOperation = [];
-		if (isset($scopesByOperation[$operationClass])) {
-			return $scopesByOperation[$operationClass];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-
-		$query->selectDistinct('s.type')
-			->addSelect('s.value')
-			->from('flow_operations', 'o')
-			->leftJoin('o', 'flow_operations_scope', 's', $query->expr()->eq('o.id', 's.operation_id'))
-			->where($query->expr()->eq('o.class', $query->createParameter('operationClass')));
-
-		$query->setParameters(['operationClass' => $operationClass]);
-		$result = $query->execute();
-
-		$scopesByOperation[$operationClass] = [];
-		while ($row = $result->fetch()) {
-			$scope = new ScopeContext($row['type'], $row['value']);
-			$scopesByOperation[$operationClass][$scope->getHash()] = $scope;
-		}
-
-		return $scopesByOperation[$operationClass];
-	}
-
-	public function getAllOperations(ScopeContext $scopeContext): array {
-		if (isset($this->operations[$scopeContext->getHash()])) {
-			return $this->operations[$scopeContext->getHash()];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-
-		$query->select('o.*')
-			->selectAlias('s.type', 'scope_type')
-			->selectAlias('s.value', 'scope_actor_id')
-			->from('flow_operations', 'o')
-			->leftJoin('o', 'flow_operations_scope', 's', $query->expr()->eq('o.id', 's.operation_id'))
-			->where($query->expr()->eq('s.type', $query->createParameter('scope')));
-
-		if ($scopeContext->getScope() === IManager::SCOPE_USER) {
-			$query->andWhere($query->expr()->eq('s.value', $query->createParameter('scopeId')));
-		}
-
-		$query->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]);
-		$result = $query->execute();
-
-		$this->operations[$scopeContext->getHash()] = [];
-		while ($row = $result->fetch()) {
-			if (!isset($this->operations[$scopeContext->getHash()][$row['class']])) {
-				$this->operations[$scopeContext->getHash()][$row['class']] = [];
-			}
-			$this->operations[$scopeContext->getHash()][$row['class']][] = $row;
-		}
-
-		return $this->operations[$scopeContext->getHash()];
-	}
-
-	public function getOperations(string $class, ScopeContext $scopeContext): array {
-		if (!isset($this->operations[$scopeContext->getHash()])) {
-			$this->getAllOperations($scopeContext);
-		}
-		return $this->operations[$scopeContext->getHash()][$class] ?? [];
-	}
-
-	/**
-	 * @param int $id
-	 * @return array
-	 * @throws \UnexpectedValueException
-	 */
-	protected function getOperation($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('flow_operations')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			return $row;
-		}
-
-		throw new \UnexpectedValueException($this->l->t('Operation #%s does not exist', [$id]));
-	}
-
-	protected function insertOperation(
-		string $class,
-		string $name,
-		array $checkIds,
-		string $operation,
-		string $entity,
-		array $events
-	): int {
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('flow_operations')
-			->values([
-				'class' => $query->createNamedParameter($class),
-				'name' => $query->createNamedParameter($name),
-				'checks' => $query->createNamedParameter(json_encode(array_unique($checkIds))),
-				'operation' => $query->createNamedParameter($operation),
-				'entity' => $query->createNamedParameter($entity),
-				'events' => $query->createNamedParameter(json_encode($events))
-			]);
-		$query->execute();
-
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * @param string $class
-	 * @param string $name
-	 * @param array[] $checks
-	 * @param string $operation
-	 * @return array The added operation
-	 * @throws \UnexpectedValueException
-	 * @throw Exception
-	 */
-	public function addOperation(
-		string $class,
-		string $name,
-		array $checks,
-		string $operation,
-		ScopeContext $scope,
-		string $entity,
-		array $events
-	) {
-		$this->validateOperation($class, $name, $checks, $operation, $entity, $events);
-
-		$this->connection->beginTransaction();
-
-		try {
-			$checkIds = [];
-			foreach ($checks as $check) {
-				$checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
-			}
-
-			$id = $this->insertOperation($class, $name, $checkIds, $operation, $entity, $events);
-			$this->addScope($id, $scope);
-
-			$this->connection->commit();
-		} catch (Exception $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-
-		return $this->getOperation($id);
-	}
-
-	protected function canModify(int $id, ScopeContext $scopeContext):bool {
-		if (isset($this->operationsByScope[$scopeContext->getHash()])) {
-			return in_array($id, $this->operationsByScope[$scopeContext->getHash()], true);
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb = $qb->select('o.id')
-			->from('flow_operations', 'o')
-			->leftJoin('o', 'flow_operations_scope', 's', $qb->expr()->eq('o.id', 's.operation_id'))
-			->where($qb->expr()->eq('s.type', $qb->createParameter('scope')));
-
-		if ($scopeContext->getScope() !== IManager::SCOPE_ADMIN) {
-			$qb->where($qb->expr()->eq('s.value', $qb->createParameter('scopeId')));
-		}
-
-		$qb->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]);
-		$result = $qb->execute();
-
-		$operations = [];
-		while (($opId = $result->fetchOne()) !== false) {
-			$operations[] = (int)$opId;
-		}
-		$this->operationsByScope[$scopeContext->getHash()] = $operations;
-		$result->closeCursor();
-
-		return in_array($id, $this->operationsByScope[$scopeContext->getHash()], true);
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $name
-	 * @param array[] $checks
-	 * @param string $operation
-	 * @return array The updated operation
-	 * @throws \UnexpectedValueException
-	 * @throws \DomainException
-	 * @throws Exception
-	 */
-	public function updateOperation(
-		int $id,
-		string $name,
-		array $checks,
-		string $operation,
-		ScopeContext $scopeContext,
-		string $entity,
-		array $events
-	): array {
-		if (!$this->canModify($id, $scopeContext)) {
-			throw new \DomainException('Target operation not within scope');
-		};
-		$row = $this->getOperation($id);
-		$this->validateOperation($row['class'], $name, $checks, $operation, $entity, $events);
-
-		$checkIds = [];
-		try {
-			$this->connection->beginTransaction();
-			foreach ($checks as $check) {
-				$checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
-			}
-
-			$query = $this->connection->getQueryBuilder();
-			$query->update('flow_operations')
-				->set('name', $query->createNamedParameter($name))
-				->set('checks', $query->createNamedParameter(json_encode(array_unique($checkIds))))
-				->set('operation', $query->createNamedParameter($operation))
-				->set('entity', $query->createNamedParameter($entity))
-				->set('events', $query->createNamedParameter(json_encode($events)))
-				->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-			$query->execute();
-			$this->connection->commit();
-		} catch (Exception $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-		unset($this->operations[$scopeContext->getHash()]);
-
-		return $this->getOperation($id);
-	}
-
-	/**
-	 * @param int $id
-	 * @return bool
-	 * @throws \UnexpectedValueException
-	 * @throws Exception
-	 * @throws \DomainException
-	 */
-	public function deleteOperation($id, ScopeContext $scopeContext) {
-		if (!$this->canModify($id, $scopeContext)) {
-			throw new \DomainException('Target operation not within scope');
-		};
-		$query = $this->connection->getQueryBuilder();
-		try {
-			$this->connection->beginTransaction();
-			$result = (bool)$query->delete('flow_operations')
-				->where($query->expr()->eq('id', $query->createNamedParameter($id)))
-				->execute();
-			if ($result) {
-				$qb = $this->connection->getQueryBuilder();
-				$result &= (bool)$qb->delete('flow_operations_scope')
-					->where($qb->expr()->eq('operation_id', $qb->createNamedParameter($id)))
-					->execute();
-			}
-			$this->connection->commit();
-		} catch (Exception $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-
-		if (isset($this->operations[$scopeContext->getHash()])) {
-			unset($this->operations[$scopeContext->getHash()]);
-		}
-
-		return $result;
-	}
-
-	protected function validateEvents(string $entity, array $events, IOperation $operation) {
-		try {
-			/** @var IEntity $instance */
-			$instance = $this->container->query($entity);
-		} catch (QueryException $e) {
-			throw new \UnexpectedValueException($this->l->t('Entity %s does not exist', [$entity]));
-		}
-
-		if (!$instance instanceof IEntity) {
-			throw new \UnexpectedValueException($this->l->t('Entity %s is invalid', [$entity]));
-		}
-
-		if (empty($events)) {
-			if (!$operation instanceof IComplexOperation) {
-				throw new \UnexpectedValueException($this->l->t('No events are chosen.'));
-			}
-			return;
-		}
-
-		$availableEvents = [];
-		foreach ($instance->getEvents() as $event) {
-			/** @var IEntityEvent $event */
-			$availableEvents[] = $event->getEventName();
-		}
-
-		$diff = array_diff($events, $availableEvents);
-		if (!empty($diff)) {
-			throw new \UnexpectedValueException($this->l->t('Entity %s has no event %s', [$entity, array_shift($diff)]));
-		}
-	}
-
-	/**
-	 * @param string $class
-	 * @param string $name
-	 * @param array[] $checks
-	 * @param string $operation
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateOperation($class, $name, array $checks, $operation, string $entity, array $events) {
-		try {
-			/** @var IOperation $instance */
-			$instance = $this->container->query($class);
-		} catch (QueryException $e) {
-			throw new \UnexpectedValueException($this->l->t('Operation %s does not exist', [$class]));
-		}
-
-		if (!($instance instanceof IOperation)) {
-			throw new \UnexpectedValueException($this->l->t('Operation %s is invalid', [$class]));
-		}
-
-		$this->validateEvents($entity, $events, $instance);
-
-		if (count($checks) === 0) {
-			throw new \UnexpectedValueException($this->l->t('At least one check needs to be provided'));
-		}
-
-		if (strlen((string)$operation) > IManager::MAX_OPERATION_VALUE_BYTES) {
-			throw new \UnexpectedValueException($this->l->t('The provided operation data is too long'));
-		}
-
-		$instance->validateOperation($name, $checks, $operation);
-
-		foreach ($checks as $check) {
-			if (!is_string($check['class'])) {
-				throw new \UnexpectedValueException($this->l->t('Invalid check provided'));
-			}
-
-			try {
-				/** @var ICheck $instance */
-				$instance = $this->container->query($check['class']);
-			} catch (QueryException $e) {
-				throw new \UnexpectedValueException($this->l->t('Check %s does not exist', [$class]));
-			}
-
-			if (!($instance instanceof ICheck)) {
-				throw new \UnexpectedValueException($this->l->t('Check %s is invalid', [$class]));
-			}
-
-			if (!empty($instance->supportedEntities())
-				&& !in_array($entity, $instance->supportedEntities())
-			) {
-				throw new \UnexpectedValueException($this->l->t('Check %s is not allowed with this entity', [$class]));
-			}
-
-			if (strlen((string)$check['value']) > IManager::MAX_CHECK_VALUE_BYTES) {
-				throw new \UnexpectedValueException($this->l->t('The provided check value is too long'));
-			}
-
-			$instance->validateCheck($check['operator'], $check['value']);
-		}
-	}
-
-	/**
-	 * @param int[] $checkIds
-	 * @return array[]
-	 */
-	public function getChecks(array $checkIds) {
-		$checkIds = array_map('intval', $checkIds);
-
-		$checks = [];
-		foreach ($checkIds as $i => $checkId) {
-			if (isset($this->checks[$checkId])) {
-				$checks[$checkId] = $this->checks[$checkId];
-				unset($checkIds[$i]);
-			}
-		}
-
-		if (empty($checkIds)) {
-			return $checks;
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('flow_checks')
-			->where($query->expr()->in('id', $query->createNamedParameter($checkIds, IQueryBuilder::PARAM_INT_ARRAY)));
-		$result = $query->execute();
-
-		while ($row = $result->fetch()) {
-			$this->checks[(int) $row['id']] = $row;
-			$checks[(int) $row['id']] = $row;
-		}
-		$result->closeCursor();
-
-		$checkIds = array_diff($checkIds, array_keys($checks));
-
-		if (!empty($checkIds)) {
-			$missingCheck = array_pop($checkIds);
-			throw new \UnexpectedValueException($this->l->t('Check #%s does not exist', $missingCheck));
-		}
-
-		return $checks;
-	}
-
-	/**
-	 * @param string $class
-	 * @param string $operator
-	 * @param string $value
-	 * @return int Check unique ID
-	 */
-	protected function addCheck($class, $operator, $value) {
-		$hash = md5($class . '::' . $operator . '::' . $value);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id')
-			->from('flow_checks')
-			->where($query->expr()->eq('hash', $query->createNamedParameter($hash)));
-		$result = $query->execute();
-
-		if ($row = $result->fetch()) {
-			$result->closeCursor();
-			return (int) $row['id'];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('flow_checks')
-			->values([
-				'class' => $query->createNamedParameter($class),
-				'operator' => $query->createNamedParameter($operator),
-				'value' => $query->createNamedParameter($value),
-				'hash' => $query->createNamedParameter($hash),
-			]);
-		$query->execute();
-
-		return $query->getLastInsertId();
-	}
-
-	protected function addScope(int $operationId, ScopeContext $scope): void {
-		$query = $this->connection->getQueryBuilder();
-
-		$insertQuery = $query->insert('flow_operations_scope');
-		$insertQuery->values([
-			'operation_id' => $query->createNamedParameter($operationId),
-			'type' => $query->createNamedParameter($scope->getScope()),
-			'value' => $query->createNamedParameter($scope->getScopeId()),
-		]);
-		$insertQuery->execute();
-	}
-
-	public function formatOperation(array $operation): array {
-		$checkIds = json_decode($operation['checks'], true);
-		$checks = $this->getChecks($checkIds);
-
-		$operation['checks'] = [];
-		foreach ($checks as $check) {
-			// Remove internal values
-			unset($check['id']);
-			unset($check['hash']);
-
-			$operation['checks'][] = $check;
-		}
-		$operation['events'] = json_decode($operation['events'], true) ?? [];
-
-
-		return $operation;
-	}
-
-	/**
-	 * @return IEntity[]
-	 */
-	public function getEntitiesList(): array {
-		$this->dispatcher->dispatchTyped(new RegisterEntitiesEvent($this));
-		$this->legacyEventDispatcher->dispatch(IManager::EVENT_NAME_REG_ENTITY, new GenericEvent($this));
-
-		return array_values(array_merge($this->getBuildInEntities(), $this->registeredEntities));
-	}
-
-	/**
-	 * @return IOperation[]
-	 */
-	public function getOperatorList(): array {
-		$this->dispatcher->dispatchTyped(new RegisterOperationsEvent($this));
-		$this->legacyEventDispatcher->dispatch(IManager::EVENT_NAME_REG_OPERATION, new GenericEvent($this));
-
-		return array_merge($this->getBuildInOperators(), $this->registeredOperators);
-	}
-
-	/**
-	 * @return ICheck[]
-	 */
-	public function getCheckList(): array {
-		$this->dispatcher->dispatchTyped(new RegisterChecksEvent($this));
-		$this->legacyEventDispatcher->dispatch(IManager::EVENT_NAME_REG_CHECK, new GenericEvent($this));
-
-		return array_merge($this->getBuildInChecks(), $this->registeredChecks);
-	}
-
-	public function registerEntity(IEntity $entity): void {
-		$this->registeredEntities[get_class($entity)] = $entity;
-	}
-
-	public function registerOperation(IOperation $operator): void {
-		$this->registeredOperators[get_class($operator)] = $operator;
-	}
-
-	public function registerCheck(ICheck $check): void {
-		$this->registeredChecks[get_class($check)] = $check;
-	}
-
-	/**
-	 * @return IEntity[]
-	 */
-	protected function getBuildInEntities(): array {
-		try {
-			return [
-				File::class => $this->container->query(File::class),
-			];
-		} catch (QueryException $e) {
-			$this->logger->logException($e);
-			return [];
-		}
-	}
-
-	/**
-	 * @return IOperation[]
-	 */
-	protected function getBuildInOperators(): array {
-		try {
-			return [
-				// None yet
-			];
-		} catch (QueryException $e) {
-			$this->logger->logException($e);
-			return [];
-		}
-	}
-
-	/**
-	 * @return ICheck[]
-	 */
-	protected function getBuildInChecks(): array {
-		try {
-			return [
-				$this->container->query(FileMimeType::class),
-				$this->container->query(FileName::class),
-				$this->container->query(FileSize::class),
-				$this->container->query(FileSystemTags::class),
-				$this->container->query(RequestRemoteAddress::class),
-				$this->container->query(RequestTime::class),
-				$this->container->query(RequestURL::class),
-				$this->container->query(RequestUserAgent::class),
-				$this->container->query(UserGroupMembership::class),
-			];
-		} catch (QueryException $e) {
-			$this->logger->logException($e);
-			return [];
-		}
-	}
-
-	public function isUserScopeEnabled(): bool {
-		return $this->config->getAppValue(Application::APP_ID, 'user_scope_disabled', 'no') === 'no';
-	}
+    /** @var IStorage */
+    protected $storage;
+
+    /** @var string */
+    protected $path;
+
+    /** @var object */
+    protected $entity;
+
+    /** @var array[] */
+    protected $operations = [];
+
+    /** @var array[] */
+    protected $checks = [];
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IServerContainer|\OC\Server */
+    protected $container;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var LegacyDispatcher */
+    protected $legacyEventDispatcher;
+
+    /** @var IEntity[] */
+    protected $registeredEntities = [];
+
+    /** @var IOperation[] */
+    protected $registeredOperators = [];
+
+    /** @var ICheck[] */
+    protected $registeredChecks = [];
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var CappedMemoryCache<int[]> */
+    protected CappedMemoryCache $operationsByScope;
+
+    /** @var IUserSession */
+    protected $session;
+
+    /** @var IEventDispatcher */
+    private $dispatcher;
+
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(
+        IDBConnection $connection,
+        IServerContainer $container,
+        IL10N $l,
+        LegacyDispatcher $eventDispatcher,
+        ILogger $logger,
+        IUserSession $session,
+        IEventDispatcher $dispatcher,
+        IConfig $config
+    ) {
+        $this->connection = $connection;
+        $this->container = $container;
+        $this->l = $l;
+        $this->legacyEventDispatcher = $eventDispatcher;
+        $this->logger = $logger;
+        $this->operationsByScope = new CappedMemoryCache(64);
+        $this->session = $session;
+        $this->dispatcher = $dispatcher;
+        $this->config = $config;
+    }
+
+    public function getRuleMatcher(): IRuleMatcher {
+        return new RuleMatcher(
+            $this->session,
+            $this->container,
+            $this->l,
+            $this,
+            $this->container->query(Logger::class)
+        );
+    }
+
+    public function getAllConfiguredEvents() {
+        $query = $this->connection->getQueryBuilder();
+
+        $query->select('class', 'entity')
+            ->selectAlias($query->expr()->castColumn('events', IQueryBuilder::PARAM_STR), 'events')
+            ->from('flow_operations')
+            ->where($query->expr()->neq('events', $query->createNamedParameter('[]'), IQueryBuilder::PARAM_STR))
+            ->groupBy('class', 'entity', $query->expr()->castColumn('events', IQueryBuilder::PARAM_STR));
+
+        $result = $query->execute();
+        $operations = [];
+        while ($row = $result->fetch()) {
+            $eventNames = \json_decode($row['events']);
+
+            $operation = $row['class'];
+            $entity = $row['entity'];
+
+            $operations[$operation] = $operations[$row['class']] ?? [];
+            $operations[$operation][$entity] = $operations[$operation][$entity] ?? [];
+
+            $operations[$operation][$entity] = array_unique(array_merge($operations[$operation][$entity], $eventNames ?? []));
+        }
+        $result->closeCursor();
+
+        return $operations;
+    }
+
+    /**
+     * @param string $operationClass
+     * @return ScopeContext[]
+     */
+    public function getAllConfiguredScopesForOperation(string $operationClass): array {
+        static $scopesByOperation = [];
+        if (isset($scopesByOperation[$operationClass])) {
+            return $scopesByOperation[$operationClass];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+
+        $query->selectDistinct('s.type')
+            ->addSelect('s.value')
+            ->from('flow_operations', 'o')
+            ->leftJoin('o', 'flow_operations_scope', 's', $query->expr()->eq('o.id', 's.operation_id'))
+            ->where($query->expr()->eq('o.class', $query->createParameter('operationClass')));
+
+        $query->setParameters(['operationClass' => $operationClass]);
+        $result = $query->execute();
+
+        $scopesByOperation[$operationClass] = [];
+        while ($row = $result->fetch()) {
+            $scope = new ScopeContext($row['type'], $row['value']);
+            $scopesByOperation[$operationClass][$scope->getHash()] = $scope;
+        }
+
+        return $scopesByOperation[$operationClass];
+    }
+
+    public function getAllOperations(ScopeContext $scopeContext): array {
+        if (isset($this->operations[$scopeContext->getHash()])) {
+            return $this->operations[$scopeContext->getHash()];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+
+        $query->select('o.*')
+            ->selectAlias('s.type', 'scope_type')
+            ->selectAlias('s.value', 'scope_actor_id')
+            ->from('flow_operations', 'o')
+            ->leftJoin('o', 'flow_operations_scope', 's', $query->expr()->eq('o.id', 's.operation_id'))
+            ->where($query->expr()->eq('s.type', $query->createParameter('scope')));
+
+        if ($scopeContext->getScope() === IManager::SCOPE_USER) {
+            $query->andWhere($query->expr()->eq('s.value', $query->createParameter('scopeId')));
+        }
+
+        $query->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]);
+        $result = $query->execute();
+
+        $this->operations[$scopeContext->getHash()] = [];
+        while ($row = $result->fetch()) {
+            if (!isset($this->operations[$scopeContext->getHash()][$row['class']])) {
+                $this->operations[$scopeContext->getHash()][$row['class']] = [];
+            }
+            $this->operations[$scopeContext->getHash()][$row['class']][] = $row;
+        }
+
+        return $this->operations[$scopeContext->getHash()];
+    }
+
+    public function getOperations(string $class, ScopeContext $scopeContext): array {
+        if (!isset($this->operations[$scopeContext->getHash()])) {
+            $this->getAllOperations($scopeContext);
+        }
+        return $this->operations[$scopeContext->getHash()][$class] ?? [];
+    }
+
+    /**
+     * @param int $id
+     * @return array
+     * @throws \UnexpectedValueException
+     */
+    protected function getOperation($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('flow_operations')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            return $row;
+        }
+
+        throw new \UnexpectedValueException($this->l->t('Operation #%s does not exist', [$id]));
+    }
+
+    protected function insertOperation(
+        string $class,
+        string $name,
+        array $checkIds,
+        string $operation,
+        string $entity,
+        array $events
+    ): int {
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('flow_operations')
+            ->values([
+                'class' => $query->createNamedParameter($class),
+                'name' => $query->createNamedParameter($name),
+                'checks' => $query->createNamedParameter(json_encode(array_unique($checkIds))),
+                'operation' => $query->createNamedParameter($operation),
+                'entity' => $query->createNamedParameter($entity),
+                'events' => $query->createNamedParameter(json_encode($events))
+            ]);
+        $query->execute();
+
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * @param string $class
+     * @param string $name
+     * @param array[] $checks
+     * @param string $operation
+     * @return array The added operation
+     * @throws \UnexpectedValueException
+     * @throw Exception
+     */
+    public function addOperation(
+        string $class,
+        string $name,
+        array $checks,
+        string $operation,
+        ScopeContext $scope,
+        string $entity,
+        array $events
+    ) {
+        $this->validateOperation($class, $name, $checks, $operation, $entity, $events);
+
+        $this->connection->beginTransaction();
+
+        try {
+            $checkIds = [];
+            foreach ($checks as $check) {
+                $checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
+            }
+
+            $id = $this->insertOperation($class, $name, $checkIds, $operation, $entity, $events);
+            $this->addScope($id, $scope);
+
+            $this->connection->commit();
+        } catch (Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+
+        return $this->getOperation($id);
+    }
+
+    protected function canModify(int $id, ScopeContext $scopeContext):bool {
+        if (isset($this->operationsByScope[$scopeContext->getHash()])) {
+            return in_array($id, $this->operationsByScope[$scopeContext->getHash()], true);
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb = $qb->select('o.id')
+            ->from('flow_operations', 'o')
+            ->leftJoin('o', 'flow_operations_scope', 's', $qb->expr()->eq('o.id', 's.operation_id'))
+            ->where($qb->expr()->eq('s.type', $qb->createParameter('scope')));
+
+        if ($scopeContext->getScope() !== IManager::SCOPE_ADMIN) {
+            $qb->where($qb->expr()->eq('s.value', $qb->createParameter('scopeId')));
+        }
+
+        $qb->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]);
+        $result = $qb->execute();
+
+        $operations = [];
+        while (($opId = $result->fetchOne()) !== false) {
+            $operations[] = (int)$opId;
+        }
+        $this->operationsByScope[$scopeContext->getHash()] = $operations;
+        $result->closeCursor();
+
+        return in_array($id, $this->operationsByScope[$scopeContext->getHash()], true);
+    }
+
+    /**
+     * @param int $id
+     * @param string $name
+     * @param array[] $checks
+     * @param string $operation
+     * @return array The updated operation
+     * @throws \UnexpectedValueException
+     * @throws \DomainException
+     * @throws Exception
+     */
+    public function updateOperation(
+        int $id,
+        string $name,
+        array $checks,
+        string $operation,
+        ScopeContext $scopeContext,
+        string $entity,
+        array $events
+    ): array {
+        if (!$this->canModify($id, $scopeContext)) {
+            throw new \DomainException('Target operation not within scope');
+        };
+        $row = $this->getOperation($id);
+        $this->validateOperation($row['class'], $name, $checks, $operation, $entity, $events);
+
+        $checkIds = [];
+        try {
+            $this->connection->beginTransaction();
+            foreach ($checks as $check) {
+                $checkIds[] = $this->addCheck($check['class'], $check['operator'], $check['value']);
+            }
+
+            $query = $this->connection->getQueryBuilder();
+            $query->update('flow_operations')
+                ->set('name', $query->createNamedParameter($name))
+                ->set('checks', $query->createNamedParameter(json_encode(array_unique($checkIds))))
+                ->set('operation', $query->createNamedParameter($operation))
+                ->set('entity', $query->createNamedParameter($entity))
+                ->set('events', $query->createNamedParameter(json_encode($events)))
+                ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+            $query->execute();
+            $this->connection->commit();
+        } catch (Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+        unset($this->operations[$scopeContext->getHash()]);
+
+        return $this->getOperation($id);
+    }
+
+    /**
+     * @param int $id
+     * @return bool
+     * @throws \UnexpectedValueException
+     * @throws Exception
+     * @throws \DomainException
+     */
+    public function deleteOperation($id, ScopeContext $scopeContext) {
+        if (!$this->canModify($id, $scopeContext)) {
+            throw new \DomainException('Target operation not within scope');
+        };
+        $query = $this->connection->getQueryBuilder();
+        try {
+            $this->connection->beginTransaction();
+            $result = (bool)$query->delete('flow_operations')
+                ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
+                ->execute();
+            if ($result) {
+                $qb = $this->connection->getQueryBuilder();
+                $result &= (bool)$qb->delete('flow_operations_scope')
+                    ->where($qb->expr()->eq('operation_id', $qb->createNamedParameter($id)))
+                    ->execute();
+            }
+            $this->connection->commit();
+        } catch (Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+
+        if (isset($this->operations[$scopeContext->getHash()])) {
+            unset($this->operations[$scopeContext->getHash()]);
+        }
+
+        return $result;
+    }
+
+    protected function validateEvents(string $entity, array $events, IOperation $operation) {
+        try {
+            /** @var IEntity $instance */
+            $instance = $this->container->query($entity);
+        } catch (QueryException $e) {
+            throw new \UnexpectedValueException($this->l->t('Entity %s does not exist', [$entity]));
+        }
+
+        if (!$instance instanceof IEntity) {
+            throw new \UnexpectedValueException($this->l->t('Entity %s is invalid', [$entity]));
+        }
+
+        if (empty($events)) {
+            if (!$operation instanceof IComplexOperation) {
+                throw new \UnexpectedValueException($this->l->t('No events are chosen.'));
+            }
+            return;
+        }
+
+        $availableEvents = [];
+        foreach ($instance->getEvents() as $event) {
+            /** @var IEntityEvent $event */
+            $availableEvents[] = $event->getEventName();
+        }
+
+        $diff = array_diff($events, $availableEvents);
+        if (!empty($diff)) {
+            throw new \UnexpectedValueException($this->l->t('Entity %s has no event %s', [$entity, array_shift($diff)]));
+        }
+    }
+
+    /**
+     * @param string $class
+     * @param string $name
+     * @param array[] $checks
+     * @param string $operation
+     * @throws \UnexpectedValueException
+     */
+    public function validateOperation($class, $name, array $checks, $operation, string $entity, array $events) {
+        try {
+            /** @var IOperation $instance */
+            $instance = $this->container->query($class);
+        } catch (QueryException $e) {
+            throw new \UnexpectedValueException($this->l->t('Operation %s does not exist', [$class]));
+        }
+
+        if (!($instance instanceof IOperation)) {
+            throw new \UnexpectedValueException($this->l->t('Operation %s is invalid', [$class]));
+        }
+
+        $this->validateEvents($entity, $events, $instance);
+
+        if (count($checks) === 0) {
+            throw new \UnexpectedValueException($this->l->t('At least one check needs to be provided'));
+        }
+
+        if (strlen((string)$operation) > IManager::MAX_OPERATION_VALUE_BYTES) {
+            throw new \UnexpectedValueException($this->l->t('The provided operation data is too long'));
+        }
+
+        $instance->validateOperation($name, $checks, $operation);
+
+        foreach ($checks as $check) {
+            if (!is_string($check['class'])) {
+                throw new \UnexpectedValueException($this->l->t('Invalid check provided'));
+            }
+
+            try {
+                /** @var ICheck $instance */
+                $instance = $this->container->query($check['class']);
+            } catch (QueryException $e) {
+                throw new \UnexpectedValueException($this->l->t('Check %s does not exist', [$class]));
+            }
+
+            if (!($instance instanceof ICheck)) {
+                throw new \UnexpectedValueException($this->l->t('Check %s is invalid', [$class]));
+            }
+
+            if (!empty($instance->supportedEntities())
+                && !in_array($entity, $instance->supportedEntities())
+            ) {
+                throw new \UnexpectedValueException($this->l->t('Check %s is not allowed with this entity', [$class]));
+            }
+
+            if (strlen((string)$check['value']) > IManager::MAX_CHECK_VALUE_BYTES) {
+                throw new \UnexpectedValueException($this->l->t('The provided check value is too long'));
+            }
+
+            $instance->validateCheck($check['operator'], $check['value']);
+        }
+    }
+
+    /**
+     * @param int[] $checkIds
+     * @return array[]
+     */
+    public function getChecks(array $checkIds) {
+        $checkIds = array_map('intval', $checkIds);
+
+        $checks = [];
+        foreach ($checkIds as $i => $checkId) {
+            if (isset($this->checks[$checkId])) {
+                $checks[$checkId] = $this->checks[$checkId];
+                unset($checkIds[$i]);
+            }
+        }
+
+        if (empty($checkIds)) {
+            return $checks;
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('flow_checks')
+            ->where($query->expr()->in('id', $query->createNamedParameter($checkIds, IQueryBuilder::PARAM_INT_ARRAY)));
+        $result = $query->execute();
+
+        while ($row = $result->fetch()) {
+            $this->checks[(int) $row['id']] = $row;
+            $checks[(int) $row['id']] = $row;
+        }
+        $result->closeCursor();
+
+        $checkIds = array_diff($checkIds, array_keys($checks));
+
+        if (!empty($checkIds)) {
+            $missingCheck = array_pop($checkIds);
+            throw new \UnexpectedValueException($this->l->t('Check #%s does not exist', $missingCheck));
+        }
+
+        return $checks;
+    }
+
+    /**
+     * @param string $class
+     * @param string $operator
+     * @param string $value
+     * @return int Check unique ID
+     */
+    protected function addCheck($class, $operator, $value) {
+        $hash = md5($class . '::' . $operator . '::' . $value);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id')
+            ->from('flow_checks')
+            ->where($query->expr()->eq('hash', $query->createNamedParameter($hash)));
+        $result = $query->execute();
+
+        if ($row = $result->fetch()) {
+            $result->closeCursor();
+            return (int) $row['id'];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('flow_checks')
+            ->values([
+                'class' => $query->createNamedParameter($class),
+                'operator' => $query->createNamedParameter($operator),
+                'value' => $query->createNamedParameter($value),
+                'hash' => $query->createNamedParameter($hash),
+            ]);
+        $query->execute();
+
+        return $query->getLastInsertId();
+    }
+
+    protected function addScope(int $operationId, ScopeContext $scope): void {
+        $query = $this->connection->getQueryBuilder();
+
+        $insertQuery = $query->insert('flow_operations_scope');
+        $insertQuery->values([
+            'operation_id' => $query->createNamedParameter($operationId),
+            'type' => $query->createNamedParameter($scope->getScope()),
+            'value' => $query->createNamedParameter($scope->getScopeId()),
+        ]);
+        $insertQuery->execute();
+    }
+
+    public function formatOperation(array $operation): array {
+        $checkIds = json_decode($operation['checks'], true);
+        $checks = $this->getChecks($checkIds);
+
+        $operation['checks'] = [];
+        foreach ($checks as $check) {
+            // Remove internal values
+            unset($check['id']);
+            unset($check['hash']);
+
+            $operation['checks'][] = $check;
+        }
+        $operation['events'] = json_decode($operation['events'], true) ?? [];
+
+
+        return $operation;
+    }
+
+    /**
+     * @return IEntity[]
+     */
+    public function getEntitiesList(): array {
+        $this->dispatcher->dispatchTyped(new RegisterEntitiesEvent($this));
+        $this->legacyEventDispatcher->dispatch(IManager::EVENT_NAME_REG_ENTITY, new GenericEvent($this));
+
+        return array_values(array_merge($this->getBuildInEntities(), $this->registeredEntities));
+    }
+
+    /**
+     * @return IOperation[]
+     */
+    public function getOperatorList(): array {
+        $this->dispatcher->dispatchTyped(new RegisterOperationsEvent($this));
+        $this->legacyEventDispatcher->dispatch(IManager::EVENT_NAME_REG_OPERATION, new GenericEvent($this));
+
+        return array_merge($this->getBuildInOperators(), $this->registeredOperators);
+    }
+
+    /**
+     * @return ICheck[]
+     */
+    public function getCheckList(): array {
+        $this->dispatcher->dispatchTyped(new RegisterChecksEvent($this));
+        $this->legacyEventDispatcher->dispatch(IManager::EVENT_NAME_REG_CHECK, new GenericEvent($this));
+
+        return array_merge($this->getBuildInChecks(), $this->registeredChecks);
+    }
+
+    public function registerEntity(IEntity $entity): void {
+        $this->registeredEntities[get_class($entity)] = $entity;
+    }
+
+    public function registerOperation(IOperation $operator): void {
+        $this->registeredOperators[get_class($operator)] = $operator;
+    }
+
+    public function registerCheck(ICheck $check): void {
+        $this->registeredChecks[get_class($check)] = $check;
+    }
+
+    /**
+     * @return IEntity[]
+     */
+    protected function getBuildInEntities(): array {
+        try {
+            return [
+                File::class => $this->container->query(File::class),
+            ];
+        } catch (QueryException $e) {
+            $this->logger->logException($e);
+            return [];
+        }
+    }
+
+    /**
+     * @return IOperation[]
+     */
+    protected function getBuildInOperators(): array {
+        try {
+            return [
+                // None yet
+            ];
+        } catch (QueryException $e) {
+            $this->logger->logException($e);
+            return [];
+        }
+    }
+
+    /**
+     * @return ICheck[]
+     */
+    protected function getBuildInChecks(): array {
+        try {
+            return [
+                $this->container->query(FileMimeType::class),
+                $this->container->query(FileName::class),
+                $this->container->query(FileSize::class),
+                $this->container->query(FileSystemTags::class),
+                $this->container->query(RequestRemoteAddress::class),
+                $this->container->query(RequestTime::class),
+                $this->container->query(RequestURL::class),
+                $this->container->query(RequestUserAgent::class),
+                $this->container->query(UserGroupMembership::class),
+            ];
+        } catch (QueryException $e) {
+            $this->logger->logException($e);
+            return [];
+        }
+    }
+
+    public function isUserScopeEnabled(): bool {
+        return $this->config->getAppValue(Application::APP_ID, 'user_scope_disabled', 'no') === 'no';
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -352,7 +352,7 @@ 
 
 		$operations = [];
 		while (($opId = $result->fetchOne()) !== false) {
-			$operations[] = (int)$opId;
+			$operations[] = (int) $opId;
 		}
 		$this->operationsByScope[$scopeContext->getHash()] = $operations;
 		$result->closeCursor();
@@ -425,12 +425,12 @@ 
 		$query = $this->connection->getQueryBuilder();
 		try {
 			$this->connection->beginTransaction();
-			$result = (bool)$query->delete('flow_operations')
+			$result = (bool) $query->delete('flow_operations')
 				->where($query->expr()->eq('id', $query->createNamedParameter($id)))
 				->execute();
 			if ($result) {
 				$qb = $this->connection->getQueryBuilder();
-				$result &= (bool)$qb->delete('flow_operations_scope')
+				$result &= (bool) $qb->delete('flow_operations_scope')
 					->where($qb->expr()->eq('operation_id', $qb->createNamedParameter($id)))
 					->execute();
 			}
@@ -503,7 +503,7 @@ 
 			throw new \UnexpectedValueException($this->l->t('At least one check needs to be provided'));
 		}
 
-		if (strlen((string)$operation) > IManager::MAX_OPERATION_VALUE_BYTES) {
+		if (strlen((string) $operation) > IManager::MAX_OPERATION_VALUE_BYTES) {
 			throw new \UnexpectedValueException($this->l->t('The provided operation data is too long'));
 		}
 
@@ -531,7 +531,7 @@ 
 				throw new \UnexpectedValueException($this->l->t('Check %s is not allowed with this entity', [$class]));
 			}
 
-			if (strlen((string)$check['value']) > IManager::MAX_CHECK_VALUE_BYTES) {
+			if (strlen((string) $check['value']) > IManager::MAX_CHECK_VALUE_BYTES) {
 				throw new \UnexpectedValueException($this->l->t('The provided check value is too long'));
 			}
 
@@ -587,7 +587,7 @@ 
 	 * @return int Check unique ID
 	 */
 	protected function addCheck($class, $operator, $value) {
-		$hash = md5($class . '::' . $operator . '::' . $value);
+		$hash = md5($class.'::'.$operator.'::'.$value);
 
 		$query = $this->connection->getQueryBuilder();
 		$query->select('id')