Browse Source

fix(share): use share owner to confirm reshare

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
tags/v29.0.0beta5
Maxence Lange 3 months ago
parent
commit
bf71bd1305
1 changed files with 9 additions and 3 deletions
  1. 9
    3
      lib/private/Share20/Manager.php

+ 9
- 3
lib/private/Share20/Manager.php View File

@@ -210,7 +210,7 @@ class Manager implements IManager {
*
* @suppress PhanUndeclaredClassMethod
*/
protected function generalCreateChecks(IShare $share) {
protected function generalCreateChecks(IShare $share, bool $isUpdate = false) {
if ($share->getShareType() === IShare::TYPE_USER) {
// We expect a valid user as sharedWith for user shares
if (!$this->userManager->userExists($share->getSharedWith())) {
@@ -296,8 +296,14 @@ class Manager implements IManager {

$isFederatedShare = $share->getNode()->getStorage()->instanceOfStorage('\OCA\Files_Sharing\External\Storage');
$permissions = 0;
$isReshare = $share->getNode()->getOwner() && $share->getNode()->getOwner()->getUID() !== $share->getSharedBy();
if (!$isReshare && $isUpdate) {
// in case of update on owner-less filesystem, we use share owner to improve reshare detection
$isReshare = $share->getShareOwner() !== $share->getSharedBy();
}

if (!$isFederatedShare && $share->getNode()->getOwner() && $share->getNode()->getOwner()->getUID() !== $share->getSharedBy()) {
if (!$isFederatedShare && $isReshare) {
$userMounts = array_filter($userFolder->getById($share->getNode()->getId()), function ($mount) {
// We need to filter since there might be other mountpoints that contain the file
// e.g. if the user has access to the same external storage that the file is originating from
@@ -999,7 +1005,7 @@ class Manager implements IManager {
throw new \InvalidArgumentException('Cannot share with the share owner');
}

$this->generalCreateChecks($share);
$this->generalCreateChecks($share, true);

if ($share->getShareType() === IShare::TYPE_USER) {
$this->userCreateChecks($share);

Loading…
Cancel
Save