fixup! feat: improve ZipFolderPlugin behaviour for different cases

Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com>

Author: salmart-dev

apps/files_sharing/lib/Listener/BeforeZipCreatedListener.php

@@ -38,11 +38,11 @@ public function handle(Event $event): void {
 		$files = $event->getFiles();
 
 		if (empty($files)) {
-			$pathsToCheck = [$dir];
+			$pathsToCheck = [];
 		} else {
 			$pathsToCheck = [];
 			foreach ($files as $file) {
-				$pathsToCheck[] = $dir . '/' . $file;
+				$pathsToCheck[] = $file;
 			}
 		}
 
@@ -58,7 +58,7 @@ public function handle(Event $event): void {
 		$userFolder = $user ? $this->rootFolder->getUserFolder($user->getUID()) : null;
 		$folderToCheck = $userFolder ? $userFolder->get($dir) : $folder;
 
-		$viewOnlyHandler = new ViewOnly($userFolder);
+		$viewOnlyHandler = new ViewOnly($folderToCheck);
 		$isRootDownloadable = $viewOnlyHandler->isDownloadable($folderToCheck);
 
 		if (!$isRootDownloadable) {

apps/files_sharing/lib/ViewOnly.php

@@ -19,23 +19,27 @@
 class ViewOnly {
 
 	public function __construct(
-		private ?Folder $userFolder,
+		private ?Folder $folder,
 	) {
 	}
 
 	/**
-	 * @param string[] $pathsToCheck paths to check, relative to the user folder
+	 * @param string[] $pathsToCheck paths to check, relative to the given folder
 	 * @return bool
 	 */
 	public function check(array $pathsToCheck): bool {
-		if ($this->userFolder === null) {
-			throw new \LogicException('The user folder is not set but this check requires it.');
+		if ($this->folder === null) {
+			throw new \LogicException('Folder is not set but this check requires it.');
+		}
+
+		if (empty($pathsToCheck)) {
+			return $this->dirRecursiveCheck($this->folder);
 		}
 
 		// If any of elements cannot be downloaded, prevent whole download
 		foreach ($pathsToCheck as $file) {
 			try {
-				$info = $this->userFolder->get($file);
+				$info = $this->folder->get($file);
 				if ($info instanceof File) {
 					// access to filecache is expensive in the loop
 					if (!$this->isDownloadable($info)) {

apps/files_sharing/tests/ApplicationTest.php

@@ -164,6 +164,14 @@ function (string $fileStorage) use ($nonSharedStorage, $secureSharedStorage) {
 				$directoryListing
 			);
 			$folder->method('getDirectoryListing')->willReturn($directoryListing);
+			$callCount = 0;
+			$folder->method('get')->willReturnCallback(function (string $path) use (&$callCount, $directoryListing) {
+				if (isset($directoryListing[$callCount])) {
+					return $directoryListing[$callCount++];
+				}
+
+				throw new \Exception('Unknown path ' . $path);
+			});
 		}
 
 		// If the folder contains any secure-shared files, make it appear as a secure-shared folder
@@ -178,7 +186,7 @@ function (string $fileStorage) use ($nonSharedStorage, $secureSharedStorage) {
 		$rootFolder->method('getDirectoryListing')->willReturn([$folder]);
 
 		$userFolder = $this->createMock(Folder::class);
-		$userFolder->method('get')->willReturn($rootFolder);
+		$userFolder->method('get')->willReturn($folder);
 
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')->willReturn('test');

apps/files_sharing/tests/unit/Listener/BeforeZipCreatedListenerTest.php

@@ -46,9 +46,6 @@ protected function setUp(): void {
 
 	public static function dataHandle(): array {
 		$rootFromFolder = '/folder';
-		// files are relative to $folderPath
-		// filesFilter are relative to $folderPath but without leading /
-		// expectedNodeList are ...
 		return [
 			'partial archive disabled, no filtering, 1 blocked file => should fail event' => [
 				'folderPath' => $rootFromFolder,
@@ -194,10 +191,10 @@ public function testHandle(
 			$fileNodes[] = $file;
 		}
 		$folder = $this->createSharedFolder($rootDownloadable, $folderPathFromUserRoot, $fileNodes);
-		$this->userFolder->method('get')->willReturnCallback(function (string $path) use ($folderPath, $fileNodesByName, $folder) {
+		$this->userFolder->method('get')->willReturn($folder);
+		$folder->method('get')->willReturnCallback(function (string $path) use ($folderPath, $fileNodesByName, $folder) {
 			$path = str_replace($folderPath . '/', '', $path);
 			return match (true) {
-				$path === $folderPath => $folder,
 				isset($fileNodesByName[$path]) => $fileNodesByName[$path],
 				default => throw new \RuntimeException("Mock node not set for {$path}"),
 			};