upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 02:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Set files_sharing:hide_disabled_user_shares to 'yes' to hide shares from disabled users

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2023-08-03 16:13:38 +02:00 committed by backportbot-nextcloud[bot]
parent c0b95e9cc6
commit f0c3cbeeae
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1347,7 +1347,7 @@ class Manager implements IManager {
$added = 0;
foreach ($shares as $share) {
try {
$this->checkExpireDate($share);
$this->checkShare($share);
} catch (ShareNotFound $e) {
//Ignore since this basically means the share is deleted
continue;
@ -1406,7 +1406,7 @@ class Manager implements IManager {
// remove all shares which are already expired
foreach ($shares as $key => $share) {
try {
$this->checkExpireDate($share);
$this->checkShare($share);
} catch (ShareNotFound $e) {
unset($shares[$key]);
}
@ -1452,7 +1452,7 @@ class Manager implements IManager {
$share = $provider->getShareById($id, $recipient);
$this->checkExpireDate($share);
$this->checkShare($share);
return $share;
}
@ -1536,7 +1536,7 @@ class Manager implements IManager {
throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
}
$this->checkExpireDate($share);
$this->checkShare($share);
/*
* Reduce the permissions for link or email shares if public upload is not enabled
@ -1549,11 +1549,25 @@ class Manager implements IManager {
return $share;
}
protected function checkExpireDate($share) {
/**
* Check expire date and disabled owner
*
* @throws ShareNotFound
*/
protected function checkShare(IShare $share): void {
if ($share->isExpired()) {
$this->deleteShare($share);
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') {
$uids = array_unique([$share->getShareOwner(),$share->getSharedBy()]);
foreach ($uids as $uid) {
$user = $this->userManager->get($uid);
if (($user !== null) && !$user->isEnabled()) {
throw new ShareNotFound($this->l->t('The requested share comes from a disabled user'));
}
}
}
}
/**