Moved AcceptType Handling From ProjectStore To HttpProjectStore

1 files changed, 32 insertions, 2 deletions

diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp
index 47748dd90..f9a13220a 100644
--- a/src/zenserver/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/projectstore/httpprojectstore.cpp
@@ -8,6 +8,7 @@
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinarypackage.h>
 #include <zencore/compactbinaryutil.h>
+#include <zencore/compactbinaryvalidation.h>
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
@@ -885,10 +886,39 @@ HttpProjectService::HandleChunkByCidRequest(HttpRouterRequest& Req)
 		case HttpVerb::kGet:
 			{
 				IoBuffer								 Value;
-				std::pair<HttpResponseCode, std::string> Result =
-					m_ProjectStore->GetChunk(ProjectId, OplogId, Cid, AcceptType, Value, nullptr);
+				std::pair<HttpResponseCode, std::string> Result = m_ProjectStore->GetChunk(ProjectId, OplogId, Cid, Value, nullptr);
 				if (Result.first == HttpResponseCode::OK)
 				{
+					if (AcceptType == ZenContentType::kUnknownContentType || AcceptType == ZenContentType::kBinary ||
+						AcceptType == ZenContentType::kJSON || AcceptType == ZenContentType::kYAML ||
+						AcceptType == ZenContentType::kCbObject)
+					{
+						CompressedBuffer Compressed			= CompressedBuffer::FromCompressedNoValidate(std::move(Value));
+						IoBuffer		 DecompressedBuffer = Compressed.Decompress().AsIoBuffer();
+
+						if (AcceptType == ZenContentType::kJSON || AcceptType == ZenContentType::kYAML ||
+							AcceptType == ZenContentType::kCbObject)
+						{
+							CbValidateError CbErr = ValidateCompactBinary(DecompressedBuffer.GetView(), CbValidateMode::Default);
+							if (!!CbErr)
+							{
+								m_ProjectStats.BadRequestCount++;
+								ZEN_DEBUG("chunk - '{}/{}/{}' WRONGTYPE", ProjectId, OplogId, Cid);
+								return HttpReq.WriteResponse(HttpResponseCode::NotAcceptable,
+															 HttpContentType::kText,
+															 fmt::format("chunk - '{}' WRONGTYPE", Cid));
+							}
+
+							m_ProjectStats.ChunkHitCount++;
+							CbObject ContainerObject = LoadCompactBinaryObject(DecompressedBuffer);
+							return HttpReq.WriteResponse(HttpResponseCode::OK, ContainerObject);
+						}
+						else
+						{
+							Value = DecompressedBuffer;
+							Value.SetContentType(ZenContentType::kBinary);
+						}
+					}
 					m_ProjectStats.ChunkHitCount++;
 					return HttpReq.WriteResponse(HttpResponseCode::OK, Value.GetContentType(), Value);
 				}