From 80f83ab5e079489a46ed56adee1898afb8b26ff0 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 24 Mar 2015 11:08:19 +0100 Subject: Do not return shares for files outside "files" --- tests/lib/share/share.php | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'tests/lib') diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index 42bb82968af..2bc1e320e57 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -388,6 +388,45 @@ class Test_Share extends \Test\TestCase { $this->assertSame(\OCP\Share::SHARE_TYPE_USER, $share['share_type']); } + public function testGetShareFromOutsideFilesFolder() { + OC_User::setUserId($this->user1); + $view = new \OC\Files\View('/' . $this->user1 . '/'); + $view->mkdir('files/test'); + $view->mkdir('files/test/sub'); + + $view->mkdir('files_trashbin'); + $view->mkdir('files_trashbin/files'); + + $fileInfo = $view->getFileInfo('files/test/sub'); + $fileId = $fileInfo->getId(); + + $this->assertTrue( + OCP\Share::shareItem('folder', $fileId, OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ), + 'Failed asserting that user 1 successfully shared "test/sub" with user 2.' + ); + + $result = OCP\Share::getItemShared('folder', $fileId, Test_Share_Backend::FORMAT_SOURCE); + $this->assertNotEmpty($result); + + $result = OCP\Share::getItemSharedWithUser('folder', $fileId, $this->user2); + $this->assertNotEmpty($result); + + $result = OCP\Share::getItemsSharedWithUser('folder', $this->user2); + $this->assertNotEmpty($result); + + // move to trash (keeps file id) + $view->rename('files/test', 'files_trashbin/files/test'); + + $result = OCP\Share::getItemShared('folder', $fileId, Test_Share_Backend::FORMAT_SOURCE); + $this->assertEmpty($result, 'Share must not be returned for files outside of "files"'); + + $result = OCP\Share::getItemSharedWithUser('folder', $fileId, $this->user2); + $this->assertEmpty($result, 'Share must not be returned for files outside of "files"'); + + $result = OCP\Share::getItemsSharedWithUser('folder', $this->user2); + $this->assertEmpty($result, 'Share must not be returned for files outside of "files"'); + } + public function testSetExpireDateInPast() { OC_User::setUserId($this->user1); $this->shareUserOneTestFileWithUserTwo(); -- cgit v1.2.3 From 23cb8112fcea5a93dfedbe26433dd1f469c98670 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 27 Mar 2015 15:54:29 +0100 Subject: Add logout in share test to avoid nasty side effects --- tests/lib/share/share.php | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/lib') diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index 2bc1e320e57..43539866508 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -101,6 +101,7 @@ class Test_Share extends \Test\TestCase { OC_Group::deleteGroup($this->group2); OC_Group::deleteGroup($this->groupAndUser); + $this->logout(); parent::tearDown(); } -- cgit v1.2.3