fix(scripts): ignore loose content length headers · openc...

Recent Commits to openclaw:main

vincentkoc · 2026-06-19 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,20 @@ function cancelReaderSoon(reader) {`
`11`	`11`	`.catch(() => {});`
`12`	`12`	`}`
`13`	`13`
	`14`	`+function parseContentLengthHeader(headers) {`
	`15`	`+const raw = headers.get("content-length");`
	`16`	`+if (!raw \|\| !/^\d+$/u.test(raw)) {`
	`17`	`+return undefined;`
	`18`	`+}`
	`19`	`+const parsed = Number(raw);`
	`20`	`+return Number.isSafeInteger(parsed) ? parsed : undefined;`
	`21`	`+}`
	`22`	`+`
`14`	`23`	`export async function readBoundedResponseText(response, label, byteLimit, timeoutPromise) {`
`15`		`-const contentLength = response.headers.get("content-length");`
`16`		`-if (contentLength) {`
`17`		`-const parsedLength = Number(contentLength);`
`18`		`-if (Number.isSafeInteger(parsedLength) && parsedLength > byteLimit) {`
`19`		`-await response.body?.cancel().catch(() => {});`
`20`		`-throw bodyTooLargeError(label, byteLimit);`
`21`		`-}`
	`24`	`+const contentLength = parseContentLengthHeader(response.headers);`
	`25`	`+if (contentLength !== undefined && contentLength > byteLimit) {`
	`26`	`+await response.body?.cancel().catch(() => {});`
	`27`	`+throw bodyTooLargeError(label, byteLimit);`
`22`	`28`	`}`
`23`	`29`	`if (!response.body) {`
`24`	`30`	`return "";`

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`import fs from "node:fs";`
`3`	`3`	`import os from "node:os";`
`4`	`4`	`import path from "node:path";`
	`5`	`+import { readBoundedResponseText } from "../bounded-response-text.mjs";`
`5`	`6`	`import { readPositiveIntEnv } from "../env-limits.mjs";`
`6`	`7`	`import {`
`7`	`8`	`readPluginInstallIndex,`
`@@ -53,47 +54,6 @@ async function withTimeout(label, timeoutMs, run) {`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`
`56`		`-function bodyTooLargeError(label, byteLimit) {`
`57`		-return Object.assign(new Error(`${label} response body exceeded ${byteLimit} bytes`), {
`58`		`-code: "ETOOBIG",`
`59`		`-});`
`60`		`-}`
`61`		`-`
`62`		`-async function readBoundedResponseText(response, label, byteLimit) {`
`63`		`-const contentLength = response.headers.get("content-length");`
`64`		`-if (contentLength) {`
`65`		`-const parsedLength = Number(contentLength);`
`66`		`-if (Number.isSafeInteger(parsedLength) && parsedLength > byteLimit) {`
`67`		`-await response.body?.cancel().catch(() => {});`
`68`		`-throw bodyTooLargeError(label, byteLimit);`
`69`		`-}`
`70`		`-}`
`71`		`-if (!response.body) {`
`72`		`-return "";`
`73`		`-}`
`74`		`-`
`75`		`-const reader = response.body.getReader();`
`76`		`-const decoder = new TextDecoder();`
`77`		`-let byteCount = 0;`
`78`		`-let text = "";`
`79`		`-try {`
`80`		`-while (true) {`
`81`		`-const { done, value } = await reader.read();`
`82`		`-if (done) {`
`83`		`-return text + decoder.decode();`
`84`		`-}`
`85`		`-byteCount += value.byteLength;`
`86`		`-if (byteCount > byteLimit) {`
`87`		`-await reader.cancel().catch(() => {});`
`88`		`-throw bodyTooLargeError(label, byteLimit);`
`89`		`-}`
`90`		`-text += decoder.decode(value, { stream: true });`
`91`		`-}`
`92`		`-} finally {`
`93`		`-reader.releaseLock();`
`94`		`-}`
`95`		`-}`
`96`		`-`
`97`	`57`	`function resolveHomePath(value) {`
`98`	`58`	`if (value === "~") {`
`99`	`59`	`return process.env.HOME;`

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,15 @@ function cancelReaderSoon(reader) {`
`13`	`13`	`.catch(() => undefined);`
`14`	`14`	`}`
`15`	`15`
	`16`	`+function parseContentLengthHeader(headers) {`
	`17`	`+const raw = headers.get("content-length");`
	`18`	`+if (!raw \|\| !/^\d+$/u.test(raw)) {`
	`19`	`+return undefined;`
	`20`	`+}`
	`21`	`+const parsed = Number(raw);`
	`22`	`+return Number.isSafeInteger(parsed) ? parsed : undefined;`
	`23`	`+}`
	`24`	`+`
`16`	`25`	`async function readResponseChunk(reader, label, signal, markCanceled) {`
`17`	`26`	`if (!signal) {`
`18`	`27`	`return await reader.read();`
`@@ -73,8 +82,8 @@ export async function readBoundedResponseText(response, label, maxBytes, options`
`73`	`82`	`const formatTooLargeMessage = options.formatTooLargeMessage ?? defaultTooLargeMessage;`
`74`	`83`	`const createTooLargeError = options.createTooLargeError ?? defaultTooLargeError;`
`75`	`84`	`const tooLargeError = () => createTooLargeError(formatTooLargeMessage(label, maxBytes));`
`76`		`-const contentLength = Number(response.headers.get("content-length") ?? "");`
`77`		`-if (Number.isSafeInteger(contentLength) && contentLength > maxBytes) {`
	`85`	`+const contentLength = parseContentLengthHeader(response.headers);`
	`86`	`+if (contentLength !== undefined && contentLength > maxBytes) {`
`78`	`87`	`await response.body?.cancel().catch(() => undefined);`
`79`	`88`	`throw tooLargeError();`
`80`	`89`	`}`

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,15 @@ function cancelReaderSoon(reader: ReadableStreamDefaultReader<Uint8Array>): void`
`17`	`17`	`.catch(() => undefined);`
`18`	`18`	`}`
`19`	`19`
	`20`	`+function parseContentLengthHeader(headers: Headers): number \| undefined {`
	`21`	`+const raw = headers.get("content-length");`
	`22`	`+if (!raw \|\| !/^\d+$/u.test(raw)) {`
	`23`	`+return undefined;`
	`24`	`+}`
	`25`	`+const parsed = Number(raw);`
	`26`	`+return Number.isSafeInteger(parsed) ? parsed : undefined;`
	`27`	`+}`
	`28`	`+`
`20`	`29`	`async function readResponseChunk(`
`21`	`30`	`reader: ReadableStreamDefaultReader<Uint8Array>,`
`22`	`31`	`label: string,`
`@@ -99,8 +108,8 @@ export async function readBoundedResponseText(`
`99`	`108`	`const formatTooLargeMessage = options.formatTooLargeMessage ?? defaultTooLargeMessage;`
`100`	`109`	`const createTooLargeError = options.createTooLargeError ?? defaultTooLargeError;`
`101`	`110`	`const tooLargeError = () => createTooLargeError(formatTooLargeMessage(label, maxBytes));`
`102`		`-const contentLength = Number(response.headers.get("content-length") ?? "");`
`103`		`-if (Number.isSafeInteger(contentLength) && contentLength > maxBytes) {`
	`111`	`+const contentLength = parseContentLengthHeader(response.headers);`
	`112`	`+if (contentLength !== undefined && contentLength > maxBytes) {`
`104`	`113`	`await response.body?.cancel().catch(() => undefined);`
`105`	`114`	`throw tooLargeError();`
`106`	`115`	`}`

Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,33 @@ describe("scripts/e2e/lib/bounded-response-text.mjs", () => {`
`82`	`82`	`});`
`83`	`83`	`expect(canceled).toBe(true);`
`84`	`84`	`});`
	`85`	`+`
	`86`	`+it("streams responses with non-decimal content-length values", async () => {`
	`87`	`+let readStarted = false;`
	`88`	`+let canceled = false;`
	`89`	`+const response = {`
	`90`	`+headers: new Headers({ "content-length": "1e3" }),`
	`91`	`+body: {`
	`92`	`+getReader() {`
	`93`	`+return {`
	`94`	`+async read() {`
	`95`	`+readStarted = true;`
	`96`	`+return { done: false, value: new Uint8Array(17) };`
	`97`	`+},`
	`98`	`+async cancel() {`
	`99`	`+canceled = true;`
	`100`	`+},`
	`101`	`+releaseLock() {},`
	`102`	`+};`
	`103`	`+},`
	`104`	`+},`
	`105`	`+};`
	`106`	`+`
	`107`	`+await expect(readBoundedResponseText(response, "probe", 16)).rejects.toMatchObject({`
	`108`	`+code: "ETOOBIG",`
	`109`	`+message: "probe response body exceeded 16 bytes",`
	`110`	`+});`
	`111`	`+expect(readStarted).toBe(true);`
	`112`	`+expect(canceled).toBe(true);`
	`113`	`+});`
`85`	`114`	`});`

Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,36 @@ describe("scripts bounded response reader", () => {`
`66`	`66`	`expect(canceled).toBe(true);`
`67`	`67`	`},`
`68`	`68`	`);`
	`69`	`+`
	`70`	`+it.each(helpers)(`
	`71`	`+"streams %s responses with non-decimal content-length values",`
	`72`	`+async (_name, read) => {`
	`73`	`+let readStarted = false;`
	`74`	`+let canceled = false;`
	`75`	`+const response = {`
	`76`	`+headers: new Headers({ "content-length": "1e3" }),`
	`77`	`+body: {`
	`78`	`+getReader() {`
	`79`	`+return {`
	`80`	`+async read() {`
	`81`	`+readStarted = true;`
	`82`	`+return { done: false, value: new Uint8Array(17) };`
	`83`	`+},`
	`84`	`+async cancel() {`
	`85`	`+canceled = true;`
	`86`	`+},`
	`87`	`+releaseLock() {},`
	`88`	`+};`
	`89`	`+},`
	`90`	`+},`
	`91`	`+} as unknown as Response;`
	`92`	`+`
	`93`	`+await expect(read(response, "probe", 16)).rejects.toThrow(`
	`94`	`+"probe response body exceeded 16 bytes",`
	`95`	`+);`
	`96`	`+`
	`97`	`+expect(readStarted).toBe(true);`
	`98`	`+expect(canceled).toBe(true);`
	`99`	`+},`
	`100`	`+);`
`69`	`101`	`});`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main