HTTP range responses (RFC 7233) - httpobjectstore (#928)

- Improvement: HTTP range responses (RFC 7233) are now fully compliant across the object store and build store
  - 206 Partial Content responses now include a `Content-Range` header; previously absent for single-range requests, which broke `HttpClient::GetRanges()`
  - 416 Range Not Satisfiable responses now include `Content-Range: bytes */N` as required by RFC 7233
  - Out-of-bounds range requests return 416 Range Not Satisfiable (was 400 Bad Request)
  - Single-byte ranges (`bytes=N-N`) are now correctly accepted (were previously rejected)
  - Range byte positions widened from 32-bit to 64-bit; RFC 7233 imposes no size limit on byte range values
  - Build store binary GET requests with a Range header now return 206 Partial Content with `Content-Range` (previously returned 200 OK without it)

1 files changed, 19 insertions, 31 deletions

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