Merge pull request #2813 from nextcloud/acl-no-trash-item

don't error if we can't find a trashbin item for a file when looking …

lib/ACL/ACLManager.php

@@ -28,6 +28,7 @@
 use OCP\Constants;
 use OCP\Files\IRootFolder;
 use OCP\IUser;
+use Psr\Log\LoggerInterface;
 
 class ACLManager {
 	private CappedMemoryCache $ruleCache;
@@ -37,6 +38,7 @@ class ACLManager {
 	public function __construct(
 		private RuleManager  $ruleManager,
 		private TrashManager $trashManager,
+		private LoggerInterface $logger,
 		private IUser        $user,
 		callable             $rootFolderProvider,
 		private ?int         $rootStorageId = null,
@@ -117,9 +119,13 @@ private function getRelevantPaths(string $path): array {
 			if ($fromTrashbin && ($path === '__groupfolders/trash')) {
 				/* We are in trash and hit the root folder, continue looking for ACLs on parent folders in original location */
 				$trashItemRow = $this->trashManager->getTrashItemByFileName($groupFolderId, $rootTrashedItemName, $rootTrashedItemDate);
-				$path = dirname('__groupfolders/' . $groupFolderId . '/' . $trashItemRow['original_location']);
 				$fromTrashbin = false;
-				continue;
+				if ($trashItemRow) {
+					$path = dirname('__groupfolders/' . $groupFolderId . '/' . $trashItemRow['original_location']);
+					continue;
+				} else {
+					$this->logger->warning("failed to find trash item for $rootTrashedItemName deleted at $rootTrashedItemDate in folder $groupFolderId", ['app' => 'groupfolders']);
+				}
 			}
 
 			if ($path === '.' || $path === '/') {

lib/ACL/ACLManagerFactory.php

@@ -26,6 +26,7 @@
 use OCA\GroupFolders\Trash\TrashManager;
 use OCP\IConfig;
 use OCP\IUser;
+use Psr\Log\LoggerInterface;
 
 class ACLManagerFactory {
 	private $rootFolderProvider;
@@ -34,6 +35,7 @@ public function __construct(
 		private RuleManager $ruleManager,
 		private TrashManager $trashManager,
 		private IConfig $config,
+		private LoggerInterface $logger,
 		callable $rootFolderProvider,
 	) {
 		$this->rootFolderProvider = $rootFolderProvider;
@@ -43,6 +45,7 @@ public function getACLManager(IUser $user, ?int $rootStorageId = null): ACLManag
 		return new ACLManager(
 			$this->ruleManager,
 			$this->trashManager,
+			$this->logger,
 			$user,
 			$this->rootFolderProvider,
 			$rootStorageId,

lib/AppInfo/Application.php

@@ -225,6 +225,7 @@ public function register(IRegistrationContext $context): void {
 				$c->get(RuleManager::class),
 				$c->get(TrashManager::class),
 				$c->get(IConfig::class),
+				$c->get(LoggerInterface::class),
 				$rootFolderProvider
 			);
 		});