explicitly close source stream on local / encryption storage

[kesselb]

e60a829 local

Uncaught Error: Class 'OC\Log\ExceptionSerializer' not found in /var/www/html/lib/private/Log.php:316
Stack trace:
#0 /var/www/html/lib/private/Log/ErrorHandler.php(100): OC\Log->logException(Object(Error), Array)
#1 [internal function]: OC\Log\ErrorHandler::onAll(2, 'fwrite(): suppl...', '/var/www/html/a...', 62, Array)
#2 /var/www/html/apps-extra/files_antivirus/lib/Scanner/ExternalClam.php(62): fwrite(Resource id #1295, '\x00\x00\x00\x00')
#3 /var/www/html/apps-extra/files_antivirus/lib/Scanner/ScannerBase.php(143): OCA\Files_Antivirus\Scanner\ExternalClam->shutdownScanner()
#4 /var/www/html/apps-extra/files_antivirus/lib/AvirWrapper.php(118): OCA\Files_Antivirus\Scanner\ScannerBase->completeAsyncScan()
#5 [internal function]: OCA\Files_Antivirus\AvirWrapper->OCA\Files_Antivirus\{closure}()
#6 /var/www/html/apps/files_external/3rdparty/icewind/streams/src/CallbackWrapper.php(119): call_user_func(Object(Closure))
#7 [internal function]: Icewind\Streams\CallbackWrapper->stream_close()
#8 {main}
thrown at /var/www/html/lib/private/Log.php#316

I run into the above error when scanning a chunked upload after assembly. files_antivirus is using a callback for stream_close to fetch the status (infected yes/no) from clamav. When the stream is not closed explicitly it's happening so late that not even the autoloader is registered anymore.

Fallback implementation for storage already closes the stream on close:

server/lib/private/Files/Storage/Common.php

Line 873 in dbf7905

fclose($stream);

ObjectStoreStorage is also closing the streams explicitly:

server/lib/private/Files/ObjectStore/ObjectStoreStorage.php

Line 491 in dbf7905

fclose($countStream);

server/lib/private/Files/ObjectStore/ObjectStoreStorage.php

Line 497 in dbf7905

fclose($stream);

be3f4ed encryption

1. The initial version c6a4811 were closing the input stream.
2. don't close input stream when writing in encrypted file #13468 removed fclose($stream) to fixCan't upload empty file when encryption app is enabled #13276.
3. In the meantime Don't fail if copying a file of 0 byte size #22739 update detection for failed writes to the storage. That's a better way to fix point 2.

I'm able to upload empty files with and without encryption (via web and nautilus) to local storage and object store.

[kesselb]

😟

[blizzz]

worried

It is not closed in

server/lib/private/Files/Storage/Wrapper/Encryption.php

Lines 1032 to 1037 in d0383dd

	publicfunctionwriteStream(string$path, $stream, int$size = null): int {
	// always fall back to fopen
	$target = $this->fopen($path, 'w');
	[$count, $result] = \OC_Helper::streamCopy($stream, $target);
	fclose($target);
	return$count;

[kesselb]

/backport to stable22

[kesselb]

/backport to stable21