upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 06:37:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix(shares): Fix infinite loop when hide_disabled_user_shares is yes

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2025-10-16 16:53:20 +02:00 committed by backportbot[bot]
parent ba8514cd6d
commit 1a50c7ec5a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/Share20/Manager.php
View file

@ -1265,16 +1265,16 @@ class Manager implements IManager {
while (true) {
$added = 0;
foreach ($shares as $share) {
$added++;
if ($onlyValid) {
try {
$this->checkShare($share);
$this->checkShare($share, $added);
} catch (ShareNotFound $e) {
// Ignore since this basically means the share is deleted
continue;
}
}
$added++;
$shares2[] = $share;
if (count($shares2) === $limit) {
@ -1480,11 +1480,14 @@ class Manager implements IManager {
/**
* Check expire date and disabled owner
*
* @param int &$added If given, will be decremented if the share is deleted
* @throws ShareNotFound
*/
protected function checkShare(IShare $share): void {
private function checkShare(IShare $share, int &$added = 1): void {
if ($share->isExpired()) {
$this->deleteShare($share);
// Remove 1 to added, because this share was deleted
$added--;
throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
}
if ($this->config->getAppValue('files_sharing', 'hide_disabled_user_shares', 'no') === 'yes') {