Skip to content

Commit 5fa0d0b

Browse files
authored
fix(clients): cancel oversized project icon responses (pingdotgg#29006)
1 parent 4494faa commit 5fa0d0b

2 files changed

Lines changed: 13 additions & 2 deletions

File tree

‎packages/client-runtime/src/projectFaviconCache.test.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,19 @@ describe("project favicon image loader", () => {
202202
await expect(load(url, signal())).rejects.toThrow("too large");
203203
expect(pulled).toBeLessThan(PROJECT_FAVICON_MAX_SOURCE_BYTES / chunk.byteLength + 3);
204204
expect(downscale).not.toHaveBeenCalled();
205+
let cancelled = false;
206+
const declaredStream = new ReadableStream<Uint8Array>({
207+
cancel() {
208+
cancelled = true;
209+
},
210+
});
205211
const declared = loader(
206-
new Response("x", {
212+
new Response(declaredStream, {
207213
headers: { "content-type": "image/png", "content-length": String(2 ** 40) },
208214
}),
209215
);
210216
await expect(declared.load(url, signal())).rejects.toThrow("too large");
217+
expect(cancelled).toBe(true);
218+
expect(declared.downscale).not.toHaveBeenCalled();
211219
});
212220
});

‎packages/client-runtime/src/projectFaviconCache.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ export interface ProjectFaviconStorage {
5050

5151
async function readBounded(response: Response, maxBytes: number) {
5252
const declared = Number(response.headers.get("content-length"));
53-
if (declared > maxBytes) throw new Error("Project icon is too large to decode.");
53+
if (declared > maxBytes) {
54+
await response.body?.cancel().catch(() => {});
55+
throw new Error("Project icon is too large to decode.");
56+
}
5457
if (!response.body) {
5558
const bytes = new Uint8Array<ArrayBuffer>(await response.arrayBuffer());
5659
if (bytes.byteLength > maxBytes) throw new Error("Project icon is too large to decode.");

0 commit comments

Comments
 (0)