fixing some issue on null files

nextcloud · Apr 23, 2021 · 53066d1 · 53066d1
1 parent 7e7b5f6
commit 53066d1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Service/FilesService.php b/lib/Service/FilesService.php
@@ -197,8 +197,15 @@ public function getChunksFromUser(string $userId, IIndexOptions $indexOptions):
 		$this->initFileSystems($userId);
 
 		/** @var Folder $files */
-		$files = $this->rootFolder->getUserFolder($userId)
-								  ->get($indexOptions->getOption('path', '/'));
+		try {
+			$files = $this->rootFolder->getUserFolder($userId)
+									  ->get($indexOptions->getOption('path', '/'));
+		} catch (Throwable $e) {
+			\OC::$server->getLogger()->log(2, 'Issue while retrieving rootFolder for ' . $userId);
+
+			return [];
+		}
+
 		if ($files instanceof Folder) {
 			return $this->getChunksFromDirectory($userId, $files);
 		} else {
@@ -377,6 +384,9 @@ private function generateFilesDocumentFromParent(string $userId, Folder $parent)
 	 * @throws Exception
 	 */
 	private function generateFilesDocumentFromFile(string $viewerId, Node $file): FilesDocument {
+		if (is_null($file->getId())) {
+			throw new NotFoundException();
+		}
 
 		$this->isNodeIndexable($file);
 
@@ -467,6 +477,7 @@ public function getFileFromId(string $userId, int $fileId): Node {
 
 		$files = $this->rootFolder->getUserFolder($userId)
 								  ->getById($fileId);
+
 		if (sizeof($files) === 0) {
 			throw new FilesNotFoundException();
 		}
@@ -1181,11 +1192,15 @@ private function isNodeIndexable(Node $file) {
 			}
 		}
 
-		$parent = $file->getParent();
+		try {
+			$parent = $file->getParent();
+		} catch (NotFoundException $e) {
+			return;
+		}
 		$parentPath = $this->withoutBeginSlash($parent->getPath());
 		$path = substr($parent->getPath(), 8 + strpos($parentPath, '/'));
 		if (is_string($path)) {
-			$this->isNodeIndexable($file->getParent());
+			$this->isNodeIndexable($parent);
 		}
 	}