Added CloudCacheSession::GetInlineBlob to properly get CacheValues (#159)

* Added CloudCacheSession::GetInlineBlob to properly get CacheValues from Horde
Issue #UE-162151
* validate uncompressed binary from Horde "application/x-jupiter-inline" response

1 files changed, 24 insertions, 4 deletions

diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index 7f5759e47..e92dde815 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -442,15 +442,35 @@ namespace detail {
 				if (!Result.Error)
 				{
 					std::string_view	   BlobStoreNamespace = GetActualBlobStoreNamespace(Session, Namespace);
-					const CloudCacheResult BlobResult		  = Session.GetCompressedBlob(BlobStoreNamespace, IoHash::Zero);
-					Payload									  = BlobResult.Response;
+					IoHash				   PayloadHash;
+					const CloudCacheResult BlobResult =
+						Session.GetInlineBlob(BlobStoreNamespace, Request.Key.Bucket, Request.Key.Hash, PayloadHash);
+					Payload = BlobResult.Response;
 
 					AppendResult(BlobResult, Result);
 
 					m_Status.SetFromErrorCode(BlobResult.ErrorCode, BlobResult.Reason);
-					if (Payload && IsCompressedBinary(Payload.GetContentType()))
+					if (Payload)
 					{
-						Compressed = CompressedBuffer::FromCompressed(SharedBuffer(Payload));
+						if (IsCompressedBinary(Payload.GetContentType()))
+						{
+							Compressed = CompressedBuffer::FromCompressed(SharedBuffer(Payload));
+						}
+						else
+						{
+							Compressed	   = CompressedBuffer::Compress(SharedBuffer(Payload));
+							IoHash RawHash = IoHash::FromBLAKE3(Compressed.GetRawHash());
+							if (RawHash != PayloadHash)
+							{
+								ZEN_WARN("Horde request for inline payload of {}/{}/{} has hash {}, expected hash {} from header",
+										 Namespace,
+										 Request.Key.Bucket,
+										 Request.Key.Hash.ToHexString(),
+										 RawHash.ToHexString(),
+										 PayloadHash.ToHexString());
+								Compressed.Reset();
+							}
+						}
 					}
 				}