Skip to content

Commit 67afdd5

Browse files
only21milclaudemaria-rcks
authored
fix(provider-core): redact compound credential keys in provider errors (pingdotgg#23313)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent 49d0142 commit 67afdd5

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

‎packages/provider-core/src/server/failure.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,20 @@ it("redacts credentials and URL secrets from provider failures", () => {
4141
assert.notInclude(failure.message, "sk-abcdefghijklmnop");
4242
});
4343

44+
it("redacts credentials whose key names end in a credential word", () => {
45+
const failure = makeProviderFailure({
46+
code: '{"refresh_token":"code value"}',
47+
message:
48+
'oauth refresh failed: client_secret=client-value refresh_token=refresh-value {"client_secret":"json-value"} clientSecret: camel-value X-Auth-Token: header-value max_tokens=4096',
49+
});
50+
51+
assert.equal(failure.code, '{"refresh_token":"[REDACTED]"}');
52+
assert.equal(
53+
failure.message,
54+
'oauth refresh failed: client_secret=[REDACTED] refresh_token=[REDACTED] {"client_secret":"[REDACTED]"} clientSecret: [REDACTED] X-Auth-Token: [REDACTED] max_tokens=4096',
55+
);
56+
});
57+
4458
it("does not split a surrogate pair at the truncation boundary", () => {
4559
const failure = makeProviderFailure({
4660
message: `${"a".repeat(MAX_PROVIDER_FAILURE_MESSAGE_LENGTH - 2)}🚀tail`,

‎packages/provider-core/src/server/failure.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@ function redactProviderFailureText(value: string): string {
194194
.replace(/\bhttps?:\/\/[^\s<>"']+/giu, redactUrl)
195195
.replace(/\b(Bearer|Basic)\s+[^\s,;]+/giu, "$1 [REDACTED]")
196196
.replace(
197-
/(["'](?:access[_-]?token|api[_-]?key|authorization|credential|password|secret|token)["']\s*:\s*["'])[^"']*(["'])/giu,
197+
/(["'][\w-]*(?:access[_-]?token|api[_-]?key|authorization|credential|password|secret|token)["']\s*:\s*["'])[^"']*(["'])/giu,
198198
"$1[REDACTED]$2",
199199
)
200200
.replace(
201-
/(\b(?:access[_-]?token|api[_-]?key|authorization|credential|password|secret|token)\b\s*[:=]\s*)(?:"[^"]*"|'[^']*'|[^\s,;]+)/giu,
201+
/((?<![\w-])[\w-]*(?:access[_-]?token|api[_-]?key|authorization|credential|password|secret|token)\b\s*[:=]\s*)(?:"[^"]*"|'[^']*'|[^\s,;]+)/giu,
202202
"$1[REDACTED]",
203203
)
204204
.replace(/\bsk-[A-Za-z0-9_-]{16,}\b/gu, "[REDACTED]")

0 commit comments

Comments
 (0)