Skip to content

[stable10] Preserve 15 permissions when creating link shares #28065

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
PVince81 merged 1 commit into from
Jun 2, 2017
Merged

[stable10] Preserve 15 permissions when creating link shares #28065

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
3 changes: 2 additions & 1 deletion apps/files_sharing/lib/API/Share20OCS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,8 @@ public function createShare() {
\OCP\Constants::PERMISSION_UPDATE |
\OCP\Constants::PERMISSION_DELETE
);
} else if ($permissions === \OCP\Constants::PERMISSION_CREATE) {
} else if ($permissions === \OCP\Constants::PERMISSION_CREATE ||
$permissions === (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE)) {
$share->setPermissions($permissions);
} else {
// because when "publicUpload" is passed usually no permissions are set,
Expand Down
44 changes: 44 additions & 0 deletions apps/files_sharing/tests/API/Share20OCSTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,50 @@ public function testCreateShareLinkPublicUploadFolder() {
$this->assertEquals($expected->getData(), $result->getData());
}

public function testCreateShareLinkReadWritePermissions() {
$ocs = $this->mockFormatShare();

$this->request
->method('getParam')
->will($this->returnValueMap([
['path', null, 'valid-path'],
['shareType', '-1', Share::SHARE_TYPE_LINK],
['permissions', null, '15'],
['expireDate', '', ''],
['password', '', ''],
]));

$path = $this->createMock('\OCP\Files\Folder');
$storage = $this->createMock('OCP\Files\Storage');
$storage->method('instanceOfStorage')
->with('OCA\Files_Sharing\External\Storage')
->willReturn(false);
$path->method('getStorage')->willReturn($storage);
$this->rootFolder->method('getUserFolder')->with($this->currentUser->getUID())->will($this->returnSelf());
$this->rootFolder->method('get')->with('valid-path')->willReturn($path);

$this->shareManager->method('newShare')->willReturn(\OC::$server->getShareManager()->newShare());
$this->shareManager->method('shareApiAllowLinks')->willReturn(true);
$this->shareManager->method('shareApiLinkAllowPublicUpload')->willReturn(true);

$this->shareManager->expects($this->once())->method('createShare')->with(
$this->callback(function (\OCP\Share\IShare $share) use ($path) {
return $share->getNode() === $path &&
$share->getShareType() === Share::SHARE_TYPE_LINK &&
$share->getPermissions() === (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE) &&
$share->getSharedBy() === 'currentUser' &&
$share->getPassword() === null &&
$share->getExpirationDate() === null;
})
)->will($this->returnArgument(0));

$expected = new \OC\OCS\Result(null);
$result = $ocs->createShare();

$this->assertEquals($expected->getMeta(), $result->getMeta());
$this->assertEquals($expected->getData(), $result->getData());
}

public function testCreateShareLinkCreateOnlyFolder() {
$ocs = $this->mockFormatShare();

Expand Down
16 changes: 16 additions & 0 deletions tests/integration/features/sharing-v1.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,6 +1189,22 @@ Feature: sharing
| share_type | 3 |
| permissions | 1 |

Scenario: Creating link share with edit permissions keeps it
Given As an "admin"
And user "user0" exists
And user "user0" created a folder "/afolder"
And As an "user0"
And creating a share with
| path | /afolder |
| shareType | 3 |
| permissions | 15 |
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| id | A_NUMBER |
| share_type | 3 |
| permissions | 15 |

Scenario: resharing using a public link with read only permissions is not allowed
Given As an "admin"
And user "user0" exists
Expand Down