logos-storage/logos-storage-nim
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim.git synced 2026-01-02 13:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

makes sure that whole encrypted content is returned when no encryption key is provided

Browse Source
This commit is contained in:
Marcin Czenko 2025-07-08 03:18:31 +02:00
parent 32f97a98f2
commit 1ab1bb5d1e
No known key found for this signature in database
GPG Key ID: 33DEA0C8E30937C0
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
codex/rest/api.nim
View File

@ -85,7 +85,7 @@ proc retrieveCid(
var lpStream: LPStream var lpStream: LPStream
var bytes = 0 var bytes = 0.NBytes
try: try:
without stream =? (await node.retrieve(cid, local)), error: without stream =? (await node.retrieve(cid, local)), error:
if error of BlockNotFoundError: if error of BlockNotFoundError:
@ -121,21 +121,24 @@ proc retrieveCid(
else: else:
resp.setHeader("Content-Disposition", "attachment") resp.setHeader("Content-Disposition", "attachment")
# For erasure-coded datasets, we need to return the _original_ length; i.e., # When the encryption key is provided, for erasure-coded datasets,
# we need to return the _original_ length; i.e.,
# the length of the non-erasure-coded dataset, as that's what we will be # the length of the non-erasure-coded dataset, as that's what we will be
# returning to the client. # returning to the client.
let contentLength = # When no encryption key is provided, we always return the full encrypted
# last block.
let datasetSize =
if manifest.protected: manifest.originalDatasetSize else: manifest.datasetSize if manifest.protected: manifest.originalDatasetSize else: manifest.datasetSize
let contentLength =
if not isNil(encryption):
datasetSize
else:
datasetSize + (manifest.blockSize - (datasetSize mod manifest.blockSize))
resp.setHeader("Content-Length", $(contentLength.int)) resp.setHeader("Content-Length", $(contentLength.int))
await resp.prepare(HttpResponseStreamType.Plain) await resp.prepare(HttpResponseStreamType.Plain)
let datasetSize = let lastBlockOffset = datasetSize.int mod manifest.blockSize.int
if manifest.protected:
manifest.originalDatasetSize.int
else:
manifest.datasetSize.int
let lastBlockOffset = datasetSize mod manifest.blockSize.int
var blockIndex = 0.uint32 var blockIndex = 0.uint32
while not stream.atEof: while not stream.atEof:
@ -147,7 +150,7 @@ proc retrieveCid(
if buff.len <= 0: if buff.len <= 0:
break break
bytes += buff.len bytes += buff.len.NBytes
echo "buff[", blockIndex, "]: ", byteutils.toHex(buff) echo "buff[", blockIndex, "]: ", byteutils.toHex(buff)
@ -161,7 +164,7 @@ proc retrieveCid(
blockIndex.inc() blockIndex.inc()
if bytes > datasetSize: if bytes > datasetSize and not isNil(encryption):
# yes, we needed the full last block for the purpose of decryption # yes, we needed the full last block for the purpose of decryption
# but now we only ever need to send the actual data to the user # but now we only ever need to send the actual data to the user
bytes = datasetSize bytes = datasetSize
@ -178,7 +181,7 @@ proc retrieveCid(
if resp.isPending(): if resp.isPending():
await resp.sendBody(exc.msg) await resp.sendBody(exc.msg)
finally: finally:
info "Sent bytes", cid = cid, bytes info "Sent bytes", cid = cid, bytes = bytes.int
if not lpStream.isNil: if not lpStream.isNil:
await lpStream.close() await lpStream.close()