Merge pull request #4819 from LibreSign/fix/optimize-file-loading

vitormattos · web-flow · commit be5eaca0fcc9 · 2025-04-11T10:25:04.000-03:00
fix: optimize file loading
diff --git a/.github/workflows/behat-mariadb.yml b/.github/workflows/behat-mariadb.yml
@@ -85,7 +85,7 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Install system dependencies
-        run: sudo apt install poppler-utils
+        run: sudo apt update && sudo apt install poppler-utils
 
       - name: Checkout server
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/behat-mysql.yml b/.github/workflows/behat-mysql.yml
@@ -89,7 +89,7 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Install system dependencies
-        run: sudo apt install poppler-utils
+        run: sudo apt update && sudo apt install poppler-utils
 
       - name: Checkout server
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/behat-pgsql.yml b/.github/workflows/behat-pgsql.yml
@@ -88,7 +88,7 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Install system dependencies
-        run: sudo apt install poppler-utils
+        run: sudo apt update && sudo apt install poppler-utils
 
       - name: Checkout server
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/behat-sqlite.yml b/.github/workflows/behat-sqlite.yml
@@ -79,7 +79,7 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Install system dependencies
-        run: sudo apt install poppler-utils
+        run: sudo apt update && sudo apt install poppler-utils
 
       - name: Checkout server
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
@@ -90,7 +90,7 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Install system dependencies
-        run: sudo apt install poppler-utils
+        run: sudo apt update && sudo apt install poppler-utils
 
       - name: Checkout server
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -90,7 +90,7 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Install system dependencies
-        run: sudo apt install poppler-utils
+        run: sudo apt update && sudo apt install poppler-utils
 
       - name: Checkout server
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
@@ -91,7 +91,7 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Install system dependencies
-        run: sudo apt install poppler-utils
+        run: sudo apt update && sudo apt install poppler-utils
 
       - name: Checkout server
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -81,7 +81,7 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Install system dependencies
-        run: sudo apt install poppler-utils
+        run: sudo apt update && sudo apt install poppler-utils
 
       - name: Checkout server
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/lib/Controller/LibresignTrait.php b/lib/Controller/LibresignTrait.php
@@ -54,9 +54,7 @@ private function loadEntitiesFromUuid(string $uuid): void {
 	public function validateSignRequestUuid(string $uuid): void {
 		$this->loadEntitiesFromUuid($uuid);
 		$this->signFileService->validateSigner($uuid, $this->userSession->getUser());
-		$this->nextcloudFile = $this->signFileService->getNextcloudFile(
-			$this->fileEntity->getNodeId(),
-		);
+		$this->nextcloudFile = $this->signFileService->getNextcloudFile($this->fileEntity);
 	}
 
 	/**
@@ -65,19 +63,15 @@ public function validateSignRequestUuid(string $uuid): void {
 	public function validateRenewSigner(string $uuid): void {
 		$this->loadEntitiesFromUuid($uuid);
 		$this->signFileService->validateRenewSigner($uuid, $this->userSession->getUser());
-		$this->nextcloudFile = $this->signFileService->getNextcloudFile(
-			$this->fileEntity->getNodeId(),
-		);
+		$this->nextcloudFile = $this->signFileService->getNextcloudFile($this->fileEntity);
 	}
 
 	/**
 	 * @throws LibresignException
 	 */
 	public function loadNextcloudFileFromSignRequestUuid(string $uuid): void {
 		$this->loadEntitiesFromUuid($uuid);
-		$this->nextcloudFile = $this->signFileService->getNextcloudFile(
-			$this->fileEntity->getNodeId(),
-		);
+		$this->nextcloudFile = $this->signFileService->getNextcloudFile($this->fileEntity);
 	}
 
 	public function getSignRequestEntity(): ?SignRequestEntity {
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -383,7 +383,7 @@ public function signAccountFile($uuid): TemplateResponse {
 		$this->initialState->provideInitialState('signature_methods', $signatureMethods);
 		$this->initialState->provideInitialState('token_length', TokenService::TOKEN_LENGTH);
 		$this->initialState->provideInitialState('description', '');
-		$nextcloudFile = $this->signFileService->getNextcloudFile($fileEntity->getNodeId());
+		$nextcloudFile = $this->signFileService->getNextcloudFile($fileEntity);
 		$this->initialState->provideInitialState('pdf',
 			$this->signFileService->getFileUrl('url', $fileEntity, $nextcloudFile, $uuid)
 		);
diff --git a/lib/Helper/ValidateHelper.php b/lib/Helper/ValidateHelper.php
@@ -364,12 +364,9 @@ public function fileCanBeSigned(File $file): void {
 	}
 
 	public function validateIfNodeIdExists(int $nodeId, int $type = self::TYPE_TO_SIGN): void {
-		$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-		foreach ($mountsContainingFile as $fileInfo) {
-			$this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-		}
 		try {
-			$file = $this->root->getById($nodeId);
+			$libresignFile = $this->fileMapper->getByFileId($nodeId);
+			$file = $this->root->getUserFolder($libresignFile->getUserId())->getById($nodeId);
 			$file = $file[0] ?? null;
 		} catch (\Throwable $th) {
 			throw new LibresignException($this->l10n->t('File type: %s. Invalid fileID.', [$this->getTypeOfFile($type)]));
@@ -380,11 +377,8 @@ public function validateIfNodeIdExists(int $nodeId, int $type = self::TYPE_TO_SI
 	}
 
 	public function validateMimeTypeAcceptedByNodeId(int $nodeId, int $type = self::TYPE_TO_SIGN): void {
-		$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-		foreach ($mountsContainingFile as $fileInfo) {
-			$this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-		}
-		$file = $this->root->getById($nodeId);
+		$libresignFile = $this->fileMapper->getByFileId($nodeId);
+		$file = $this->root->getUserFolder($libresignFile->getUserId())->getById($nodeId);
 		$file = $file[0];
 		$this->validateMimeTypeAcceptedByMime($file->getMimeType(), $type);
 	}
diff --git a/lib/Service/AccountService.php b/lib/Service/AccountService.php
@@ -120,11 +120,7 @@ public function getFileByUuid(string $uuid): array {
 
 			$nodeId = $this->fileData->getNodeId();
 
-			$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-			foreach ($mountsContainingFile as $fileInfo) {
-				$this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-			}
-			$fileToSign = $this->root->getById($nodeId);
+			$fileToSign = $this->root->getUserFolder($this->fileData->getUserId())->getById($nodeId);
 			if (count($fileToSign)) {
 				$this->fileToSign = current($fileToSign);
 			}
@@ -278,11 +274,7 @@ public function getPdfByUuid(string $uuid): File {
 		} else {
 			$nodeId = $fileData->getNodeId();
 		}
-		$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-		foreach ($mountsContainingFile as $fileInfo) {
-			$nodes = $this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-		}
-		$nodes = $this->root->getById($nodeId);
+		$nodes = $this->root->getUserFolder($fileData->getUserId())->getById($nodeId);
 		if (empty($nodes)) {
 			throw new DoesNotExistException('Not found');
 		}
diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php
@@ -242,11 +242,7 @@ private function getFile(): \OCP\Files\File {
 		if (!$nodeId) {
 			$nodeId = $this->file->getNodeId();
 		}
-		$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-		foreach ($mountsContainingFile as $fileInfo) {
-			$this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-		}
-		$fileToValidate = $this->root->getById($nodeId);
+		$fileToValidate = $this->root->getUserFolder($this->file->getUserId())->getById($nodeId);
 		if (!count($fileToValidate)) {
 			throw new LibresignException($this->l10n->t('File not found'), 404);
 		}
diff --git a/lib/Service/FolderService.php b/lib/Service/FolderService.php
@@ -68,12 +68,8 @@ public function getFolder(): Folder {
 	 */
 	public function getFileById(?int $nodeId = null): File {
 		if ($this->getUserId()) {
-			$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-			foreach ($mountsContainingFile as $fileInfo) {
-				$this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-			}
 			/** @var File[] */
-			$file = $this->root->getById($nodeId);
+			$file = $this->root->getUserFolder($this->getUserId())->getById($nodeId);
 			if ($file) {
 				if (!$file[0]->fopen('r')) {
 					throw new NotFoundException('Invalid node');
diff --git a/lib/Service/IdentifyMethod/AbstractIdentifyMethod.php b/lib/Service/IdentifyMethod/AbstractIdentifyMethod.php
@@ -144,11 +144,7 @@ protected function throwIfFileNotFound(): void {
 
 		$nodeId = $fileEntity->getNodeId();
 
-		$mountsContainingFile = $this->identifyService->getUserMountCache()->getMountsForFileId($nodeId);
-		foreach ($mountsContainingFile as $fileInfo) {
-			$this->identifyService->getRootFolder()->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-		}
-		$fileToSign = $this->identifyService->getRootFolder()->getById($nodeId);
+		$fileToSign = $this->identifyService->getRootFolder()->getUserFolder($fileEntity->getUserId())->getById($nodeId);
 		if (count($fileToSign) < 1) {
 			throw new LibresignException(json_encode([
 				'action' => JSActions::ACTION_DO_NOTHING,
diff --git a/lib/Service/SignFileService.php b/lib/Service/SignFileService.php
@@ -385,11 +385,7 @@ private function getPfxFile(): string {
 	public function getFileToSing(FileEntity $libresignFile): \OCP\Files\Node {
 		$nodeId = $libresignFile->getNodeId();
 
-		$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-		foreach ($mountsContainingFile as $fileInfo) {
-			$this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-		}
-		$originalFile = $this->root->getById($nodeId);
+		$originalFile = $this->root->getUserFolder($libresignFile->getUserId())->getById($nodeId);
 		if (count($originalFile) < 1) {
 			throw new LibresignException($this->l10n->t('File not found'));
 		}
@@ -523,11 +519,7 @@ private function getPdfToSign(FileEntity $fileData, File $originalFile): File {
 		if ($fileData->getSignedNodeId()) {
 			$nodeId = $fileData->getSignedNodeId();
 
-			$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-			foreach ($mountsContainingFile as $fileInfo) {
-				$this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-			}
-			$fileToSign = $this->root->getById($nodeId);
+			$fileToSign = $this->root->getUserFolder($fileData->getUserId())->getById($nodeId);
 			/** @var \OCP\Files\File */
 			$fileToSign = current($fileToSign);
 		} else {
@@ -636,12 +628,8 @@ public function getAccountFileById(int $fileId): AccountFile {
 		return $this->accountFileMapper->getByFileId($fileId);
 	}
 
-	public function getNextcloudFile(int $nodeId): File {
-		$mountsContainingFile = $this->userMountCache->getMountsForFileId($nodeId);
-		foreach ($mountsContainingFile as $fileInfo) {
-			$this->root->getByIdInPath($nodeId, $fileInfo->getMountPoint());
-		}
-		$fileToSign = $this->root->getById($nodeId);
+	public function getNextcloudFile(FileEntity $fileData): File {
+		$fileToSign = $this->root->getUserFolder($fileData->getUserId())->getById($fileData->getNodeId());
 		if (count($fileToSign) < 1) {
 			throw new LibresignException(json_encode([
 				'action' => JSActions::ACTION_DO_NOTHING,
diff --git a/tests/Unit/Helper/ValidateHelperTest.php b/tests/Unit/Helper/ValidateHelperTest.php
@@ -127,6 +127,9 @@ public function testValidateNewFileUsingFileIdWithSuccess():void {
 		$file
 			->method('getMimeType')
 			->willReturn('application/pdf');
+		$this->root
+			->method('getUserFolder')
+			->willReturn($this->root);
 		$this->root
 			->method('getById')
 			->willReturn([$file]);
@@ -170,6 +173,9 @@ public function testValidateMimeTypeAcceptedByNodeId(string $mimetype, int $dest
 		$file
 			->method('getMimeType')
 			->willReturn($mimetype);
+		$this->root
+			->method('getUserFolder')
+			->willReturn($this->root);
 		$this->root
 			->method('getById')
 			->willReturn([$file]);
@@ -399,6 +405,9 @@ public function testValidateIfNodeIdExistsWithInvalidFile():void {
 	}
 
 	public function testValidateIfNodeIdExistsWithSuccess():void {
+		$this->root
+			->method('getUserFolder')
+			->willReturn($this->root);
 		$this->root
 			->method('getById')
 			->willReturn(['file']);
diff --git a/tests/Unit/Service/AccountServiceTest.php b/tests/Unit/Service/AccountServiceTest.php
@@ -373,6 +373,9 @@ public function testGetPdfByUuidWithSuccessAndSignedFile():void {
 			->method('getMountsForFileId')
 			->willreturn([]);
 		$node = $this->createMock(\OCP\Files\File::class);
+		$this->root
+			->method('getUserFolder')
+			->willReturn($this->root);
 		$this->root
 			->method('getById')
 			->willReturn([$node]);
@@ -390,6 +393,9 @@ public function testGetPdfByUuidWithSuccessAndUnignedFile():void {
 			->method('getMountsForFileId')
 			->willreturn([]);
 		$node = $this->createMock(\OCP\Files\File::class);
+		$this->root
+			->method('getUserFolder')
+			->willReturn($this->root);
 		$this->root
 			->method('getById')
 			->willReturn([$node]);
diff --git a/tests/Unit/Service/SignFileServiceTest.php b/tests/Unit/Service/SignFileServiceTest.php
@@ -187,6 +187,8 @@ public function testSignWithFileNotFound():void {
 		$file = new \OCA\Libresign\Db\File();
 		$file->setUserId('username');
 
+		$this->root->method('getUserFolder')
+			->willReturn($this->root);
 		$this->root->method('getById')
 			->willReturn([]);
 		$this->userMountCache
@@ -217,6 +219,7 @@ public function testSignWithSuccess(string $mimetype, string $filename, string $
 		$nextcloudFile->method('getContent')->willReturn('fake content');
 		$nextcloudFile->method('getId')->willReturn(171);
 
+		$this->root->method('getUserFolder')->willReturn($this->root);
 		$this->root->method('getById')->willReturn([$nextcloudFile]);
 		$this->root->method('newFile')->willReturn($nextcloudFile);
 		$this->userMountCache->method('getMountsForFileId')->wilLReturn([]);
