Skip to content

Added tests about permissions and public upload #26639

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
SergioBertolinSG wants to merge 6 commits into from
Closed

Added tests about permissions and public upload #26639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60451fa
Added tests about permissions and public upload
SergioBertolinSG Nov 15, 2016
e05c004
Added read and share permissions instead of all (default ones)
SergioBertolinSG Nov 22, 2016
dad998c
Added positive case
SergioBertolinSG Nov 22, 2016
2ba0f9a
Correctly convert OCS permissions params
Nov 22, 2016
1b3984c
Check also permissions update
SergioBertolinSG Nov 22, 2016
3358c2b
Added tests for resharing with public links when the user doesn't hav…
SergioBertolinSG Nov 22, 2016
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
1 change: 1 addition & 0 deletions apps/files_sharing/lib/API/Share20OCS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ public function updateShare($id) {

if ($newPermissions !== null) {
$share->setPermissions($newPermissions);
$permissions = $newPermissions;
}

if ($expireDate === '') {
Expand Down
57 changes: 57 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 @@ -1303,6 +1303,7 @@ public function testUpdateLinkShareClear() {
$share = $this->newShare();
$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
->setSharedBy($this->currentUser->getUID())
->setShareOwner($this->currentUser->getUID())
->setShareType(Share::SHARE_TYPE_LINK)
->setPassword('password')
->setExpirationDate(new \DateTime())
Expand Down Expand Up @@ -1349,6 +1350,7 @@ public function testUpdateLinkShareSet() {
$share = \OC::$server->getShareManager()->newShare();
$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
->setSharedBy($this->currentUser->getUID())
->setShareOwner($this->currentUser->getUID())
->setShareType(Share::SHARE_TYPE_LINK)
->setNode($folder);

Expand Down Expand Up @@ -1392,6 +1394,7 @@ public function testUpdateLinkShareEnablePublicUpload($params) {
$share = \OC::$server->getShareManager()->newShare();
$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
->setSharedBy($this->currentUser->getUID())
->setShareOwner($this->currentUser->getUID())
->setShareType(Share::SHARE_TYPE_LINK)
->setPassword('password')
->setNode($folder);
Expand Down Expand Up @@ -1627,6 +1630,7 @@ public function testUpdateLinkSharePublicUploadDoesNotChangeOther() {
$share = \OC::$server->getShareManager()->newShare();
$share->setPermissions(\OCP\Constants::PERMISSION_ALL)
->setSharedBy($this->currentUser->getUID())
->setShareOwner($this->currentUser->getUID())
->setShareType(Share::SHARE_TYPE_LINK)
->setPassword('password')
->setExpirationDate($date)
Expand Down Expand Up @@ -1819,6 +1823,59 @@ public function testUpdateShareCannotIncreasePermissions() {
$this->assertEquals($expected->getData(), $result->getData());
}

/**
* @dataProvider publicUploadParamsProvider
*/
public function testUpdateShareCannotIncreasePermissionsPublicLink($params) {
$ocs = $this->mockFormatShare();

$date = new \DateTime('2000-01-01');

$folder = $this->createMock('\OCP\Files\Folder');

$share = \OC::$server->getShareManager()->newShare();
$share
->setId(42)
->setSharedBy('anotheruser')
->setShareOwner('anotheruser')
->setShareType(Share::SHARE_TYPE_USER)
->setSharedWith($this->currentUser->getUID())
->setPermissions(\OCP\Constants::PERMISSION_READ)
->setNode($folder);

$linkShare = \OC::$server->getShareManager()->newShare();
$linkShare
->setId(43)
->setSharedBy($this->currentUser->getUID())
->setShareOwner('anotheruser')
->setShareType(Share::SHARE_TYPE_LINK)
->setToken('dummy')
->setPermissions(\OCP\Constants::PERMISSION_READ)
->setNode($folder);

$this->request
->method('getParam')
->will($this->returnValueMap($params));

$this->shareManager->method('getShareById')->with('ocinternal:43')->willReturn($linkShare);
$this->shareManager->method('shareApiLinkAllowPublicUpload')->willReturn(true);

$this->shareManager->expects($this->any())
->method('getSharedWith')
->will($this->returnValueMap([
[$this->currentUser->getUID(), Share::SHARE_TYPE_USER, $share->getNode(), -1, 0, [$share]],
[$this->currentUser->getUID(), Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0, []],
]));

$this->shareManager->expects($this->never())->method('updateShare');

$expected = new \OC\OCS\Result(null, 404, 'Cannot increase permissions');
$result = $ocs->updateShare(43);

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

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

Expand Down
115 changes: 115 additions & 0 deletions build/integration/features/sharing-v1.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,3 +976,118 @@ Feature: sharing
Then etag of element "/" of user "user1" has changed
And etag of element "/PARENT" of user "user0" has not changed

Scenario: Increasing permissions is allowed for owner
Given As an "admin"
And user "user0" exists
And user "user1" exists
And group "new-group" exists
And user "user0" belongs to group "new-group"
And user "user1" belongs to group "new-group"
And Assure user "user0" is subadmin of group "new-group"

@PVince81 PVince81 Nov 21, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

subadmin really needed ?

@SergioBertolinSG SergioBertolinSG Nov 22, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps not, it comes from here #25542 (comment)

And As an "user0"
And folder "/FOLDER" of user "user0" is shared with group "new-group"
And Updating last share with
| permissions | 0 |
When Updating last share with
| permissions | 31 |
Then the OCS status code should be "100"
And the HTTP status code should be "200"

Scenario: Adding public upload to a read only shared folder as recipient is not allowed
Given As an "admin"
And user "user0" exists
And user "user1" exists
And As an "user0"
And user "user0" created a folder "/test"
And folder "/test" of user "user0" is shared with user "user1" with permissions 17
And As an "user1"
And creating a share with
| path | /test |
| shareType | 3 |
| publicUpload | false |
When Updating last share with
| publicUpload | true |

@PVince81 PVince81 Nov 21, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks legitimate. At line 1002 the share is read-write so it's acceptable that the recipient can also make the link share read-write.

Did you mean to make the local share read-only ?

@SergioBertolinSG SergioBertolinSG Nov 22, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you're right. I'll change it.

Then the OCS status code should be "404"
And the HTTP status code should be "200"

Scenario: Adding public upload to a shared folder as recipient is allowed with permissions
Given As an "admin"
And user "user0" exists
And user "user1" exists
And As an "user0"
And user "user0" created a folder "/test"
And folder "/test" of user "user0" is shared with user "user1" with permissions 31
And As an "user1"
And creating a share with
| path | /test |
| shareType | 3 |
| publicUpload | false |
When Updating last share with
| publicUpload | true |

@PVince81 PVince81 Nov 22, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also have the same tests with the "permissions" attribute ? @SergioBertolinSG

@SergioBertolinSG SergioBertolinSG Nov 22, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

Then the OCS status code should be "100"
And the HTTP status code should be "200"

Scenario: Adding public upload to a read only shared folder as recipient is not allowed
Given As an "admin"
And user "user0" exists
And user "user1" exists
And As an "user0"
And user "user0" created a folder "/test"
And folder "/test" of user "user0" is shared with user "user1" with permissions 17
And As an "user1"
And creating a share with
| path | /test |
| shareType | 3 |
| permissions | 1 |
When Updating last share with
| permissions | 15 |
Then the OCS status code should be "404"
And the HTTP status code should be "200"

Scenario: Adding public upload to a shared folder as recipient is allowed with permissions
Given As an "admin"
And user "user0" exists
And user "user1" exists
And As an "user0"
And user "user0" created a folder "/test"
And folder "/test" of user "user0" is shared with user "user1" with permissions 31
And As an "user1"
And creating a share with
| path | /test |
| shareType | 3 |
| permissions | 1 |
When Updating last share with
| permissions | 15 |
Then the OCS status code should be "100"
And the HTTP status code should be "200"

Scenario: resharing using a public link with read only permissions is not allowed
Given As an "admin"
And user "user0" exists
And user "user1" exists
And As an "user0"
And user "user0" created a folder "/test"
And folder "/test" of user "user0" is shared with user "user1" with permissions 1
And As an "user1"
And creating a share with
| path | /test |
| shareType | 3 |
| publicUpload | false |
Then the OCS status code should be "404"
And the HTTP status code should be "200"

Scenario: resharing using a public link with read and write permissions only is not allowed
Given As an "admin"
And user "user0" exists
And user "user1" exists
And As an "user0"
And user "user0" created a folder "/test"
And folder "/test" of user "user0" is shared with user "user1" with permissions 15
And As an "user1"
And creating a share with
| path | /test |
| shareType | 3 |
| publicUpload | false |
Then the OCS status code should be "404"
And the HTTP status code should be "200"