admin/dragonsstash
1
0
Fork 0
mirror of https://github.com/xCyanGrizzly/DragonsStash.git synced 2026-09-21 13:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

diag(worker): log the reason when RAR ranged-listing silently returns null
continuous-integration/drone/push Build is passing
Details

Browse Source 
Several channels with allowsForwarding=true were still falling back to
download+reupload for specific RAR archives after the signature-bytes
fix, with zero log output to explain why — walkRarVolume and
readRarListingRanged return null silently on signature-detection
failure, the MAX_RAR_BLOCKS/MAX_RAR_HEADER_BYTES guards, and a
non-positive advance. Log each case so the next occurrence identifies
the actual cause instead of requiring another guess-and-redeploy cycle.
This commit is contained in:
admin
2026-08-13 12:10:50 +02:00
parent 73b2c33305
commit e123a5cc44
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
worker/src/archive/ranged/rar-ranged.ts
+17 -5
View File
@@ -69,11 +69,17 @@ export async function walkRarVolume(
let blocks = 0; let blocks = 0;
try { try {
while (pos < size) { while (pos < size) {
if (++blocks > MAX_RAR_BLOCKS) return null; if (++blocks > MAX_RAR_BLOCKS) {
rlog.warn({ fileId: part.fileId, fileName: part.fileName, blocks }, "RAR walk aborted — exceeded MAX_RAR_BLOCKS");
return null;
}
const chunkLen = Math.min(HEADER_CHUNK, size - pos); const chunkLen = Math.min(HEADER_CHUNK, size - pos);
let chunk = await read(part.fileId, pos, chunkLen, part.fileSize); let chunk = await read(part.fileId, pos, chunkLen, part.fileSize);
const ext = version === 5 ? parseRar5BlockExtent(chunk, 0) : parseRar4BlockExtent(chunk, 0); const ext = version === 5 ? parseRar5BlockExtent(chunk, 0) : parseRar4BlockExtent(chunk, 0);
if (ext.headerBytes > MAX_RAR_HEADER_BYTES) return null; if (ext.headerBytes > MAX_RAR_HEADER_BYTES) {
rlog.warn({ fileId: part.fileId, fileName: part.fileName, pos, headerBytes: ext.headerBytes }, "RAR walk aborted — headerBytes exceeded MAX_RAR_HEADER_BYTES");
return null;
}
// Ensure we have the full header bytes to harvest (long filenames). // Ensure we have the full header bytes to harvest (long filenames).
let headerBuf = chunk; let headerBuf = chunk;
if (ext.headerBytes > chunk.length) { if (ext.headerBytes > chunk.length) {
@@ -82,13 +88,16 @@ export async function walkRarVolume(
regions.push({ offset: pos, bytes: headerBuf.subarray(0, Math.min(ext.headerBytes, size - pos)) }); regions.push({ offset: pos, bytes: headerBuf.subarray(0, Math.min(ext.headerBytes, size - pos)) });
if (ext.isEnd) break; if (ext.isEnd) break;
const advance = ext.headerBytes + ext.dataSize; const advance = ext.headerBytes + ext.dataSize;
if (advance <= 0) return null; if (advance <= 0) {
rlog.warn({ fileId: part.fileId, fileName: part.fileName, pos, headerBytes: ext.headerBytes, dataSize: ext.dataSize }, "RAR walk aborted — non-positive advance");
return null;
}
if (pos + advance > size) break; // data clamped at the volume boundary (multipart continuation) if (pos + advance > size) break; // data clamped at the volume boundary (multipart continuation)
pos += advance; pos += advance;
} }
return regions; return regions;
} catch (err) { } catch (err) {
rlog.warn({ err, fileId: part.fileId }, "RAR volume walk failed"); rlog.warn({ err, fileId: part.fileId, fileName: part.fileName, pos }, "RAR volume walk failed");
return null; return null;
} }
} }
@@ -101,7 +110,10 @@ export async function readRarListingRanged(
for (const part of parts) { for (const part of parts) {
const head = await read(part.fileId, 0, 16, part.fileSize); const head = await read(part.fileId, 0, 16, part.fileSize);
const sig = detectRarSignature(head); const sig = detectRarSignature(head);
if (!sig) return null; if (!sig) {
rlog.warn({ fileId: part.fileId, fileName: part.fileName, head: head.toString("hex") }, "RAR signature not detected at offset 0");
return null;
}
const regions = await walkRarVolume(read, part, sig.version, sig.sigLen); const regions = await walkRarVolume(read, part, sig.version, sig.sigLen);
if (!regions) return null; if (!regions) return null;
// walkRarVolume starts at pos = sigLen and never harvests the signature // walkRarVolume starts at pos = sigLen and never harvests the signature