fix: always return the owner of the file to be signed

To don't throw exceptions at the app file_version, we need to always
return the owner of the file .signed.pdf.

Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>

Author: vitormattos

lib/Service/SignFileService.php

@@ -13,6 +13,7 @@
 use Exception;
 use InvalidArgumentException;
 use OC\AppFramework\Http as AppFrameworkHttp;
+use OC\User\NoUserException;
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\DataObjects\VisibleElementAssoc;
 use OCA\Libresign\Db\AccountFile;
@@ -674,15 +675,10 @@ public function getSignRequestToSign(FileEntity $libresignFile, ?string $signReq
 		return $signRequest;
 	}
 
-	private function getPdfToSign(File $originalFile): File {
-		if ($this->libreSignFile->getSignedNodeId()) {
-			$nodeId = $this->libreSignFile->getSignedNodeId();
-
-			$fileToSign = $this->root->getUserFolder($this->libreSignFile->getUserId())->getFirstNodeById($nodeId);
-			if (!$fileToSign instanceof File) {
-				throw new LibresignException($this->l10n->t('File not found'));
-			}
-			return $fileToSign;
+	protected function getPdfToSign(File $originalFile): File {
+		$file = $this->getSignedFile();
+		if ($file instanceof File) {
+			return $file;
 		}
 		$footer = $this->footerHandler
 			->setTemplateVar('signers', array_map(fn (SignRequestEntity $signer) => [
@@ -710,6 +706,34 @@ private function getPdfToSign(File $originalFile): File {
 		return $this->createSignedFile($originalFile, $pdfContent);
 	}
 
+	protected function getSignedFile(): ?File {
+		$nodeId = $this->libreSignFile->getSignedNodeId();
+		if (!$nodeId) {
+			return null;
+		}
+
+		$fileToSign = $this->getNodeByIdUsingUid($this->libreSignFile->getUserId(), $nodeId);
+
+		if ($fileToSign->getOwner()->getUID() !== $this->libreSignFile->getUserId()) {
+			$fileToSign = $this->getNodeByIdUsingUid($fileToSign->getOwner()->getUID(), $nodeId);
+		}
+		return $fileToSign;
+	}
+
+	protected function getNodeByIdUsingUid(string $uid, int $nodeId): File {
+		try {
+			$fileToSign = $this->root->getUserFolder($uid)->getFirstNodeById($nodeId);
+		} catch (NoUserException) {
+			throw new LibresignException($this->l10n->t('User not found.'));
+		} catch (NotPermittedException) {
+			throw new LibresignException($this->l10n->t('You do not have permission for this action.'));
+		}
+		if (!$fileToSign instanceof File) {
+			throw new LibresignException($this->l10n->t('File not found'));
+		}
+		return $fileToSign;
+	}
+
 	private function createSignedFile(File $originalFile, string $content): File {
 		$filename = preg_replace(
 			'/' . $originalFile->getExtension() . '$/',

tests/php/Unit/Service/SignFileServiceTest.php

@@ -7,6 +7,7 @@
  */
 
 use bovigo\vfs\vfsStream;
+use OC\User\NoUserException;
 use OCA\Libresign\Db\AccountFileMapper;
 use OCA\Libresign\Db\File;
 use OCA\Libresign\Db\FileElement;
@@ -38,6 +39,7 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OCP\Http\Client\IClientService;
 use OCP\IAppConfig;
 use OCP\IDateTimeZone;
@@ -1076,4 +1078,75 @@ private static function createScenarioSetVisibleElements(
 			$isAuthenticatedSigner,
 		];
 	}
+
+	#[DataProvider('providerGetSignedFile')]
+	public function testGetSignedFile(
+		int $timesCalled,
+		string $managerUid,
+		?string $ownerUid = null,
+		?int $nodeId = null,
+	): void {
+		$service = $this->getService(['getNodeByIdUsingUid']);
+
+		$libreSignFile = new \OCA\Libresign\Db\File();
+		$libreSignFile->setSignedNodeId($nodeId);
+		$libreSignFile->setUserId($managerUid);
+		$service->setLibreSignFile($libreSignFile);
+
+		$fileToSign = $this->createMock(\OCP\Files\File::class);
+		$user = $this->createMock(\OCP\IUser::class);
+		$user->method('getUID')->willReturn($ownerUid);
+		$fileToSign->method('getOwner')->willReturn($user);
+		$service
+			->expects($this->exactly($timesCalled))
+			->method('getNodeByIdUsingUid')
+			->willReturn($fileToSign);
+
+		$this->invokePrivate($service, 'getSignedFile');
+	}
+
+	public static function providerGetSignedFile(): array {
+		return [
+			[0, 'managerUid', '', null],
+			[1, 'managerUid', 'managerUid', 1],
+			[2, 'managerUid', 'johndoe', 1],
+		];
+	}
+
+	#[DataProvider('providerGetNodeByIdUsingUid')]
+	public function testGetNodeByIdUsingUid(
+		string $typeOfNode,
+		string $exceptionMessage,
+	): void {
+		$service = $this->getService();
+		if ($exceptionMessage) {
+			$this->expectExceptionMessageMatches($exceptionMessage);
+		}
+		$leaf = $this->createMock($typeOfNode);
+		$userFolder = $this->createMock(\OCP\Files\Folder::class);
+		$userFolder->method('getFirstNodeById')->willReturn($leaf);
+		$this->root->method('getUserFolder')->willReturnCallback(function () use ($userFolder, $exceptionMessage) {
+			switch ($exceptionMessage) {
+				case '/User not found/':
+					throw new NoUserException();
+				case '/not have permission/':
+					throw new NotPermittedException();
+				case '/File not found/':
+					return $userFolder;
+				default:
+					return $userFolder;
+			}
+		});
+		$actual = $this->invokePrivate($service, 'getNodeByIdUsingUid', ['', 1]);
+		$this->assertEquals($leaf, $actual);
+	}
+
+	public static function providerGetNodeByIdUsingUid(): array {
+		return [
+			[\OCP\Files\Folder::class, '/User not found/'],
+			[\OCP\Files\Folder::class, '/not have permission/'],
+			[\OCP\Files\Folder::class, '/File not found/'],
+			[\OCP\Files\File::class, ''],
+		];
+	}
 }