diff options
| author | Louis <louis@chmn.me> | 2025-01-30 10:14:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-30 10:14:18 +0100 |
| commit | c89e139e711062c7831ab94b4057ba8f91ce6052 (patch) | |
| tree | 6a17ca0ce87167e33a69f1b847ab0af0ea916209 | |
| parent | 4a7c0b326769bfa39c4a8470f24f6f6e3420706a (diff) | |
| parent | b6c7c2858525ea730b415c5114a66e0cd2876edc (diff) | |
| download | nextcloud-server-c89e139e711062c7831ab94b4057ba8f91ce6052.tar.gz nextcloud-server-c89e139e711062c7831ab94b4057ba8f91ce6052.zip | |
Merge pull request #50519 from nextcloud/artonge/fix/access_list_unaccepted_shares
fix: Exclude non accepted shares when computing access list
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 12 | ||||
| -rw-r--r-- | tests/lib/Share20/DefaultShareProviderTest.php | 9 |
2 files changed, 21 insertions, 0 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index ca3c33d6dbb..c9e5bf96cb7 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -1343,6 +1343,18 @@ class DefaultShareProvider implements IShareProviderWithNotification, IShareProv $qb->expr()->eq('item_type', $qb->createNamedParameter('file')), $qb->expr()->eq('item_type', $qb->createNamedParameter('folder')) )); + + // Ensure accepted is true for user and usergroup type + $qb->andWhere( + $qb->expr()->orX( + $qb->expr()->andX( + $qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_USER)), + $qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)), + ), + $qb->expr()->eq('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED, IQueryBuilder::PARAM_INT)), + ), + ); + $cursor = $qb->executeQuery(); $users = []; diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index 394ca41c1ae..75a70d558c1 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -2702,6 +2702,7 @@ class DefaultShareProviderTest extends \Test\TestCase { ->setShareType(IShare::TYPE_USER) ->setPermissions(\OCP\Constants::PERMISSION_ALL); $share1 = $this->provider->create($share1); + $share1 = $provider->acceptShare($share1, $u2->getUid()); $share2 = $shareManager->newShare(); $share2->setNode($folder2) @@ -2714,6 +2715,9 @@ class DefaultShareProviderTest extends \Test\TestCase { $shareManager->deleteFromSelf($share2, $u4->getUID()); + $share2 = $provider->acceptShare($share2, $u3->getUid()); + $share2 = $provider->acceptShare($share2, $u4->getUid()); + $share3 = $shareManager->newShare(); $share3->setNode($file1) ->setSharedBy($u3->getUID()) @@ -2730,6 +2734,7 @@ class DefaultShareProviderTest extends \Test\TestCase { ->setShareType(IShare::TYPE_USER) ->setPermissions(\OCP\Constants::PERMISSION_READ); $share4 = $this->provider->create($share4); + $share4 = $provider->acceptShare($share4, $u5->getUid()); $result = $provider->getAccessList([$folder1, $folder2, $file1], false); @@ -2800,6 +2805,7 @@ class DefaultShareProviderTest extends \Test\TestCase { ->setShareType(IShare::TYPE_USER) ->setPermissions(\OCP\Constants::PERMISSION_ALL); $share1 = $this->provider->create($share1); + $share1 = $provider->acceptShare($share1, $u2->getUid()); $share2 = $shareManager->newShare(); $share2->setNode($folder2) @@ -2809,6 +2815,8 @@ class DefaultShareProviderTest extends \Test\TestCase { ->setShareType(IShare::TYPE_GROUP) ->setPermissions(\OCP\Constants::PERMISSION_ALL); $share2 = $this->provider->create($share2); + $share2 = $provider->acceptShare($share2, $u3->getUid()); + $share2 = $provider->acceptShare($share2, $u4->getUid()); $shareManager->deleteFromSelf($share2, $u4->getUID()); @@ -2828,6 +2836,7 @@ class DefaultShareProviderTest extends \Test\TestCase { ->setShareType(IShare::TYPE_USER) ->setPermissions(\OCP\Constants::PERMISSION_READ); $share4 = $this->provider->create($share4); + $share4 = $provider->acceptShare($share4, $u5->getUid()); $result = $provider->getAccessList([$folder1, $folder2, $file1], true); |