pass around preload rules for root acl instead of relying on the cache

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Sep 17, 2023 · 5e4e87f · 5e4e87f
1 parent 5c29fa5
commit 5e4e87f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/lib/ACL/ACLCacheWrapper.php b/lib/ACL/ACLCacheWrapper.php
@@ -30,8 +30,8 @@
 use OCP\Files\Search\ISearchQuery;
 
 class ACLCacheWrapper extends CacheWrapper {
-	private $aclManager;
-	private $inShare;
+	private ACLManager $aclManager;
+	private bool $inShare;
 
 	private function getACLPermissionsForPath(string $path, array $rules = []) {
 		if ($rules) {
@@ -70,7 +70,7 @@ protected function formatCacheEntry($entry, array $rules = []) {
 	public function getFolderContentsById($fileId) {
 		$results = $this->getCache()->getFolderContentsById($fileId);
 		$rules = $this->preloadEntries($results);
-		$entries = array_map(function($entry) use ($rules) {
+		$entries = array_map(function ($entry) use ($rules) {
 			return $this->formatCacheEntry($entry, $rules);
 		}, $results);
 		return array_filter(array_filter($entries));

diff --git a/lib/Listeners/CircleDestroyedEventListener.php b/lib/Listeners/CircleDestroyedEventListener.php
@@ -32,7 +32,6 @@
 use OCP\EventDispatcher\IEventListener;
 
 class CircleDestroyedEventListener implements IEventListener {
-
 	public function __construct(
 		private FolderManager $folderManager,
 	) {

diff --git a/lib/Migration/Version1401000Date20230426112001.php b/lib/Migration/Version1401000Date20230426112001.php
@@ -33,7 +33,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1401000Date20230426112001 extends SimpleMigrationStep {
-
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();

diff --git a/lib/Migration/Version16000Date20230821085801.php b/lib/Migration/Version16000Date20230821085801.php
@@ -36,7 +36,6 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version16000Date20230821085801 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

diff --git a/lib/Mount/MountProvider.php b/lib/Mount/MountProvider.php
@@ -138,9 +138,9 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {
 			return $this->getJailPath($folder['folder_id']);
 		}, $foldersWithAcl);
 		$aclManager = $this->aclManagerFactory->getACLManager($user, $this->getRootStorageId());
-		$aclManager->preloadPaths($aclRootPaths);
+		$rootRules = $aclManager->preloadPaths($aclRootPaths);
 
-		return array_values(array_filter(array_map(function ($folder) use ($user, $loader, $conflicts, $aclManager) {
+		return array_values(array_filter(array_map(function ($folder) use ($user, $loader, $conflicts, $aclManager, $rootRules) {
 			// check for existing files in the user home and rename them if needed
 			$originalFolderName = $folder['mount_point'];
 			if (in_array($originalFolderName, $conflicts)) {
@@ -168,7 +168,8 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {
 				$loader,
 				$folder['acl'],
 				$user,
-				$aclManager
+				$aclManager,
+				$rootRules
 			);
 		}, $folders)));
 	}
@@ -200,7 +201,8 @@ public function getMount(
 		IStorageFactory $loader = null,
 		bool $acl = false,
 		IUser $user = null,
-		?ACLManager $aclManager = null
+		?ACLManager $aclManager = null,
+		array $rootRules = []
 	): ?IMountPoint {
 		if (!$cacheEntry) {
 			// trigger folder creation
@@ -219,12 +221,12 @@ public function getMount(
 		if ($acl && $user) {
 			$inShare = $this->getCurrentUID() === null || $this->getCurrentUID() !== $user->getUID();
 			$aclManager ??= $this->aclManagerFactory->getACLManager($user, $this->getRootStorageId());
+			$aclRootPermissions = $aclManager->getPermissionsForPathFromRules($rootPath, $rootRules);
 			$storage = new ACLStorageWrapper([
 				'storage' => $storage,
 				'acl_manager' => $aclManager,
-				'in_share' => $inShare
+				'in_share' => $inShare,
 			]);
-			$aclRootPermissions = $aclManager->getACLPermissionsForPath($rootPath);
 			$cacheEntry['permissions'] &= $aclRootPermissions;
 		}
 

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
@@ -30,7 +30,6 @@
 use OCP\Settings\IDelegatedSettings;
 
 class Admin implements IDelegatedSettings {
-
 	public function __construct(
 		private IInitialState $initialState,
 		private ApplicationService $applicationService,

diff --git a/lib/Versions/GroupVersion.php b/lib/Versions/GroupVersion.php
@@ -30,7 +30,6 @@
 use OCP\IUser;
 
 class GroupVersion extends Version {
-
 	public function __construct(
 		int $timestamp,
 		int $revisionId,