Merge pull request #192 from nextcloud/bugfix/share-attributes

nextcloud · Dec 20, 2023 · 4320453 · 4320453
2 parents 768652a + c4a68aa
commit 4320453
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/lib/Service/ZipService.php b/lib/Service/ZipService.php
@@ -29,6 +29,7 @@
 use Exception;
 use Icewind\Streams\CountWrapper;
 use OC\User\NoUserException;
+use OCA\Files_Sharing\SharedStorage;
 use OCA\FilesZip\AppInfo\Application;
 use OCA\FilesZip\BackgroundJob\ZipJob;
 use OCA\FilesZip\Exceptions\MaximumSizeReachedException;
@@ -44,6 +45,8 @@
 use OCP\IConfig;
 use OCP\IUserSession;
 use OCP\Lock\LockedException;
+use OCP\Share\IAttributes;
+use OCP\Share\IShare;
 use ZipStreamer\ZipStreamer;
 
 class ZipService {
@@ -154,7 +157,20 @@ private function verifyAndGetFiles($uid, $fileIds, $target): array {
 				continue;
 			}
 
+			/** @var Node $node */
 			$node = array_pop($nodes);
+
+			// Skip incoming shares without download permission
+			$storage = $node->getStorage();
+			if ($node->isShared() && $storage->instanceOfStorage(SharedStorage::class) && method_exists(IShare::class, 'getAttributes')) {
+				/** @var SharedStorage $storage */
+				$share = $storage->getShare();
+				$hasShareAttributes = $share && $share->getAttributes() instanceof IAttributes;
+				if ($hasShareAttributes && $share->getAttributes()->getAttribute('permissions', 'download') === false) {
+					continue;
+				}
+			}
+
 			$files[] = $node;
 			$size += $node->getSize();
 		}