WIP [skip ci]

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

Author: salmart-dev

apps/dav/composer/composer/autoload_classmap.php

@@ -215,6 +215,7 @@
     'OCA\\DAV\\Connector\\Sabre\\Auth' => $baseDir . '/../lib/Connector/Sabre/Auth.php',
     'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => $baseDir . '/../lib/Connector/Sabre/BearerAuth.php',
     'OCA\\DAV\\Connector\\Sabre\\BlockLegacyClientPlugin' => $baseDir . '/../lib/Connector/Sabre/BlockLegacyClientPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\ByteCounterFilter' => $baseDir . '/../lib/Connector/Sabre/ByteCounterFilter.php',
     'OCA\\DAV\\Connector\\Sabre\\CachingTree' => $baseDir . '/../lib/Connector/Sabre/CachingTree.php',
     'OCA\\DAV\\Connector\\Sabre\\ChecksumList' => $baseDir . '/../lib/Connector/Sabre/ChecksumList.php',
     'OCA\\DAV\\Connector\\Sabre\\ChecksumUpdatePlugin' => $baseDir . '/../lib/Connector/Sabre/ChecksumUpdatePlugin.php',
@@ -253,6 +254,7 @@
     'OCA\\DAV\\Connector\\Sabre\\ShareTypeList' => $baseDir . '/../lib/Connector/Sabre/ShareTypeList.php',
     'OCA\\DAV\\Connector\\Sabre\\ShareeList' => $baseDir . '/../lib/Connector/Sabre/ShareeList.php',
     'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => $baseDir . '/../lib/Connector/Sabre/SharesPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\StreamByteCounter' => $baseDir . '/../lib/Connector/Sabre/StreamByteCounter.php',
     'OCA\\DAV\\Connector\\Sabre\\TagList' => $baseDir . '/../lib/Connector/Sabre/TagList.php',
     'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => $baseDir . '/../lib/Connector/Sabre/TagsPlugin.php',
     'OCA\\DAV\\Connector\\Sabre\\UserIdHeaderPlugin' => $baseDir . '/../lib/Connector/Sabre/UserIdHeaderPlugin.php',

apps/dav/composer/composer/autoload_static.php

@@ -230,6 +230,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Connector\\Sabre\\Auth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Auth.php',
         'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/BearerAuth.php',
         'OCA\\DAV\\Connector\\Sabre\\BlockLegacyClientPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/BlockLegacyClientPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\ByteCounterFilter' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ByteCounterFilter.php',
         'OCA\\DAV\\Connector\\Sabre\\CachingTree' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CachingTree.php',
         'OCA\\DAV\\Connector\\Sabre\\ChecksumList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ChecksumList.php',
         'OCA\\DAV\\Connector\\Sabre\\ChecksumUpdatePlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ChecksumUpdatePlugin.php',
@@ -268,6 +269,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Connector\\Sabre\\ShareTypeList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ShareTypeList.php',
         'OCA\\DAV\\Connector\\Sabre\\ShareeList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ShareeList.php',
         'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/SharesPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\StreamByteCounter' => __DIR__ . '/..' . '/../lib/Connector/Sabre/StreamByteCounter.php',
         'OCA\\DAV\\Connector\\Sabre\\TagList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagList.php',
         'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagsPlugin.php',
         'OCA\\DAV\\Connector\\Sabre\\UserIdHeaderPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/UserIdHeaderPlugin.php',

apps/dav/lib/Connector/Sabre/ByteCounterFilter.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\DAV\Connector\Sabre;
+
+/**
+ * A stream filter to track how many bytes have been streamed from a stream.
+ */
+class ByteCounterFilter extends \php_user_filter {
+	public string $filtername = 'ByteCounter';
+
+	public function filter($in, $out, &$consumed, bool $closing): int {
+		$counter = $this->params['counter'] ?? null;
+
+		while ($bucket = stream_bucket_make_writeable($in)) {
+			$length = $bucket->datalen;
+			$consumed += $length;
+			if ($counter instanceof StreamByteCounter) {
+				$counter->bytes += $length;
+			}
+			stream_bucket_append($out, $bucket);
+		}
+
+		return PSFS_PASS_ON;
+	}
+}

apps/dav/lib/Connector/Sabre/ServerFactory.php

@@ -110,6 +110,8 @@ public function createServer(
 			$this->logger,
 			$this->eventDispatcher,
 			\OCP\Server::get(IDateTimeZone::class),
+			$this->config,
+			$this->l10n,
 		));
 
 		// Some WebDAV clients do require Class 2 WebDAV support (locking), since

apps/dav/lib/Connector/Sabre/StreamByteCounter.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\DAV\Connector\Sabre;
+
+/**
+ * Class to use in combination with ByteCounterFilter to keep track of how much
+ * has been read from a stream.
+ *
+ * @see ByteCounterFilter
+ */
+class StreamByteCounter {
+	public float|int $bytes = 0;
+}

apps/dav/lib/Connector/Sabre/ZipFolderPlugin.php

@@ -15,7 +15,9 @@
 use OCP\Files\File as NcFile;
 use OCP\Files\Folder as NcFolder;
 use OCP\Files\Node as NcNode;
+use OCP\IConfig;
 use OCP\IDateTimeZone;
+use OCP\IL10N;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
@@ -37,13 +39,22 @@ class ZipFolderPlugin extends ServerPlugin {
 	 * Reference to main server object
 	 */
 	private ?Server $server = null;
+	private bool $reportMissingFiles;
+	private array $missingInfo = [];
 
 	public function __construct(
 		private Tree $tree,
 		private LoggerInterface $logger,
 		private IEventDispatcher $eventDispatcher,
 		private IDateTimeZone $timezoneFactory,
+		private IConfig $config,
+		private IL10N $l10n,
 	) {
+		$this->reportMissingFiles = $this->config->getSystemValueBool('archive_report_missing_files', false);
+
+		if ($this->reportMissingFiles) {
+			stream_filter_register('count.bytes', ByteCounterFilter::class);
+		}
 	}
 
 	/**
@@ -62,45 +73,71 @@ public function initialize(Server $server): void {
 	}
 
 	/**
-	 * @return iterable<NcNode>
+	 * Adding a node to the archive streamer.
 	 */
-	protected function createIterator(array $rootNodes): iterable {
-		foreach ($rootNodes as $rootNode) {
-			yield from $this->iterateNodes($rootNode);
+	protected function streamNode(Streamer $streamer, NcNode $node, string $rootPath): void {
+		// Remove the root path from the filename to make it relative to the requested folder
+		$filename = str_replace($rootPath, '', $node->getPath());
+
+		$mtime = $node->getMTime();
+		if ($node instanceof NcFolder) {
+			$streamer->addEmptyDir($filename, $mtime);
+			return;
 		}
-	}
 
-	/**
-	 * Recursively iterate over all nodes in a folder.
-	 * @return iterable<NcNode>
-	 */
-	protected function iterateNodes(NcNode $node): iterable {
-		yield $node;
+		if ($node instanceof NcFile) {
+			$path = $node->getPath();
+			$nodeSize = $node->getSize();
+			try {
+				$stream = $node->fopen('rb');
+			} catch (\Exception $e) {
+				// opening failed, log the failure as reason for the missing file
+				$exceptionClass = get_class($e);
+				$this->missingInfo[$path] = $this->l10n->t('Error while opening the file: %s', [$exceptionClass]);
+				return;
+			}
 
-		if ($node instanceof NcFolder) {
-			foreach ($node->getDirectoryListing() as $childNode) {
-				yield from $this->iterateNodes($childNode);
+			if ($stream === false) {
+				$this->missingInfo[$path] = $this->l10n->t('File could not be opened (fopen). Please check the server logs for more information.');
+				return;
+			}
+
+			$byteCounter = new StreamByteCounter();
+			$wrapped = stream_filter_append($stream, 'count.bytes', STREAM_FILTER_READ, ['counter' => $byteCounter]);
+			if ($wrapped === false) {
+				$this->missingInfo[$path] = $this->l10n->t('Unable to check file for consistency check');
+				return;
+			}
+
+			$fileAddedToStream = $streamer->addFileFromStream($stream, $filename, $nodeSize, $mtime);
+			if (!$fileAddedToStream) {
+				$this->missingInfo[$path] = $this->l10n->t('The archive was already finalized');
+				return;
 			}
+
+			$this->logStreamErrors($stream, $path, $nodeSize, $byteCounter->bytes);
 		}
 	}
 
 	/**
-	 * Adding a node to the archive streamer.
+	 * Checks whether $stream was fully streamed or if there were other issues
+	 * with the stream, logging the error if necessary.
+	 *
+	 * @param resource $stream
+	 * @return void
 	 */
-	protected function streamNode(Streamer $streamer, NcNode $node, string $rootPath): void {
-		// Remove the root path from the filename to make it relative to the requested folder
-		$filename = str_replace($rootPath, '', $node->getPath());
+	private function logStreamErrors(mixed $stream, string $path, float|int $expectedFileSize, float|int $readFileSize): void {
+		if (!$this->reportMissingFiles) {
+			return;
+		}
 
-		$mtime = $node->getMTime();
-		if ($node instanceof NcFile) {
-			$resource = $node->fopen('rb');
-			if ($resource === false) {
-				$this->logger->info('Cannot read file for zip stream', ['filePath' => $node->getPath()]);
-				throw new \Sabre\DAV\Exception\ServiceUnavailable('Requested file can currently not be accessed.');
-			}
-			$streamer->addFileFromStream($resource, $filename, $node->getSize(), $mtime);
-		} elseif ($node instanceof NcFolder) {
-			$streamer->addEmptyDir($filename, $mtime);
+		$streamMetadata = stream_get_meta_data($stream);
+		if (!is_resource($stream) || get_resource_type($stream) !== 'stream') {
+			$this->missingInfo[$path] = $this->l10n->t('Resource is not a stream or is closed.');
+		} elseif ($streamMetadata['timed_out']) {
+			$this->missingInfo[$path] = $this->l10n->t('Timeout while reading from stream.');
+		} elseif (!$streamMetadata['eof'] || $readFileSize != $expectedFileSize) {
+			$this->missingInfo[$path] = $this->l10n->t('Read %d out of %d bytes from storage. This means the connection may have been closed due to a network/storage error.', [$expectedFileSize, $readFileSize]);
 		}
 	}
 
@@ -155,14 +192,7 @@ public function handleDownload(Request $request, Response $response): ?bool {
 		}
 
 		$folder = $node->getNode();
-		$rootNodes = empty($files) ? $folder->getDirectoryListing() : [];
-		foreach ($files as $path) {
-			$child = $node->getChild($path);
-			assert($child instanceof Node);
-			$rootNodes[] = $child->getNode();
-		}
-
-		$event = new BeforeZipCreatedEvent($folder, $files, $this->createIterator($rootNodes));
+		$event = new BeforeZipCreatedEvent($folder, $files, $this->reportMissingFiles);
 		$this->eventDispatcher->dispatchTyped($event);
 		if ((!$event->isSuccessful()) || $event->getErrorMessage() !== null) {
 			$errorMessage = $event->getErrorMessage();
@@ -175,6 +205,17 @@ public function handleDownload(Request $request, Response $response): ?bool {
 			throw new Forbidden($errorMessage);
 		}
 
+		// At this point either the event handlers did not block the download
+		// or they support the new mechanism that filters out nodes that are not
+		// downloadable, in either case we can use the new API to set the iterator
+		$content = empty($files) ? $folder->getDirectoryListing() : [];
+		foreach ($files as $path) {
+			$child = $node->getChild($path);
+			assert($child instanceof Node);
+			$content[] = $child->getNode();
+		}
+		$event->setNodesIterable($this->getIterableFromNodes($content));
+
 		$archiveName = $folder->getName();
 		if (count(explode('/', trim($folder->getPath(), '/'), 3)) === 2) {
 			// this is a download of the root folder
@@ -187,19 +228,54 @@ public function handleDownload(Request $request, Response $response): ?bool {
 			$rootPath = dirname($folder->getPath());
 		}
 
-		$streamer = new Streamer($tarRequest, -1, count($rootNodes), $this->timezoneFactory);
+		// FIXME: numberOfFiles is supposed to be the count of ALL files in the
+		//  archive, not just the root directory.
+		$numberOfFiles = count($content) + ($this->reportMissingFiles ? 1 : 0);
+		$streamer = new Streamer($tarRequest, -1, $numberOfFiles, $this->timezoneFactory);
 		$streamer->sendHeaders($archiveName);
 		// For full folder downloads we also add the folder itself to the archive
 		if (empty($files)) {
 			$streamer->addEmptyDir($archiveName);
 		}
-		foreach ($event->getNodes() as $node) {
+
+		foreach ($event->getNodes() as $path => [$node, $reason]) {
+			if ($node === null) {
+				$this->missingInfo[$path] = $reason;
+				continue;
+			}
+
 			$this->streamNode($streamer, $node, $rootPath);
 		}
+
+		if ($this->reportMissingFiles && !empty($this->missingInfo)) {
+			$stream = fopen('php://temp', 'r+');
+			fwrite($stream, json_encode($this->missingInfo, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+			rewind($stream);
+			$streamer->addFileFromStream($stream, 'missing_files.json', 0, false);
+		}
 		$streamer->finalize();
 		return false;
 	}
 
+	/**
+	 * Given a set of nodes, produces a list of all nodes contained in them
+	 * recursively.
+	 *
+	 * @param NcNode[] $nodes
+	 * @return iterable<NcNode>
+	 */
+	private function getIterableFromNodes(array $nodes): iterable {
+		foreach ($nodes as $node) {
+			yield $node;
+
+			if ($node instanceof NcFolder) {
+				foreach ($node->getDirectoryListing() as $child) {
+					yield from $this->getIterableFromNodes([$child]);
+				}
+			}
+		}
+	}
+
 	/**
 	 * Tell sabre/dav not to trigger it's own response sending logic as the handleDownload will have already send the response
 	 *

apps/dav/lib/Server.php

@@ -87,6 +87,7 @@
 use OCP\IDateTimeZone;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
+use OCP\IL10N;
 use OCP\IPreview;
 use OCP\IRequest;
 use OCP\ISession;
@@ -242,6 +243,7 @@ public function __construct(
 			\OCP\Server::get(IUserSession::class)
 		));
 
+		$config = \OCP\Server::get(IConfig::class);
 		// performance improvement plugins
 		$this->server->addPlugin(new CopyEtagHeaderPlugin());
 		$this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
@@ -254,6 +256,8 @@ public function __construct(
 			$logger,
 			$eventDispatcher,
 			\OCP\Server::get(IDateTimeZone::class),
+			$config,
+			\OCP\Server::get(IL10N::class),
 		));
 		$this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
 		$this->server->addPlugin(new PropFindPreloadNotifyPlugin());

apps/files_sharing/lib/Listener/BeforeDirectFileDownloadListener.php

@@ -41,9 +41,9 @@ public function handle(Event $event): void {
 		}
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		$node = $userFolder->get($event->getPath());
-		if (!$this->viewOnly->isNodeCanBeDownloaded($node)) {
+		if (!$this->viewOnly->isDownloadable($node)) {
 			$event->setSuccessful(false);
-			$event->setErrorMessage('Access to this resource or one of its sub-items has been denied.');
+			$event->setErrorMessage('Access to this resource has been denied.');
 		}
 	}
 }