mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21226 from nextcloud/backport/21199/stable19 

[stable19] Prevent harder to share your root
This commit is contained in:
Roeland Jago Douma 2020-06-04 19:01:56 +02:00 committed by GitHub
parent c296a55fe8 982f2fc21a
commit a1204be15b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Share20/Manager.php
View File

@ -277,12 +277,10 @@ class Manager implements IManager {
// And you can't share your rootfolder // And you can't share your rootfolder
if ($this->userManager->userExists($share->getSharedBy())) { if ($this->userManager->userExists($share->getSharedBy())) {
$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy()); $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
$userFolderPath = $userFolder->getPath();
} else { } else {
$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner()); $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
$userFolderPath = $userFolder->getPath();
} }
if ($userFolderPath === $share->getNode()->getPath()) { if ($userFolder->getId() === $share->getNode()->getId()) {
throw new \InvalidArgumentException('You can’t share your root folder'); throw new \InvalidArgumentException('You can’t share your root folder');
} }

6
tests/lib/Share20/ManagerTest.php
View File

@ -646,7 +646,7 @@ class ManagerTest extends \Test\TestCase {
$rootFolder = $this->createMock(Folder::class); $rootFolder = $this->createMock(Folder::class);
$rootFolder->method('isShareable')->willReturn(true); $rootFolder->method('isShareable')->willReturn(true);
$rootFolder->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_ALL); $rootFolder->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_ALL);
$rootFolder->method('getPath')->willReturn('myrootfolder'); $rootFolder->method('getId')->willReturn(42);
$data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_USER, $rootFolder, $user2, $user0, $user0, 30, null, null), 'You can’t share your root folder', true]; $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_USER, $rootFolder, $user2, $user0, $user0, 30, null, null), 'You can’t share your root folder', true];
$data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_GROUP, $rootFolder, $group0, $user0, $user0, 2, null, null), 'You can’t share your root folder', true]; $data[] = [$this->createShare(null, \OCP\Share::SHARE_TYPE_GROUP, $rootFolder, $group0, $user0, $user0, 2, null, null), 'You can’t share your root folder', true];
@ -706,7 +706,9 @@ class ManagerTest extends \Test\TestCase {
]); ]);
$userFolder = $this->createMock(Folder::class); $userFolder = $this->createMock(Folder::class);
$userFolder->method('getPath')->willReturn('myrootfolder'); $userFolder->expects($this->any())
->method('getId')
->willReturn(42);
$userFolder->expects($this->any()) $userFolder->expects($this->any())
->method('getRelativePath') ->method('getRelativePath')
->willReturnArgument(0); ->willReturnArgument(0);