Skip to content

Validate reshare permissions against actual path that the user tries to share #27820

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

Closed
juliusknorr wants to merge 4 commits into from
Closed

Validate reshare permissions against actual path that the user tries to share #27820

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5bf60f
Validate reshare permissions against actual path that the user tries …
juliusknorr Jul 6, 2021
70845cf
Fix tests to use the proper node of the user creating the share
juliusknorr Sep 14, 2021
62f507e
Add test case
juliusknorr Oct 20, 2021
a6c557c
Match against share target and node path
juliusknorr Oct 28, 2021
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
Prev Previous commit
Next Next commit
Fix tests to use the proper node of the user creating the share 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Oct 28, 2021
commit 70845cfbd3d7f17712d115d7e8beb990ebce04b4
10 changes: 6 additions & 4 deletions apps/files_sharing/tests/ApiTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,9 @@ public function testGetShareFromSourceWithReshares() {
->setPermissions(19);
$share1 = $this->shareManager->createShare($share1);

$node2 = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2)->get($this->filename);
$share2 = $this->shareManager->newShare();
$share2->setNode($node)
$share2->setNode($node2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
->setSharedWith(self::TEST_FILES_SHARING_API_USER3)
->setShareType(IShare::TYPE_USER)
Expand Down Expand Up @@ -633,7 +634,7 @@ public function testGetShareFromFolderReshares() {
$share1->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share1);

$node2 = $this->userFolder->get($this->folder.'/'.$this->filename);
$node2 = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2)->get($this->folder.'/'.$this->filename);
$share2 = $this->shareManager->newShare();
$share2->setNode($node2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
Expand All @@ -643,7 +644,7 @@ public function testGetShareFromFolderReshares() {
$share2->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share2);

$node3 = $this->userFolder->get($this->folder.'/'.$this->subfolder.'/'.$this->filename);
$node3 = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2)->get($this->folder.'/'.$this->subfolder.'/'.$this->filename);
$share3 = $this->shareManager->newShare();
$share3->setNode($node3)
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
Expand Down Expand Up @@ -824,8 +825,9 @@ public function testGetShareMultipleSharedFolder() {
$share2->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share2);

$node2 = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2)->get($this->folder . $this->subfolder);
$share3 = $this->shareManager->newShare();
$share3->setNode($node1)
$share3->setNode($node2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
->setShareType(IShare::TYPE_LINK)
->setPermissions(1);
Expand Down