Skip to content
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

Shares should have a least read permission #14570

Merged
merged 1 commit into from
Mar 2, 2015
Merged

Shares should have a least read permission #14570

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
9 changes: 8 additions & 1 deletion apps/files_sharing/api/local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ public static function createShare($params) {
return new \OC_OCS_Result(null, 400, "unknown share type");
}

if (($permissions & \OCP\Constants::PERMISSION_READ) === 0) {
return new \OC_OCS_Result(null, 400, 'invalid permissions');
}

try {
$token = \OCP\Share::shareItem(
$itemType,
Expand Down Expand Up @@ -347,7 +351,6 @@ public static function updateShare($params) {
}

return new \OC_OCS_Result(null, 400, "Wrong or no update parameter given");

}

/**
Expand Down Expand Up @@ -376,6 +379,10 @@ private static function updatePermissions($share, $params) {
}
}

if (($permissions & \OCP\Constants::PERMISSION_READ) === 0) {
return new \OC_OCS_Result(null, 400, 'invalid permissions');
}

try {
$return = \OCP\Share::setPermissions(
$itemType,
Expand Down
71 changes: 71 additions & 0 deletions apps/files_sharing/tests/api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,32 @@ function testCreateShare() {
\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
}

/**
* @medium
*/
public function testCreateShareInvalidPermissions() {

// simulate a post request
$_POST['path'] = $this->filename;
$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
$_POST['permissions'] = \OCP\Constants::PERMISSION_SHARE;

$result = \OCA\Files_Sharing\API\Local::createShare([]);

// share was successful?
$this->assertFalse($result->succeeded());
$this->assertEquals(400, $result->getStatusCode());

$shares = \OCP\Share::getItemShared('file', null);
$this->assertCount(0, $shares);

$fileinfo = $this->view->getFileInfo($this->filename);
\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
}


function testEnfoceLinkPassword() {

$appConfig = \OC::$server->getAppConfig();
Expand Down Expand Up @@ -883,6 +909,51 @@ function testUpdateShare() {

}

/**
* @medium
* @depends testCreateShare
*/
public function testUpdateShareInvalidPermissions() {

$fileInfo = $this->view->getFileInfo($this->filename);

$result = \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_ALL);

// share was successful?
$this->assertTrue($result);

$share = \OCP\Share::getItemShared('file', null);
$this->assertCount(1, $share);
$share = reset($share);

// check if share have expected permissions, single shared files never have
// delete permissions
$this->assertEquals(\OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_DELETE, $share['permissions']);

// update permissions
$params = [];
$params['id'] = $share['id'];
$params['_put'] = [];
$params['_put']['permissions'] = \OCP\Constants::PERMISSION_SHARE;

$result = \OCA\Files_Sharing\API\Local::updateShare($params);

//Updating should fail with 400
$this->assertFalse($result->succeeded());
$this->assertEquals(400, $result->getStatusCode());

$share = \OCP\Share::getItemShared('file', $share['file_source']);
$share = reset($share);

//Permissions should not have changed!
$this->assertEquals(\OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_DELETE, $share['permissions']);

\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
}


/**
* @medium
*/
Expand Down