Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(media-server): bound ranged readback bodies and retry short ranges

Richie McIlroy087fa98ec06c
diff --git a/apps/media-server/src/__tests__/lib/recording-verification.integration.test.ts b/apps/media-server/src/__tests__/lib/recording-verification.integration.test.ts
index 5a29ced54..cdac180b2 100644
--- a/apps/media-server/src/__tests__/lib/recording-verification.integration.test.ts
+++ b/apps/media-server/src/__tests__/lib/recording-verification.integration.test.ts
@@ -2803,6 +2803,49 @@ describe("ranged remote byte verification", () => {
}
});
+ test("rejects an oversized range body without buffering it whole", async () => {
+ const { server } = rangedServer((start, end) =>
+ start === 1024 * 1024
+ ? new Response(payload, {
+ status: 206,
+ headers: {
+ ETag: identity,
+ "Content-Range": `bytes ${start}-${end}/${payload.length}`,
+ },
+ })
+ : null,
+ );
+ try {
+ await expect(verify(server.port)).rejects.toThrow(
+ "Recording object size changed during byte verification",
+ );
+ } finally {
+ await server.stop(true);
+ }
+ });
+
+ test("retries a range whose body ends early", async () => {
+ const { server, ranges } = rangedServer((start, end, attempt) =>
+ start === 2 * 1024 * 1024 && attempt === 1
+ ? new Response(payload.slice(start, start + 1000), {
+ status: 206,
+ headers: {
+ ETag: identity,
+ "Content-Range": `bytes ${start}-${end}/${payload.length}`,
+ },
+ })
+ : null,
+ );
+ try {
+ expect((await verify(server.port)).remoteSha256).toBe(sha256);
+ expect(
+ ranges.filter((range) => range.startsWith(`bytes=${2 * 1024 * 1024}-`)),
+ ).toHaveLength(2);
+ } finally {
+ await server.stop(true);
+ }
+ });
+
test("falls back to one sequential read when storage ignores ranges", async () => {
const { server } = rangedServer(
() => new Response(payload, { headers: { ETag: identity } }),
diff --git a/apps/media-server/src/lib/recording-verification.ts b/apps/media-server/src/lib/recording-verification.ts
index 97e472a8e..7941d5fec 100644
--- a/apps/media-server/src/lib/recording-verification.ts
+++ b/apps/media-server/src/lib/recording-verification.ts
@@ -1751,19 +1751,30 @@ async function hashRemoteRecordingRanged(
throw new Error(
"Recording byte resume range does not match the verified object",
);
- let bytes: Uint8Array;
+ const expected = end - start + 1;
+ const bytes = new Uint8Array(expected);
+ let received = 0;
try {
- bytes = new Uint8Array(await response.arrayBuffer());
- } catch {
+ for await (const chunk of response.body) {
+ if (received + chunk.byteLength > expected)
+ throw new RecordingVerificationError(
+ "Recording object size changed during byte verification",
+ false,
+ );
+ bytes.set(chunk, received);
+ received += chunk.byteLength;
+ }
+ } catch (error) {
+ if (error instanceof RecordingVerificationError) throw error;
throw new RecordingVerificationError(
"Recording bytes could not be read completely",
true,
);
}
- if (bytes.byteLength !== end - start + 1)
+ if (received !== expected)
throw new RecordingVerificationError(
- "Recording object size changed during byte verification",
- false,
+ "Recording bytes could not be read completely",
+ true,
);
return bytes;
} catch (error) {