From 3f695c6209a718ee989809120c689fd7a7ec3475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Mon, 14 Oct 2024 17:23:29 +0200
Subject: [PATCH] fix: Use getRelativePath method to check if node is inside
 folder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 lib/private/Share20/Manager.php   |  3 ++-
 tests/lib/Share20/ManagerTest.php | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 2bc639607d864..e9ac9166f2642 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1208,7 +1208,8 @@ protected function promoteReshares(IShare $share): void {
 							/* Ignore share of non-existing node */
 							continue;
 						}
-						if (str_starts_with($path, $node->getPath() . '/') || ($path === $node->getPath())) {
+						if ($node->getRelativePath($path) !== null) {
+							/* If relative path is not null it means the shared node is the same or in a subfolder */
 							$reshareRecords[] = $share;
 						}
 					}
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index 517f236ef2816..f18816eec6a17 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -23,6 +23,7 @@
 
 use DateTimeZone;
 use OC\Files\Mount\MoveableMount;
+use OC\Files\Utils\PathHelper;
 use OC\KnownUser\KnownUserService;
 use OC\Share20\DefaultShareProvider;
 use OC\Share20\Exception;
@@ -213,6 +214,14 @@ private function createManagerMock() {
 			]);
 	}
 
+	private function createFolderMock(string $folderPath): MockObject&Folder {
+		$folder = $this->createMock(Folder::class);
+		$folder->method('getPath')->willReturn($folderPath);
+		$folder->method('getRelativePath')->willReturnCallback(
+			fn (string $path): ?string => PathHelper::getRelativePath($folderPath, $path)
+		);
+		return $folder;
+	}
 
 	public function testDeleteNoShareId() {
 		$this->expectException(\InvalidArgumentException::class);
@@ -528,14 +537,11 @@ public function testPromoteReshare(): void {
 			->setMethods(['updateShare', 'getSharesInFolder', 'generalCreateChecks'])
 			->getMock();
 
-		$folder = $this->createMock(Folder::class);
-		$folder->method('getPath')->willReturn('/path/to/folder');
+		$folder = $this->createFolderMock('/path/to/folder');
 
-		$subFolder = $this->createMock(Folder::class);
-		$subFolder->method('getPath')->willReturn('/path/to/folder/sub');
+		$subFolder = $this->createFolderMock('/path/to/folder/sub');
 
-		$otherFolder = $this->createMock(Folder::class);
-		$otherFolder->method('getPath')->willReturn('/path/to/otherfolder/');
+		$otherFolder = $this->createFolderMock('/path/to/otherfolder/');
 
 		$share = $this->createMock(IShare::class);
 		$share->method('getShareType')->willReturn(IShare::TYPE_USER);
@@ -581,8 +587,7 @@ public function testPromoteReshareWhenUserHasAnotherShare(): void {
 			->setMethods(['updateShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
 			->getMock();
 
-		$folder = $this->createMock(Folder::class);
-		$folder->method('getPath')->willReturn('/path/to/folder');
+		$folder = $this->createFolderMock('/path/to/folder');
 
 		$share = $this->createMock(IShare::class);
 		$share->method('getShareType')->willReturn(IShare::TYPE_USER);
@@ -610,8 +615,7 @@ public function testPromoteReshareOfUsersInGroupShare(): void {
 			->setMethods(['updateShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
 			->getMock();
 
-		$folder = $this->createMock(Folder::class);
-		$folder->method('getPath')->willReturn('/path/to/folder');
+		$folder = $this->createFolderMock('/path/to/folder');
 
 		$userA = $this->createMock(IUser::class);
 		$userA->method('getUID')->willReturn('userA');