fix(infra): cap ClawHub install-resolution JSON via shared bounded reader

Alix-007 · Alix-007 · commit eb81ab8ec105 · 2026-06-22T16:53:50.000+08:00
The install-resolution path (fetchClawHubSkillInstallResolution) still read
ClawHub JSON with an unbounded response.json(), the one ClawHub JSON reader
left uncapped by the prior hardening. Route it through the existing
parseClawHubJsonBody helper so every ClawHub JSON success/structured-block
body is bounded by the same 16 MiB cap and cancels the stream on overflow.
Pure reuse of the helper introduced in this PR (no new abstraction); adds a
regression test that an oversized install-resolution body is rejected and the
underlying stream is cancelled.
diff --git a/src/infra/clawhub.test.ts b/src/infra/clawhub.test.ts
@@ -854,6 +854,42 @@ describe("clawhub helpers", () => {
     expect(message.length).toBeLessThanOrEqual(500);
   });
 
+  it("bounds oversized ClawHub install-resolution JSON responses and cancels the stream", async () => {
+    const cancel = vi.fn();
+    const chunk = new Uint8Array(512 * 1024).fill("x".charCodeAt(0));
+    const overshootChunks = 34; // 34 * 512 KiB = 17 MiB > 16 MiB cap
+    let emitted = 0;
+    const body = new ReadableStream<Uint8Array>({
+      pull(controller) {
+        if (emitted >= overshootChunks) {
+          controller.close();
+          return;
+        }
+        emitted += 1;
+        controller.enqueue(chunk);
+      },
+      cancel() {
+        cancel();
+      },
+    });
+
+    await expect(
+      fetchClawHubSkillInstallResolution({
+        slug: "weather",
+        fetchImpl: async () =>
+          new Response(body, {
+            status: 200,
+            headers: { "content-type": "application/json" },
+          }),
+      }),
+    ).rejects.toThrow(
+      /ClawHub \/api\/v1\/skills\/weather\/install response exceeded 16777216 bytes/,
+    );
+    // Same bounded reader covers the sibling install-resolution JSON path so a
+    // hostile install response cannot exhaust memory either.
+    expect(cancel).toHaveBeenCalledTimes(1);
+  });
+
   it("annotates 429 errors with the reset hint but no sign-in hint when authenticated", async () => {
     process.env.OPENCLAW_CLAWHUB_TOKEN = "env-token-123";
     await expect(
diff --git a/src/infra/clawhub.ts b/src/infra/clawhub.ts
@@ -1018,11 +1018,7 @@ export async function fetchClawHubSkillInstallResolution(params: {
   if (!response.ok && !isStructuredBlock) {
     throw await buildClawHubError(response, url, hasToken);
   }
-  try {
-    return (await response.json()) as ClawHubSkillInstallResolutionResponse;
-  } catch (cause) {
-    throw new Error(`ClawHub ${url.pathname} returned malformed JSON`, { cause });
-  }
+  return parseClawHubJsonBody<ClawHubSkillInstallResolutionResponse>(response, url);
 }
 
 export async function fetchClawHubSkillVerification(params: {

Original file line number	Diff line number	Diff line change
`@@ -1018,11 +1018,7 @@ export async function fetchClawHubSkillInstallResolution(params: {`
`1018`	`1018`	`if (!response.ok && !isStructuredBlock) {`
`1019`	`1019`	`throw await buildClawHubError(response, url, hasToken);`
`1020`	`1020`	`}`
`1021`		`- try {`
`1022`		`- return (await response.json()) as ClawHubSkillInstallResolutionResponse;`
`1023`		`- } catch (cause) {`
`1024`		- throw new Error(`ClawHub ${url.pathname} returned malformed JSON`, { cause });
`1025`		`- }`
	`1021`	`+ return parseClawHubJsonBody<ClawHubSkillInstallResolutionResponse>(response, url);`
`1026`	`1022`	`}`
`1027`	`1023`
`1028`	`1024`	`export async function fetchClawHubSkillVerification(params: {`