Skip to content

[stable30] fix(files): Check if target path is a descendant of the shared folder #47796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Sep 15, 2024
Merged

[stable30] fix(files): Check if target path is a descendant of the shared folder #47796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(files): Check if the target path is a descendant of the shared fo… 
…lder path

Signed-off-by: Git'Fellow <[email protected]>

fix: tests

Signed-off-by: Git'Fellow <[email protected]>

fix: fix tests

Signed-off-by: Git'Fellow <[email protected]>

fix: add tests

Signed-off-by: Git'Fellow <[email protected]>

fix: tests
  • Loading branch information
@solracsf @backportbot
solracsf authored and backportbot[bot] committed Sep 6, 2024
commit 2bb8c023c2eafd0f17065dfbf38e7f70d2a2fa84
3 changes: 2 additions & 1 deletion lib/private/Files/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,8 @@ private function targetIsNotShared(string $user, string $targetPath): bool {
}, $providers));

foreach ($shares as $share) {
if (str_starts_with($targetPath, $share->getNode()->getPath())) {
$sharedPath = $share->getNode()->getPath();
if ($targetPath === $sharedPath || str_starts_with($targetPath, $sharedPath . '/')) {
$this->logger->debug(
'It is not allowed to move one mount point into a shared folder',
['app' => 'files']);
Expand Down
10 changes: 9 additions & 1 deletion tests/lib/Files/ViewTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,17 +1668,24 @@ public function testMoveMountPointIntoAnother() {
public function testMoveMountPointIntoSharedFolder() {
self::loginAsUser($this->user);

[$mount1] = $this->createTestMovableMountPoints([
[$mount1, $mount2] = $this->createTestMovableMountPoints([
$this->user . '/files/mount1',
$this->user . '/files/mount2',
]);

$mount1->expects($this->never())
->method('moveMount');

$mount2->expects($this->once())
->method('moveMount')
->willReturn(true);

$view = new View('/' . $this->user . '/files/');
$view->mkdir('shareddir');
$view->mkdir('shareddir/sub');
$view->mkdir('shareddir/sub2');
// Create a similar named but non-shared folder
$view->mkdir('shareddir notshared');

$fileId = $view->getFileInfo('shareddir')->getId();
$userObject = \OC::$server->getUserManager()->createUser('test2', 'IHateNonMockableStaticClasses');
Expand All @@ -1697,6 +1704,7 @@ public function testMoveMountPointIntoSharedFolder() {
$this->assertFalse($view->rename('mount1', 'shareddir'), 'Cannot overwrite shared folder');
$this->assertFalse($view->rename('mount1', 'shareddir/sub'), 'Cannot move mount point into shared folder');
$this->assertFalse($view->rename('mount1', 'shareddir/sub/sub2'), 'Cannot move mount point into shared subfolder');
$this->assertTrue($view->rename('mount2', 'shareddir notshared/sub'), 'Can move mount point into a similarly named but non-shared folder');

$shareManager->deleteShare($share);
$userObject->delete();
Expand Down