惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

博客园 - 三生石上(FineUI控件)
S
SegmentFault 最新的问题
Jina AI
Jina AI
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
IT之家
IT之家
美团技术团队
V
Visual Studio Blog
人人都是产品经理
人人都是产品经理
博客园 - 叶小钗
有赞技术团队
有赞技术团队
GbyAI
GbyAI
宝玉的分享
宝玉的分享
腾讯CDC
M
MIT News - Artificial intelligence
博客园 - 【当耐特】
Google DeepMind News
Google DeepMind News
月光博客
月光博客
MyScale Blog
MyScale Blog
Last Week in AI
Last Week in AI
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
博客园 - 司徒正美
Recent Announcements
Recent Announcements
MongoDB | Blog
MongoDB | Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(logging): preserve env placeholders during redaction ...
osolmaz · 2026-05-27 · via Recent Commits to openclaw:main

@@ -39,11 +39,21 @@ const STRUCTURED_SECRET_ENV_FIELD_RE = new RegExp(

3939

"i",

4040

);

414142+

const ENV_ASSIGNMENT_REDACT_PATTERN = String.raw`/\b[A-Z0-9_]*(?:KEY|TOKEN|SECRET|PASSWORD|PASSWD|${PAYMENT_CREDENTIAL_ENV_KEYS})\b\s*[=:]\s*(["']?)([^\s"'\\]+)\1/g`;

43+

const ESCAPED_ENV_ASSIGNMENT_REDACT_PATTERN = String.raw`/\b[A-Z0-9_]*(?:KEY|TOKEN|SECRET|PASSWORD|PASSWD|${PAYMENT_CREDENTIAL_ENV_KEYS})\b\s*[=:]\s*\\+(["'])([^\s"'\\]+)\\+\1/g`;

44+

const STANDALONE_ASSIGNMENT_REDACT_PATTERN = String.raw`(^|[\s,;])(?:access_token|refresh_token|auth[-_]?token|api[-_]?key|client[-_]?secret|app[-_]?secret|token|secret|password|passwd|${PAYMENT_CREDENTIAL_QUERY_KEYS})=([^\s&#]+)`;

45+

const SHELL_REFERENCE_PRESERVING_PATTERN_SOURCES = new Set([

46+

ENV_ASSIGNMENT_REDACT_PATTERN,

47+

ESCAPED_ENV_ASSIGNMENT_REDACT_PATTERN,

48+

STANDALONE_ASSIGNMENT_REDACT_PATTERN,

49+

]);

50+

const shellReferencePreservingPatterns = new WeakSet<RegExp>();

51+4252

const DEFAULT_REDACT_PATTERNS: string[] = [

4353

// ENV-style assignments. Keep this case-sensitive so diagnostics like

4454

// `Unrecognized key: "llm"` do not lose the actual config key.

45-

String.raw`/\b[A-Z0-9_]*(?:KEY|TOKEN|SECRET|PASSWORD|PASSWD|${PAYMENT_CREDENTIAL_ENV_KEYS})\b\s*[=:]\s*(["']?)([^\s"'\\]+)\1/g`,

46-

String.raw`/\b[A-Z0-9_]*(?:KEY|TOKEN|SECRET|PASSWORD|PASSWD|${PAYMENT_CREDENTIAL_ENV_KEYS})\b\s*[=:]\s*\\+(["'])([^\s"'\\]+)\\+\1/g`,

55+

ENV_ASSIGNMENT_REDACT_PATTERN,

56+

ESCAPED_ENV_ASSIGNMENT_REDACT_PATTERN,

4757

// URL query parameters. Keep this separate from ENV-style assignments so

4858

// lower-case URL secrets stay redacted without hiding config-key diagnostics.

4959

String.raw`/[?&](?:access[-_]?token|auth[-_]?token|hook[-_]?token|refresh[-_]?token|api[-_]?key|client[-_]?secret|token|key|secret|password|pass|passwd|auth|signature|${PAYMENT_CREDENTIAL_QUERY_KEYS})=([^&\s"'<>]+)/gi`,

@@ -62,7 +72,7 @@ const DEFAULT_REDACT_PATTERNS: string[] = [

6272

String.raw`\bBearer\s+([A-Za-z0-9._\-+=]{18,})\b`,

6373

// Standalone token assignments in CLI or HTTP diagnostics. URL query params

6474

// are handled above so non-secret params survive and long values stay hinted.

65-

String.raw`(^|[\s,;])(?:access_token|refresh_token|auth[-_]?token|api[-_]?key|client[-_]?secret|app[-_]?secret|token|secret|password|passwd|${PAYMENT_CREDENTIAL_QUERY_KEYS})=([^\s&#]+)`,

75+

STANDALONE_ASSIGNMENT_REDACT_PATTERN,

6676

// PEM blocks.

6777

String.raw`-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]+?-----END [A-Z ]*PRIVATE KEY-----`,

6878

// Common token prefixes.

@@ -103,21 +113,26 @@ function normalizeMode(value?: string): RedactSensitiveMode {

103113

}

104114105115

function parsePattern(raw: RedactPattern): RegExp | null {

116+

let pattern: RegExp | null = null;

106117

if (raw instanceof RegExp) {

107118

if (raw.flags.includes("g")) {

108-

return raw;

119+

pattern = raw;

120+

} else {

121+

pattern = new RegExp(raw.source, `${raw.flags}g`);

122+

}

123+

} else if (raw.trim()) {

124+

const match = raw.match(/^\/(.+)\/([gimsuy]*)$/);

125+

if (match) {

126+

const flags = match[2].includes("g") ? match[2] : `${match[2]}g`;

127+

pattern = compileConfigRegex(match[1], flags)?.regex ?? null;

128+

} else {

129+

pattern = compileConfigRegex(raw, "gi")?.regex ?? null;

109130

}

110-

return new RegExp(raw.source, `${raw.flags}g`);

111-

}

112-

if (!raw.trim()) {

113-

return null;

114131

}

115-

const match = raw.match(/^\/(.+)\/([gimsuy]*)$/);

116-

if (match) {

117-

const flags = match[2].includes("g") ? match[2] : `${match[2]}g`;

118-

return compileConfigRegex(match[1], flags)?.regex ?? null;

132+

if (pattern && typeof raw === "string" && SHELL_REFERENCE_PRESERVING_PATTERN_SOURCES.has(raw)) {

133+

shellReferencePreservingPatterns.add(pattern);

119134

}

120-

return compileConfigRegex(raw, "gi")?.regex ?? null;

135+

return pattern;

121136

}

122137123138

function resolvePatterns(value?: RedactPattern[]): RegExp[] {

@@ -142,11 +157,46 @@ function redactPemBlock(block: string): string {

142157

return `${lines[0]}\n…redacted…\n${lines[lines.length - 1]}`;

143158

}

144159145-

function redactMatch(match: string, groups: string[]): string {

160+

function isShellReferenceToKey(key: string, value: string): boolean {

161+

if (!/^[A-Z_][A-Z0-9_]*$/.test(key)) {

162+

return false;

163+

}

164+

const bare = value.match(/^\$([A-Z_][A-Z0-9_]*)$/);

165+

if (bare) {

166+

return bare[1] === key;

167+

}

168+

const braced = value.match(/^\$\{([A-Z_][A-Z0-9_]*)(?::[-=?+])?\}$/);

169+

return braced?.[1] === key;

170+

}

171+172+

function readEnvAssignmentKey(match: string): string | undefined {

173+

return match.match(/\b([A-Z_][A-Z0-9_]*)\b\s*[=:]/)?.[1];

174+

}

175+176+

function shouldPreserveShellReferenceMatch(match: string, token: string): boolean {

177+

const key = readEnvAssignmentKey(match);

178+

return key ? isShellReferenceToKey(key, token) : false;

179+

}

180+181+

function isEmptyShellParameterExpansionTail(token: string): boolean {

182+

return /^[-=?+]\}$/.test(token);

183+

}

184+185+

function redactMatch(

186+

match: string,

187+

groups: string[],

188+

options: { preserveShellReferences?: boolean } = {},

189+

): string {

146190

if (match.includes("PRIVATE KEY-----")) {

147191

return redactPemBlock(match);

148192

}

149193

const token = groups.findLast((value) => typeof value === "string" && value.length > 0) ?? match;

194+

const preserveShellReferences =

195+

options.preserveShellReferences &&

196+

(shouldPreserveShellReferenceMatch(match, token) || isEmptyShellParameterExpansionTail(token));

197+

if (preserveShellReferences) {

198+

return match;

199+

}

150200

const masked = maskToken(token);

151201

if (token === match) {

152202

return masked;

@@ -158,7 +208,9 @@ function redactText(text: string, patterns: RegExp[]): string {

158208

let next = text;

159209

for (const pattern of patterns) {

160210

next = replacePatternBounded(next, pattern, (...args: string[]) =>

161-

redactMatch(args[0], args.slice(1, -2)),

211+

redactMatch(args[0], args.slice(1, -2), {

212+

preserveShellReferences: shellReferencePreservingPatterns.has(pattern),

213+

}),

162214

);

163215

}

164216

return next;

@@ -272,6 +324,9 @@ function redactSensitiveFieldValueWithOptions(

272324

return redacted;

273325

}

274326

if (isSensitiveFieldKey(key)) {

327+

if (isShellReferenceToKey(key, value)) {

328+

return value;

329+

}

275330

return maskToken(value);

276331

}

277332

return value;