raise proper error when s3 object doesn't exist

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Nov 20, 2023 · ee8942c · ee8942c
1 parent 37c4da8
commit ee8942c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -33,6 +33,7 @@
 use Aws\S3\S3Client;
 use Icewind\Streams\CallbackWrapper;
 use OC\Files\Stream\SeekableHttpStream;
+use OCP\Files\NotFoundException;
 
 trait S3ObjectTrait {
 	/**
@@ -71,7 +72,11 @@ public function readObject($urn) {
 			];
 
 			$context = stream_context_create($opts);
-			return fopen($request->getUri(), 'r', false, $context);
+			$fh = fopen($request->getUri(), 'r', false, $context);
+			if (!$fh && isset($http_response_header[0]) && str_contains($http_response_header[0], '404')) {
+				throw new NotFoundException("object $urn not found in object store bucket " . $this->getBucket());
+			}
+			return $fh;
 		});
 	}