Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

fix: pre-landing review fixes

garrytanc53f2a367e65
diff --git a/src/core/secret-scan.ts b/src/core/secret-scan.ts
index 8b65961fff..9917b9f02e 100644
--- a/src/core/secret-scan.ts
+++ b/src/core/secret-scan.ts
@@ -207,7 +207,7 @@ const PROVIDER_KEYS_SINCE = '0.60.502.0';
const ESCAPE_BOUNDARY = '(?:\\\\(?:[bfnrt]|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{2}|U[0-9A-Fa-f]{8})|%[0-9A-Fa-f]{2}|=3[Dd]|(?:\\x1b|\\\\(?:u001[bB]|x1[bB]|033))\\[[0-9;]{0,32}m)';
const ESCAPE_IN_LINE_RE = /\\[bfnrtuxU0]|%[0-9A-Fa-f]{2}|=3[Dd]|\x1b\[/;
const JWT_VALUE = '(eyJ[A-Za-z0-9_-]{8,4096}\\.[A-Za-z0-9_-]{8,4096}\\.[A-Za-z0-9_-]{8,4096})';
-const BEARER_ANCHOR = '[Bb](?:earer|EARER)\\s+)((?:[A-Za-z0-9._~+/=-]|\\\\/){20,})';
+const BEARER_ANCHOR = '[Bb](?:earer|EARER)\\s+)((?=(?:[A-Za-z0-9._~+/=-]|\\\\/){20})[A-Za-z0-9._~+/=-]*(?:\\\\/[A-Za-z0-9._~+/=-]*)*)';
const BASIC_HEADER = 'authorization\\s{0,16}:\\s{0,16}basic\\s{1,16})([A-Za-z0-9+/=]{4,2048})(?![A-Za-z0-9+/=])';
const BASIC_BARE = 'basic\\s{1,16})([A-Za-z0-9+/=]{16,2048})(?![A-Za-z0-9+/=])';
diff --git a/test/secret-scan-encoded-boundary-8266.test.ts b/test/secret-scan-encoded-boundary-8266.test.ts
index f4908f5aa4..a1bfe2f899 100644
--- a/test/secret-scan-encoded-boundary-8266.test.ts
+++ b/test/secret-scan-encoded-boundary-8266.test.ts
@@ -41,6 +41,13 @@ describe('#8266 a bearer token with an escaped slash is redacted whole', () => {
expect(out).toBe('{"h":"Authorization: Bearer <REDACTED:bearer>","n":1}');
});
+ test('a very long bearer-class run does not stop the rule from matching the token after it', () => {
+ const token = 'EXAMPLEfakeTOKEN' + alnum(24);
+ const line = 'Authorization: Bearer ' + 'A'.repeat(1_000_000) + ' then Bearer ' + token;
+ expect(scanText(line).length).toBeGreaterThan(0);
+ expect(redactFindings(line).text.includes(token)).toBe(false);
+ });
+
test('the token still ends at an escaped newline or quote', () => {
const tok = alnum(40);
expect(redactFindings(`{"h":"Bearer ${tok}\\nnext"}`).text).toBe('{"h":"Bearer <REDACTED:bearer>\\nnext"}');