Merge branch 'main' into sb/memory-cid-storesb/memory-cid-store

2 files changed, 78 insertions, 116 deletions

diff --git a/src/zenserver/storage/buildstore/httpbuildstore.cpp b/src/zenserver/storage/buildstore/httpbuildstore.cpp
index bbbb0c37b..f935e2c6b 100644
--- a/src/zenserver/storage/buildstore/httpbuildstore.cpp
+++ b/src/zenserver/storage/buildstore/httpbuildstore.cpp
@@ -162,96 +162,81 @@ HttpBuildStoreService::GetBlobRequest(HttpRouterRequest& Req)
 										   fmt::format("Invalid blob hash '{}'", Hash));
 	}
 
-	std::vector<std::pair<uint64_t, uint64_t>> OffsetAndLengthPairs;
+	m_BuildStoreStats.BlobReadCount++;
+	IoBuffer Blob = m_BuildStore.GetBlob(BlobHash);
+	if (!Blob)
+	{
+		return ServerRequest.WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, fmt::format("Blob {} not found", Hash));
+	}
+	m_BuildStoreStats.BlobHitCount++;
+
 	if (ServerRequest.RequestVerb() == HttpVerb::kPost)
 	{
+		if (ServerRequest.AcceptContentType() != HttpContentType::kCbPackage)
+		{
+			m_BuildStoreStats.BadRequestCount++;
+			return ServerRequest.WriteResponse(HttpResponseCode::BadRequest,
+											   HttpContentType::kText,
+											   fmt::format("Accept type '{}' is not supported for blob {}, expected '{}'",
+														   ToString(ServerRequest.AcceptContentType()),
+														   Hash,
+														   ToString(HttpContentType::kCbPackage)));
+		}
+
 		CbObject RangePayload = ServerRequest.ReadPayloadObject();
-		if (RangePayload)
+		if (!RangePayload)
 		{
-			CbArrayView RangesArray = RangePayload["ranges"sv].AsArrayView();
-			OffsetAndLengthPairs.reserve(RangesArray.Num());
-			for (CbFieldView FieldView : RangesArray)
-			{
-				CbObjectView RangeView	 = FieldView.AsObjectView();
-				uint64_t	 RangeOffset = RangeView["offset"sv].AsUInt64();
-				uint64_t	 RangeLength = RangeView["length"sv].AsUInt64();
-				OffsetAndLengthPairs.push_back(std::make_pair(RangeOffset, RangeLength));
-			}
-			if (OffsetAndLengthPairs.size() > MaxRangeCountPerRequestSupported)
-			{
-				return ServerRequest.WriteResponse(HttpResponseCode::BadRequest,
-												   HttpContentType::kText,
-												   fmt::format("Number of ranges ({}) for blob request exceeds maximum range count {}",
-															   OffsetAndLengthPairs.size(),
-															   MaxRangeCountPerRequestSupported));
-			}
+			m_BuildStoreStats.BadRequestCount++;
+			return ServerRequest.WriteResponse(HttpResponseCode::BadRequest,
+											   HttpContentType::kText,
+											   fmt::format("Missing payload for range request on blob {}", BlobHash));
 		}
-		if (OffsetAndLengthPairs.empty())
+
+		CbArrayView	   RangesArray = RangePayload["ranges"sv].AsArrayView();
+		const uint64_t RangeCount  = RangesArray.Num();
+		if (RangeCount == 0)
 		{
 			m_BuildStoreStats.BadRequestCount++;
 			return ServerRequest.WriteResponse(HttpResponseCode::BadRequest,
 											   HttpContentType::kText,
-											   "Fetching blob without ranges must be done with the GET verb");
+											   "POST request must include a non-empty 'ranges' array");
 		}
-	}
-	else
-	{
-		HttpRanges Ranges;
-		bool	   HasRange = ServerRequest.TryGetRanges(Ranges);
-		if (HasRange)
+		if (RangeCount > MaxRangeCountPerRequestSupported)
 		{
-			if (Ranges.size() > 1)
-			{
-				// Only a single http range is supported, we have limited support for http multirange responses
-				m_BuildStoreStats.BadRequestCount++;
-				return ServerRequest.WriteResponse(HttpResponseCode::BadRequest,
-												   HttpContentType::kText,
-												   fmt::format("Multiple ranges in blob request is only supported for {} accept type",
-															   ToString(HttpContentType::kCbPackage)));
-			}
-			const HttpRange& FirstRange = Ranges.front();
-			OffsetAndLengthPairs.push_back(std::make_pair<uint64_t, uint64_t>(FirstRange.Start, FirstRange.End - FirstRange.Start + 1));
+			m_BuildStoreStats.BadRequestCount++;
+			return ServerRequest.WriteResponse(
+				HttpResponseCode::BadRequest,
+				HttpContentType::kText,
+				fmt::format("Range count {} exceeds maximum of {}", RangeCount, MaxRangeCountPerRequestSupported));
 		}
-	}
-
-	m_BuildStoreStats.BlobReadCount++;
-	IoBuffer Blob = m_BuildStore.GetBlob(BlobHash);
-	if (!Blob)
-	{
-		return ServerRequest.WriteResponse(HttpResponseCode::NotFound,
-										   HttpContentType::kText,
-										   fmt::format("Blob with hash '{}' could not be found", Hash));
-	}
-	m_BuildStoreStats.BlobHitCount++;
 
-	if (OffsetAndLengthPairs.empty())
-	{
-		return ServerRequest.WriteResponse(HttpResponseCode::OK, Blob.GetContentType(), Blob);
-	}
+		const uint64_t		  BlobSize = Blob.GetSize();
+		std::vector<IoBuffer> RangeBuffers;
+		RangeBuffers.reserve(RangeCount);
 
-	if (ServerRequest.AcceptContentType() == HttpContentType::kCbPackage)
-	{
-		const uint64_t BlobSize = Blob.GetSize();
+		CbPackage	   ResponsePackage;
+		CbObjectWriter Writer;
 
-		CbPackage			  ResponsePackage;
-		std::vector<IoBuffer> RangeBuffers;
-		CbObjectWriter		  Writer;
 		Writer.BeginArray("ranges"sv);
-		for (const std::pair<uint64_t, uint64_t>& Range : OffsetAndLengthPairs)
+		for (CbFieldView FieldView : RangesArray)
 		{
-			const uint64_t MaxBlobSize = Range.first < BlobSize ? BlobSize - Range.first : 0;
-			const uint64_t RangeSize   = Min(Range.second, MaxBlobSize);
+			CbObjectView RangeView	 = FieldView.AsObjectView();
+			uint64_t	 RangeOffset = RangeView["offset"sv].AsUInt64();
+			uint64_t	 RangeLength = RangeView["length"sv].AsUInt64();
+
+			const uint64_t MaxBlobSize = RangeOffset < BlobSize ? BlobSize - RangeOffset : 0;
+			const uint64_t RangeSize   = Min(RangeLength, MaxBlobSize);
 			Writer.BeginObject();
 			{
-				if (Range.first + RangeSize <= BlobSize)
+				if (RangeOffset + RangeSize <= BlobSize)
 				{
-					RangeBuffers.push_back(IoBuffer(Blob, Range.first, RangeSize));
-					Writer.AddInteger("offset"sv, Range.first);
+					RangeBuffers.push_back(IoBuffer(Blob, RangeOffset, RangeSize));
+					Writer.AddInteger("offset"sv, RangeOffset);
 					Writer.AddInteger("length"sv, RangeSize);
 				}
 				else
 				{
-					Writer.AddInteger("offset"sv, Range.first);
+					Writer.AddInteger("offset"sv, RangeOffset);
 					Writer.AddInteger("length"sv, 0);
 				}
 			}
@@ -259,7 +244,7 @@ HttpBuildStoreService::GetBlobRequest(HttpRouterRequest& Req)
 		}
 		Writer.EndArray();
 
-		CompositeBuffer Ranges(RangeBuffers);
+		CompositeBuffer Ranges(std::move(RangeBuffers));
 		CbAttachment	PayloadAttachment(std::move(Ranges), BlobHash);
 		Writer.AddAttachment("payload", PayloadAttachment);
 
@@ -269,32 +254,21 @@ HttpBuildStoreService::GetBlobRequest(HttpRouterRequest& Req)
 		ResponsePackage.SetObject(HeaderObject);
 
 		CompositeBuffer RpcResponseBuffer = FormatPackageMessageBuffer(ResponsePackage);
-		uint64_t		ResponseSize	  = RpcResponseBuffer.GetSize();
-		ZEN_UNUSED(ResponseSize);
 		return ServerRequest.WriteResponse(HttpResponseCode::OK, HttpContentType::kCbPackage, RpcResponseBuffer);
 	}
 	else
 	{
-		if (OffsetAndLengthPairs.size() != 1)
+		HttpRanges RequestedRangeHeader;
+		bool	   HasRange = ServerRequest.TryGetRanges(RequestedRangeHeader);
+		if (HasRange)
 		{
-			// Only a single http range is supported, we have limited support for http multirange responses
-			m_BuildStoreStats.BadRequestCount++;
-			return ServerRequest.WriteResponse(
-				HttpResponseCode::BadRequest,
-				HttpContentType::kText,
-				fmt::format("Multiple ranges in blob request is only supported for {} accept type", ToString(HttpContentType::kCbPackage)));
+			// Standard HTTP GET with Range header: framework handles 206, Content-Range, and 416 on OOB.
+			return ServerRequest.WriteResponse(HttpContentType::kBinary, Blob, RequestedRangeHeader);
 		}
-
-		const std::pair<uint64_t, uint64_t>& OffsetAndLength = OffsetAndLengthPairs.front();
-		const uint64_t						 BlobSize		 = Blob.GetSize();
-		const uint64_t						 MaxBlobSize	 = OffsetAndLength.first < BlobSize ? BlobSize - OffsetAndLength.first : 0;
-		const uint64_t						 RangeSize		 = Min(OffsetAndLength.second, MaxBlobSize);
-		if (OffsetAndLength.first + RangeSize > BlobSize)
+		else
 		{
-			return ServerRequest.WriteResponse(HttpResponseCode::NoContent);
+			return ServerRequest.WriteResponse(HttpResponseCode::OK, Blob.GetContentType(), Blob);
 		}
-		Blob = IoBuffer(Blob, OffsetAndLength.first, RangeSize);
-		return ServerRequest.WriteResponse(HttpResponseCode::OK, ZenContentType::kBinary, Blob);
 	}
 }
 
diff --git a/src/zenserver/storage/objectstore/objectstore.cpp b/src/zenserver/storage/objectstore/objectstore.cpp
index e34cd0445..bab9df06d 100644
--- a/src/zenserver/storage/objectstore/objectstore.cpp
+++ b/src/zenserver/storage/objectstore/objectstore.cpp
@@ -637,11 +637,7 @@ HttpObjectStoreService::GetObject(HttpRouterRequest& Request, const std::string_
 	}
 
 	HttpRanges Ranges;
-	if (Request.ServerRequest().TryGetRanges(Ranges); Ranges.size() > 1)
-	{
-		// Multi-range is not supported, fall back to full response per RFC 7233
-		Ranges.clear();
-	}
+	Request.ServerRequest().TryGetRanges(Ranges);
 
 	FileContents File;
 	{
@@ -665,42 +661,34 @@ HttpObjectStoreService::GetObject(HttpRouterRequest& Request, const std::string_
 
 	if (Ranges.empty())
 	{
-		const uint64_t TotalServed = m_TotalBytesServed.fetch_add(FileBuf.Size()) + FileBuf.Size();
-
+		const uint64_t TotalServed = m_TotalBytesServed.fetch_add(FileBuf.GetSize()) + FileBuf.GetSize();
 		ZEN_LOG_DEBUG(LogObj,
 					  "GET - '{}/{}' ({}) [OK] (Served: {})",
 					  BucketName,
 					  RelativeBucketPath,
-					  NiceBytes(FileBuf.Size()),
+					  NiceBytes(FileBuf.GetSize()),
 					  NiceBytes(TotalServed));
-
-		Request.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, FileBuf);
 	}
-	else
+	else if (Ranges.size() == 1)
 	{
-		const auto	   Range	   = Ranges[0];
-		const uint64_t RangeSize   = 1 + (Range.End - Range.Start);
-		const uint64_t TotalServed = m_TotalBytesServed.fetch_add(RangeSize) + RangeSize;
-
-		ZEN_LOG_DEBUG(LogObj,
-					  "GET - '{}/{}' (Range: {}-{}) ({}/{}) [OK] (Served: {})",
-					  BucketName,
-					  RelativeBucketPath,
-					  Range.Start,
-					  Range.End,
-					  NiceBytes(RangeSize),
-					  NiceBytes(FileBuf.Size()),
-					  NiceBytes(TotalServed));
-
-		MemoryView RangeView = FileBuf.GetView().Mid(Range.Start, RangeSize);
-		if (RangeView.GetSize() != RangeSize)
+		const uint64_t TotalSize = FileBuf.GetSize();
+		const uint64_t RangeEnd	 = (Ranges[0].End != ~uint64_t(0)) ? Ranges[0].End : TotalSize - 1;
+		if (RangeEnd < TotalSize && Ranges[0].Start <= RangeEnd)
 		{
-			return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
+			const uint64_t RangeSize   = 1 + (RangeEnd - Ranges[0].Start);
+			const uint64_t TotalServed = m_TotalBytesServed.fetch_add(RangeSize) + RangeSize;
+			ZEN_LOG_DEBUG(LogObj,
+						  "GET - '{}/{}' (Range: {}-{}) ({}/{}) [OK] (Served: {})",
+						  BucketName,
+						  RelativeBucketPath,
+						  Ranges[0].Start,
+						  RangeEnd,
+						  NiceBytes(RangeSize),
+						  NiceBytes(TotalSize),
+						  NiceBytes(TotalServed));
 		}
-
-		IoBuffer RangeBuf = IoBuffer(IoBuffer::Wrap, RangeView.GetData(), RangeView.GetSize());
-		Request.ServerRequest().WriteResponse(HttpResponseCode::PartialContent, HttpContentType::kBinary, RangeBuf);
 	}
+	Request.ServerRequest().WriteResponse(HttpContentType::kBinary, FileBuf, Ranges);
 }
 
 void