upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

fix: Use getRelativePath method to check if node is inside folder

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2024-10-14 17:23:29 +02:00
parent e30cd2f03f
commit 28c885dbf2
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/Share20/Manager.php
View file

@ -1084,7 +1084,8 @@ class Manager implements IManager {
/* 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;
}
}

24
tests/lib/Share20/ManagerTest.php
View file

@ -9,6 +9,7 @@ namespace Test\Share20;
use DateTimeZone;
use OC\Files\Mount\MoveableMount;
use OC\Files\Utils\PathHelper;
use OC\KnownUser\KnownUserService;
use OC\Share20\DefaultShareProvider;
use OC\Share20\Exception;
@ -199,6 +200,14 @@ class ManagerTest extends \Test\TestCase {
]);
}
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);
@ -514,14 +523,11 @@ class ManagerTest extends \Test\TestCase {
->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);
@ -567,8 +573,7 @@ class ManagerTest extends \Test\TestCase {
->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);
@ -596,8 +601,7 @@ class ManagerTest extends \Test\TestCase {
->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');