Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packages/runtimeuse/src/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,15 @@ describe("redactSecrets", () => {
redactSecrets("my-secret-key", ["secret", "my-secret-key"]),
).toBe("my-[REDACTED]-key");
});

it("handles circular references without stack overflow", () => {
const obj: Record<string, unknown> = { key: "SECRET" };
obj.self = obj;
const result = redactSecrets(obj, ["SECRET"]) as Record<string, unknown>;
expect(result.key).toBe("[REDACTED]");
// Circular ref points to the redacted result, not the original
expect(result.self).toBe(result);
expect((result.self as Record<string, unknown>).key).toBe("[REDACTED]");
});
});
});
46 changes: 30 additions & 16 deletions packages/runtimeuse/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,41 @@ export async function sleep(ms: number) {
export function redactSecrets<T>(value: T, secrets: string[]): T {
if (secrets.length === 0) return value;

if (typeof value === "string") {
let redacted: string = value;
for (const secret of secrets) {
if (secret && redacted.includes(secret)) {
redacted = redacted.replaceAll(secret, "[REDACTED]");
const seen = new WeakMap<object, unknown>();

function redact<U>(val: U): U {
if (typeof val === "string") {
let redacted: string = val;
for (const secret of secrets) {
if (secret && redacted.includes(secret)) {
redacted = redacted.replaceAll(secret, "[REDACTED]");
}
}
return redacted as U;
}
return redacted as T;
}

if (Array.isArray(value)) {
return value.map((item) => redactSecrets(item, secrets)) as T;
}
if (val !== null && typeof val === "object") {
if (seen.has(val as object)) return seen.get(val as object) as U;

if (value !== null && typeof value === "object") {
const result: Record<string, unknown> = {};
for (const [key, val] of Object.entries(value)) {
result[key] = redactSecrets(val, secrets);
if (Array.isArray(val)) {
const result: unknown[] = [];
seen.set(val as object, result);
for (const item of val) {
result.push(redact(item));
}
return result as U;
}

const result: Record<string, unknown> = {};
seen.set(val as object, result);
for (const [key, v] of Object.entries(val)) {
result[key] = redact(v);
}
return result as U;
}
return result as T;

return val;
}

return value;
return redact(value);
}