Skip to content

Commit f96f7a9

Browse files
Fix non-ASCII Codex turn metadata headers
1 parent 63de499 commit f96f7a9

2 files changed

Lines changed: 19 additions & 1 deletion

File tree

‎src/codex/forward-transport-headers.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ export function rewriteTurnMetadataInstallationId(rawMetadata: string, chatgptAc
5050
if (typeof record.installation_id !== "string" || !record.installation_id.trim()) return rawMetadata;
5151
const nextId = deriveCodexAccountInstallationId(chatgptAccountId, record.installation_id);
5252
if (nextId === record.installation_id) return rawMetadata;
53-
return JSON.stringify({ ...record, installation_id: nextId });
53+
// Turn metadata is also sent as an HTTP header, so keep JSON ASCII-safe.
54+
return JSON.stringify({ ...record, installation_id: nextId })
55+
.replace(/[\u0080-\uffff]/g, char => `\\u${char.charCodeAt(0).toString(16).padStart(4, "0")}`);
5456
}
5557

5658
export function isolateCodexPoolAccountHeaders(headers: Headers, chatgptAccountId: string): void {

‎tests/codex-integration/codex-metadata-integrity.test.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,22 @@ describe("Codex metadata integrity", () => {
226226
isolateCodexPoolAccountHeaders(copyHeaders, accountA.chatgptAccountId);
227227
expect(copyHeaders.get("x-codex-installation-id")).toBe(idA);
228228
});
229+
test("pooled turn metadata preserves non-ASCII values in header-safe JSON", () => {
230+
const raw = String.raw`{"installation_id":"caller-installation","workspaces":["/tmp/\ubcd1\uc6d0/\ud83d\ude80"],"extra":{"note":"\ud55c\uae00 \ud83d\ude00"}}`;
231+
const incoming = new Headers({ "x-codex-turn-metadata": raw });
232+
const headers = headersForCodexAuthContext(incoming, poolAuthContext);
233+
const rewritten = headers.get("x-codex-turn-metadata")!;
234+
expect(rewritten).toMatch(/^[\x00-\x7f]*$/);
235+
expect(JSON.parse(rewritten)).toEqual({
236+
...JSON.parse(raw),
237+
installation_id: deriveCodexAccountInstallationId(accountA.chatgptAccountId, "caller-installation"),
238+
});
239+
const body = { client_metadata: { "x-codex-turn-metadata": raw } };
240+
expect((isolateCodexPoolClientMetadata(body, accountA.chatgptAccountId) as typeof body)
241+
.client_metadata["x-codex-turn-metadata"]).toBe(rewritten);
242+
isolateCodexPoolAccountHeaders(headers, accountA.chatgptAccountId);
243+
expect(headers.get("x-codex-turn-metadata")).toBe(rewritten);
244+
});
229245
test("Responses preserves caller User-Agent as a fallback in key and forward modes", async () => {
230246
for (const provider of [
231247
{

0 commit comments

Comments
 (0)