Merge pull request #62153 from nextcloud/backport/62092/stable31

[stable31] fix(files_sharing): Allow access to shares by disabled users if hide_disabled_user_shares is enabled

Author: AndyScherzinger

apps/files_sharing/lib/Controller/ShareController.php

@@ -273,18 +273,6 @@ protected function emitShareAccessEvent(IShare $share, string $step = '', int $e
 	 * @return bool
 	 */
 	private function validateShare(IShare $share) {
-		// If the owner is disabled no access to the link is granted
-		$owner = $this->userManager->get($share->getShareOwner());
-		if ($owner === null || !$owner->isEnabled()) {
-			return false;
-		}
-
-		// If the initiator of the share is disabled no access is granted
-		$initiator = $this->userManager->get($share->getSharedBy());
-		if ($initiator === null || !$initiator->isEnabled()) {
-			return false;
-		}
-
 		return $share->getNode()->isReadable() && $share->getNode()->isShareable();
 	}
 

lib/private/Share20/Manager.php

@@ -1490,8 +1490,8 @@ private function checkShare(IShare $share, int &$added = 1): void {
 			$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') {
-			$uids = array_unique([$share->getShareOwner(),$share->getSharedBy()]);
+		if ($this->config->getAppValue('files_sharing', 'hide_disabled_user_shares', 'yes') === 'yes') {
+			$uids = array_unique([$share->getShareOwner(), $share->getSharedBy()]);
 			foreach ($uids as $uid) {
 				$user = $this->userManager->get($uid);
 				if ($user?->isEnabled() === false) {

tests/lib/Share20/ManagerTest.php

@@ -3140,7 +3140,7 @@ public function testGetShareByTokenHideDisabledUser(): void {
 			->method('getAppValue')
 			->willReturnMap([
 				['core', 'shareapi_allow_links', 'yes', 'yes'],
-				['files_sharing', 'hide_disabled_user_shares', 'no', 'yes'],
+				['files_sharing', 'hide_disabled_user_shares', 'yes', 'yes'],
 			]);
 
 		$this->l->expects($this->once())