diff options
Diffstat (limited to 'zenserver/cidstore.cpp')
| -rw-r--r-- | zenserver/cidstore.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/zenserver/cidstore.cpp b/zenserver/cidstore.cpp index 5de347a17..bce4f1dfb 100644 --- a/zenserver/cidstore.cpp +++ b/zenserver/cidstore.cpp @@ -39,22 +39,21 @@ HttpCidService::HttpCidService(CidStore& Store) : m_CidStore(Store) case HttpVerb::kPut: { - IoBuffer Payload = ServerRequest.ReadPayload(); - CompressedBuffer Compressed = CompressedBuffer::FromCompressed(SharedBuffer(Payload)); - if (!Compressed) + IoBuffer Payload = ServerRequest.ReadPayload(); + IoHash RawHash; + uint64_t RawSize; + if (!CompressedBuffer::ValidateCompressedHeader(Payload, RawHash, RawSize)) { return ServerRequest.WriteResponse(HttpResponseCode::UnsupportedMediaType); } - IoHash PayloadHash = IoHash::FromBLAKE3(Compressed.GetRawHash()); - // URI hash must match content hash - if (PayloadHash != Hash) + if (RawHash != Hash) { return ServerRequest.WriteResponse(HttpResponseCode::BadRequest); } - m_CidStore.AddChunk(Compressed); + m_CidStore.AddChunk(Payload, RawHash); return ServerRequest.WriteResponse(HttpResponseCode::OK); } @@ -85,18 +84,17 @@ HttpCidService::HandleRequest(zen::HttpServerRequest& Request) case HttpVerb::kPut: case HttpVerb::kPost: { - IoBuffer Payload = Request.ReadPayload(); - CompressedBuffer Compressed = CompressedBuffer::FromCompressed(SharedBuffer(Payload)); - if (!Compressed) + IoBuffer Payload = Request.ReadPayload(); + IoHash RawHash; + uint64_t RawSize; + if (!CompressedBuffer::ValidateCompressedHeader(Payload, RawHash, RawSize)) { return Request.WriteResponse(HttpResponseCode::UnsupportedMediaType); } - IoHash PayloadHash = IoHash::FromBLAKE3(Compressed.GetRawHash()); - - ZEN_DEBUG("CID POST request for {} ({} bytes)", PayloadHash, Payload.Size()); + ZEN_DEBUG("CID POST request for {} ({} bytes)", RawHash, Payload.Size()); - auto InsertResult = m_CidStore.AddChunk(Compressed); + auto InsertResult = m_CidStore.AddChunk(Payload, RawHash); if (InsertResult.New) { |