Skip to content

Commit

Permalink
Do not allow to delete/update group shares as a group member
Browse files Browse the repository at this point in the history
  • Loading branch information
nickvergessen committed Aug 3, 2016
1 parent 482a725 commit 7289cb5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions apps/files_sharing/lib/API/Share20OCS.php
Expand Up @@ -224,7 +224,7 @@ public function deleteShare($id) {
return new \OC_OCS_Result(null, 404, 'could not delete share');
}

if (!$this->canAccessShare($share)) {
if (!$this->canAccessShare($share, false)) {
$share->getNode()->unlock(ILockingProvider::LOCK_SHARED);
return new \OC_OCS_Result(null, 404, $this->l->t('Could not delete share'));
}
Expand Down Expand Up @@ -573,7 +573,7 @@ public function updateShare($id) {

$share->getNode()->lock(\OCP\Lock\ILockingProvider::LOCK_SHARED);

if (!$this->canAccessShare($share)) {
if (!$this->canAccessShare($share, false)) {
$share->getNode()->unlock(ILockingProvider::LOCK_SHARED);
return new \OC_OCS_Result(null, 404, $this->l->t('Wrong share ID, share doesn\'t exist'));
}
Expand Down Expand Up @@ -703,7 +703,7 @@ public function updateShare($id) {
* @param \OCP\Share\IShare $share
* @return bool
*/
protected function canAccessShare(\OCP\Share\IShare $share) {
protected function canAccessShare(\OCP\Share\IShare $share, $checkGroups = true) {
// A file with permissions 0 can't be accessed by us. So Don't show it
if ($share->getPermissions() === 0) {
return false;
Expand All @@ -722,7 +722,7 @@ protected function canAccessShare(\OCP\Share\IShare $share) {
return true;
}

if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
if ($checkGroups && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
$sharedWith = $this->groupManager->get($share->getSharedWith());
if ($sharedWith->inGroup($this->currentUser)) {
return true;
Expand Down

0 comments on commit 7289cb5

Please sign in to comment.