buble up the stream size trough the seekable wrapper instead of using an exception

Signed-off-by: Robin Appelman <[email protected]>

Author: icewind1991

lib/composer/composer/autoload_classmap.php

@@ -301,7 +301,6 @@
     'OCP\\Files\\Events\\Node\\NodeRenamedEvent' => $baseDir . '/lib/public/Files/Events/Node/NodeRenamedEvent.php',
     'OCP\\Files\\Events\\Node\\NodeTouchedEvent' => $baseDir . '/lib/public/Files/Events/Node/NodeTouchedEvent.php',
     'OCP\\Files\\Events\\Node\\NodeWrittenEvent' => $baseDir . '/lib/public/Files/Events/Node/NodeWrittenEvent.php',
-    'OCP\\Files\\ExpectedFileSizeException' => $baseDir . '/lib/public/Files/ExpectedFileSizeException.php',
     'OCP\\Files\\File' => $baseDir . '/lib/public/Files/File.php',
     'OCP\\Files\\FileInfo' => $baseDir . '/lib/public/Files/FileInfo.php',
     'OCP\\Files\\FileNameTooLongException' => $baseDir . '/lib/public/Files/FileNameTooLongException.php',

lib/composer/composer/autoload_static.php

@@ -334,7 +334,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\Files\\Events\\Node\\NodeRenamedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Events/Node/NodeRenamedEvent.php',
         'OCP\\Files\\Events\\Node\\NodeTouchedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Events/Node/NodeTouchedEvent.php',
         'OCP\\Files\\Events\\Node\\NodeWrittenEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Events/Node/NodeWrittenEvent.php',
-        'OCP\\Files\\ExpectedFileSizeException' => __DIR__ . '/../../..' . '/lib/public/Files/ExpectedFileSizeException.php',
         'OCP\\Files\\File' => __DIR__ . '/../../..' . '/lib/public/Files/File.php',
         'OCP\\Files\\FileInfo' => __DIR__ . '/../../..' . '/lib/public/Files/FileInfo.php',
         'OCP\\Files\\FileNameTooLongException' => __DIR__ . '/../../..' . '/lib/public/Files/FileNameTooLongException.php',

lib/private/Files/ObjectStore/Azure.php

@@ -95,7 +95,7 @@ public function getStorageId() {
 	 * @return resource stream with the read data
 	 * @throws \Exception when something goes wrong, message will be logged
 	 */
-	public function readObject($urn, int $expectedFileSize = -1) {
+	public function readObject($urn) {
 		$blob = $this->getBlobClient()->getBlob($this->containerName, $urn);
 		return $blob->getContentStream();
 	}

lib/private/Files/ObjectStore/ObjectStoreStorage.php

@@ -311,10 +311,13 @@ public function fopen($path, $mode) {
 					}
 
 					try {
-						return $this->objectStore->readObject($this->getURN($stat['fileid']), $filesize);
-					} catch (ExpectedFileSizeException $e) {
-						$this->getCache()->update((int)$stat['fileid'], ['size' => $e->getActualFileSize()]);
-						return $this->objectStore->readObject($this->getURN($stat['fileid']));
+						$handle = $this->objectStore->readObject($this->getURN($stat['fileid']), $filesize);
+						$streamStat = fstat($handle);
+						$actualSize = (int)$streamStat['size'] ?? -1;
+						if ($actualSize > -1 && $actualSize != $filesize) {
+							$this->getCache()->update((int)$stat['fileid'], ['size' => $actualSize]);
+						}
+						return $handle;
 					} catch (NotFoundException $e) {
 						$this->logger->logException($e, [
 							'app' => 'objectstore',

lib/private/Files/ObjectStore/S3ObjectTrait.php

@@ -32,7 +32,6 @@
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Utils;
 use OC\Files\Stream\SeekableHttpStream;
-use OCP\Files\ExpectedFileSizeException;
 use Psr\Http\Message\StreamInterface;
 
 trait S3ObjectTrait {
@@ -53,8 +52,8 @@ abstract protected function getCertificateBundlePath(): ?string;
 	 * @throws \Exception when something goes wrong, message will be logged
 	 * @since 7.0.0
 	 */
-	public function readObject($urn, int $expectedFileSize = -1) {
-		return SeekableHttpStream::open(function ($range) use ($urn, $expectedFileSize) {
+	public function readObject($urn) {
+		return SeekableHttpStream::open(function ($range) use ($urn) {
 			$command = $this->getConnection()->getCommand('GetObject', [
 				'Bucket' => $this->bucket,
 				'Key' => $urn,
@@ -86,50 +85,11 @@ public function readObject($urn, int $expectedFileSize = -1) {
 			}
 
 			$context = stream_context_create($opts);
-			$res = fopen($request->getUri(), 'r', false, $context);
-
-			if (substr($range, 0, 2) !== '0-') {
-				return $res;
-			}
-
-			$actualContentLength = $this->extractDataContentLength($res);
-			if ($actualContentLength > -1
-				&& $expectedFileSize > -1
-				&& $actualContentLength !== $expectedFileSize) {
-				throw new ExpectedFileSizeException(
-					'cached file size conflict',
-					$actualContentLength
-				);
-			}
-
-			return $res;
+			return fopen($request->getUri(), 'r', false, $context);
 		});
 	}
 
 
-	/**
-	 * will return -1 if $res is a bool (not a resource)
-	 *
-	 * @param resource $res
-	 *
-	 * @return int
-	 */
-	private function extractDataContentLength($res): int {
-		if (is_bool($res)) {
-			return -1;
-		}
-
-		$data = stream_get_meta_data($res)['wrapper_data'];
-		foreach ($data as $entry) {
-			if (strtolower(substr($entry, 0, 16)) === 'content-length: ') {
-				return (int)substr($entry, 16);
-			}
-		}
-
-		return -1;
-	}
-
-
 	/**
 	 * Single object put helper
 	 *

lib/private/Files/ObjectStore/StorageObjectStore.php

@@ -55,7 +55,7 @@ public function getStorageId() {
 	 * @throws \Exception when something goes wrong, message will be logged
 	 * @since 7.0.0
 	 */
-	public function readObject($urn, int $expectedFileSize = -1) {
+	public function readObject($urn) {
 		$handle = $this->storage->fopen($urn, 'r');
 		if (is_resource($handle)) {
 			return $handle;

lib/private/Files/ObjectStore/Swift.php

@@ -101,7 +101,7 @@ public function writeObject($urn, $stream, string $mimetype = null) {
 	 * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
 	 * @throws NotFoundException if file does not exist
 	 */
-	public function readObject($urn, int $expectedFileSize = -1) {
+	public function readObject($urn) {
 		try {
 			$publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
 			$tokenId = $this->swiftFactory->getCachedTokenId();

lib/private/Files/Stream/SeekableHttpStream.php

@@ -75,8 +75,9 @@ public static function open(callable $callback) {
 
 	/** @var ?resource|closed-resource */
 	private $current;
-	private int $offset = 0;
-	private int $length = 0;
+	private int $offset = 0; // offset of the current chunk
+	private int $length = 0; // length of the current chunk
+	private int $totalSize = 0; // size of the full stream
 	private bool $needReconnect = false;
 
 	private function reconnect(int $start): bool {
@@ -128,6 +129,9 @@ private function reconnect(int $start): bool {
 
 		$this->offset = $begin;
 		$this->length = $length;
+		if ($start === 0) {
+			$this->totalSize = $length;
+		}
 
 		return true;
 	}
@@ -211,7 +215,9 @@ public function stream_tell() {
 
 	public function stream_stat() {
 		if ($this->getCurrent()) {
-			return fstat($this->getCurrent());
+			$stat = fstat($this->getCurrent());
+			$stat['size'] = $this->totalSize;
+			return $stat;
 		} else {
 			return false;
 		}

lib/public/Files/ExpectedFileSizeException.php

@@ -41,13 +41,12 @@ public function getStorageId();
 
 	/**
 	 * @param string $urn the unified resource name used to identify the object
-	 * @param int $expectedFileSize the expectedFileSize to compare the current real filesize
 	 * @return resource stream with the read data
 	 * @throws \Exception when something goes wrong, message will be logged
 	 * @throws NotFoundException if file does not exist
 	 * @since 7.0.0
 	 */
-	public function readObject($urn, int $expectedFileSize = -1);
+	public function readObject($urn);
 
 	/**
 	 * @param string $urn the unified resource name used to identify the object