fix(openwebui): redact failed chat diagnostics · openclaw/openclaw@979925c

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,9 @@ function escapeRegExp(value) {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`function redactDiagnosticText(text, extraSecrets = []) {`
`150`		`-let redacted = text;`
	`150`	`+let redacted = text`
	`151`	`+.replace(/Bearer\s+[A-Za-z0-9._~+/=-]+/giu, "Bearer <redacted>")`
	`152`	`+.replace(/openwebui-session=[^;"\s]+/giu, "openwebui-session=<redacted>");`
`151`	`153`	`for (const secret of [email, password, ...extraSecrets]) {`
`152`	`154`	`if (!secret) {`
`153`	`155`	`continue;`
`@@ -175,6 +177,13 @@ function cookieSecretValues(cookieHeader) {`
`175`	`177`	`.filter(Boolean);`
`176`	`178`	`}`
`177`	`179`
	`180`	`+function authDiagnosticSecretValues(authHeaders) {`
	`181`	`+const authorization = typeof authHeaders.authorization === "string" ? authHeaders.authorization : "";`
	`182`	`+const bearerToken = authorization.startsWith("Bearer ") ? authorization.slice("Bearer ".length) : "";`
	`183`	`+const cookie = typeof authHeaders.cookie === "string" ? authHeaders.cookie : "";`
	`184`	`+return [bearerToken, authorization, cookie, ...cookieSecretValues(cookie)].filter(Boolean);`
	`185`	`+}`
	`186`	`+`
`178`	`187`	`async function fetchSignin() {`
`179`	`188`	`return await withRequestTimeout(`
`180`	`189`	`"Open WebUI signin",`
`@@ -325,7 +334,11 @@ const chatJson = await fetchChatCompletion(authHeaders, targetModel, diagnosticS`
`325`	`334`	`const reply =`
`326`	`335`	`chatJson?.choices?.[0]?.message?.content ?? chatJson?.message?.content ?? chatJson?.content ?? "";`
`327`	`336`	`if (typeof reply !== "string" \|\| !reply.includes(expectedNonce)) {`
`328`		-throw new Error(`chat reply missing nonce: ${JSON.stringify(reply)}`);
	`337`	`+const diagnosticReply = redactDiagnosticText(JSON.stringify(reply), [`
	`338`	`+ ...diagnosticSecrets,`
	`339`	`+ ...authDiagnosticSecretValues(authHeaders),`
	`340`	`+]);`
	`341`	+throw new Error(`chat reply missing nonce: ${diagnosticReply}`);
`329`	`342`	`}`
`330`	`343`
`331`	`344`	`console.log(JSON.stringify({ ok: true, model: targetModel, reply }, null, 2));`

Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,9 @@ describe("scripts/e2e/openwebui-probe.mjs", () => {`
`258`	`258`	`if (request.url === "/api/v1/auths/signin") {`
`259`	`259`	`response.writeHead(200, {`
`260`	`260`	`"content-type": "application/json",`
`261`		`-"set-cookie": "openwebui-session=test; Path=/",`
	`261`	`+"set-cookie": "openwebui-session=chat=secret=cookie; Path=/",`
`262`	`262`	`});`
`263`		`-response.end(JSON.stringify({ token: "test-token" }));`
	`263`	`+response.end(JSON.stringify({ token: "chat-secret-token" }));`
`264`	`264`	`return;`
`265`	`265`	`}`
`266`	`266`	`if (request.url === "/api/models") {`
`@@ -329,9 +329,9 @@ describe("scripts/e2e/openwebui-probe.mjs", () => {`
`329`	`329`	`if (request.url === "/api/v1/auths/signin") {`
`330`	`330`	`response.writeHead(200, {`
`331`	`331`	`"content-type": "application/json",`
`332`		`-"set-cookie": "openwebui-session=test; Path=/",`
	`332`	`+"set-cookie": "openwebui-session=chat=secret=cookie; Path=/",`
`333`	`333`	`});`
`334`		`-response.end(JSON.stringify({ token: "test-token" }));`
	`334`	`+response.end(JSON.stringify({ token: "chat-secret-token" }));`
`335`	`335`	`return;`
`336`	`336`	`}`
`337`	`337`	`if (request.url === "/api/models") {`
`@@ -461,8 +461,16 @@ describe("scripts/e2e/openwebui-probe.mjs", () => {`
`461`	`461`	`return;`
`462`	`462`	`}`
`463`	`463`	`if (request.url === "/api/chat/completions") {`
	`464`	`+const authorization = request.headers.authorization ?? "";`
	`465`	`+const cookie = request.headers.cookie ?? "";`
`464`	`466`	`response.writeHead(200, { "content-type": "application/json" });`
`465`		`-response.end(JSON.stringify({ message: { content: "missing the marker" } }));`
	`467`	`+response.end(`
	`468`	`+JSON.stringify({`
	`469`	`+message: {`
	`470`	+content: `missing the marker with ${authorization} and ${cookie}`,
	`471`	`+},`
	`472`	`+}),`
	`473`	`+);`
`466`	`474`	`return;`
`467`	`475`	`}`
`468`	`476`	`response.writeHead(404).end();`
`@@ -473,7 +481,11 @@ describe("scripts/e2e/openwebui-probe.mjs", () => {`
`473`	`481`
`474`	`482`	`expect(result.error).toBeUndefined();`
`475`	`483`	`expect(result.status).not.toBe(0);`
`476`		`-expect(result.stderr).toContain('chat reply missing nonce: "missing the marker"');`
	`484`	`+expect(result.stderr).toContain("chat reply missing nonce");`
	`485`	`+expect(result.stderr).toContain("<redacted>");`
	`486`	`+expect(result.stderr).not.toContain("chat-secret-token");`
	`487`	`+expect(result.stderr).not.toContain("chat=secret=cookie");`
	`488`	`+expect(result.stderr).not.toContain("openwebui-session=chat");`
`477`	`489`	`} finally {`
`478`	`490`	`server.close();`
`479`	`491`	`}`

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

推荐订阅源

Recent Commits to openclaw:main