mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 19:10:58 +00:00
feat(secrets): expand SecretRef coverage across user-supplied credentials (#29580)
* feat(secrets): expand secret target coverage and gateway tooling * docs(secrets): align gateway and CLI secret docs * chore(protocol): regenerate swift gateway models for secrets methods * fix(config): restore talk apiKey fallback and stabilize runner test * ci(windows): reduce test worker count for shard stability * ci(windows): raise node heap for test shard stability * test(feishu): make proxy env precedence assertion windows-safe * fix(gateway): resolve auth password SecretInput refs for clients * fix(gateway): resolve remote SecretInput credentials for clients * fix(secrets): skip inactive refs in command snapshot assignments * fix(secrets): scope gateway.remote refs to effective auth surfaces * fix(secrets): ignore memory defaults when enabled agents disable search * fix(secrets): honor Google Chat serviceAccountRef inheritance * fix(secrets): address tsgo errors in command and gateway collectors * fix(secrets): avoid auth-store load in providers-only configure * fix(gateway): defer local password ref resolution by precedence * fix(secrets): gate telegram webhook secret refs by webhook mode * fix(secrets): gate slack signing secret refs to http mode * fix(secrets): skip telegram botToken refs when tokenFile is set * fix(secrets): gate discord pluralkit refs by enabled flag * fix(secrets): gate discord voice tts refs by voice enabled * test(secrets): make runtime fixture modes explicit * fix(cli): resolve local qr password secret refs * fix(cli): fail when gateway leaves command refs unresolved * fix(gateway): fail when local password SecretRef is unresolved * fix(gateway): fail when required remote SecretRefs are unresolved * fix(gateway): resolve local password refs only when password can win * fix(cli): skip local password SecretRef resolution on qr token override * test(gateway): cast SecretRef fixtures to OpenClawConfig * test(secrets): activate mode-gated targets in runtime coverage fixture * fix(cron): support SecretInput webhook tokens safely * fix(bluebubbles): support SecretInput passwords across config paths * fix(msteams): make appPassword SecretInput-safe in onboarding/token paths * fix(bluebubbles): align SecretInput schema helper typing * fix(cli): clarify secrets.resolve version-skew errors * refactor(secrets): return structured inactive paths from secrets.resolve * refactor(gateway): type onboarding secret writes as SecretInput * chore(protocol): regenerate swift models for secrets.resolve * feat(secrets): expand extension credential secretref support * fix(secrets): gate web-search refs by active provider * fix(onboarding): detect SecretRef credentials in extension status * fix(onboarding): allow keeping existing ref in secret prompt * fix(onboarding): resolve gateway password SecretRefs for probe and tui * fix(onboarding): honor secret-input-mode for local gateway auth * fix(acp): resolve gateway SecretInput credentials * fix(secrets): gate gateway.remote refs to remote surfaces * test(secrets): cover pattern matching and inactive array refs * docs(secrets): clarify secrets.resolve and remote active surfaces * fix(bluebubbles): keep existing SecretRef during onboarding * fix(tests): resolve CI type errors in new SecretRef coverage * fix(extensions): replace raw fetch with SSRF-guarded fetch * test(secrets): mark gateway remote targets active in runtime coverage * test(infra): normalize home-prefix expectation across platforms * fix(cli): only resolve local qr password refs in password mode * test(cli): cover local qr token mode with unresolved password ref * docs(cli): clarify local qr password ref resolution behavior * refactor(extensions): reuse sdk SecretInput helpers * fix(wizard): resolve onboarding env-template secrets before plaintext * fix(cli): surface secrets.resolve diagnostics in memory and qr * test(secrets): repair post-rebase runtime and fixtures * fix(gateway): skip remote password ref resolution when token wins * fix(secrets): treat tailscale remote gateway refs as active * fix(gateway): allow remote password fallback when token ref is unresolved * fix(gateway): ignore stale local password refs for none and trusted-proxy * fix(gateway): skip remote secret ref resolution on local call paths * test(cli): cover qr remote tailscale secret ref resolution * fix(secrets): align gateway password active-surface with auth inference * fix(cli): resolve inferred local gateway password refs in qr * fix(gateway): prefer resolvable remote password over token ref pre-resolution * test(gateway): cover none and trusted-proxy stale password refs * docs(secrets): sync qr and gateway active-surface behavior * fix: restore stability blockers from pre-release audit * Secrets: fix collector/runtime precedence contradictions * docs: align secrets and web credential docs * fix(rebase): resolve integration regressions after main rebase * fix(node-host): resolve gateway secret refs for auth * fix(secrets): harden secretinput runtime readers * gateway: skip inactive auth secretref resolution * cli: avoid gateway preflight for inactive secret refs * extensions: allow unresolved refs in onboarding status * tests: fix qr-cli module mock hoist ordering * Security: align audit checks with SecretInput resolution * Gateway: resolve local-mode remote fallback secret refs * Node host: avoid resolving inactive password secret refs * Secrets runtime: mark Slack appToken inactive for HTTP mode * secrets: keep inactive gateway remote refs non-blocking * cli: include agent memory secret targets in runtime resolution * docs(secrets): sync docs with active-surface and web search behavior * fix(secrets): keep telegram top-level token refs active for blank account tokens * fix(daemon): resolve gateway password secret refs for probe auth * fix(secrets): skip IRC NickServ ref resolution when NickServ is disabled * fix(secrets): align token inheritance and exec timeout defaults * docs(secrets): clarify active-surface notes in cli docs * cli: require secrets.resolve gateway capability * gateway: log auth secret surface diagnostics * secrets: remove dead provider resolver module * fix(secrets): restore gateway auth precedence and fallback resolution * fix(tests): align plugin runtime mock typings --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
This commit is contained in:
Josh Avant
213
src/secrets/target-registry-pattern.ts
Normal file
213
src/secrets/target-registry-pattern.ts
Normal file
@@ -0,0 +1,213 @@
|
||||
import { isRecord, parseDotPath } from "./shared.js";
|
||||
import type { SecretTargetRegistryEntry } from "./target-registry-types.js";
|
||||
|
||||
export type PathPatternToken =
|
||||
| { kind: "literal"; value: string }
|
||||
| { kind: "wildcard" }
|
||||
| { kind: "array"; field: string };
|
||||
|
||||
export type CompiledTargetRegistryEntry = SecretTargetRegistryEntry & {
|
||||
pathTokens: PathPatternToken[];
|
||||
pathDynamicTokenCount: number;
|
||||
refPathTokens?: PathPatternToken[];
|
||||
refPathDynamicTokenCount: number;
|
||||
};
|
||||
|
||||
export type ExpandedPathMatch = {
|
||||
segments: string[];
|
||||
captures: string[];
|
||||
value: unknown;
|
||||
};
|
||||
|
||||
function countDynamicPatternTokens(tokens: PathPatternToken[]): number {
|
||||
return tokens.filter((token) => token.kind === "wildcard" || token.kind === "array").length;
|
||||
}
|
||||
|
||||
export function parsePathPattern(pathPattern: string): PathPatternToken[] {
|
||||
const segments = parseDotPath(pathPattern);
|
||||
return segments.map((segment) => {
|
||||
if (segment === "*") {
|
||||
return { kind: "wildcard" } as const;
|
||||
}
|
||||
if (segment.endsWith("[]")) {
|
||||
const field = segment.slice(0, -2).trim();
|
||||
if (!field) {
|
||||
throw new Error(`Invalid target path pattern: ${pathPattern}`);
|
||||
}
|
||||
return { kind: "array", field } as const;
|
||||
}
|
||||
return { kind: "literal", value: segment } as const;
|
||||
});
|
||||
}
|
||||
|
||||
export function compileTargetRegistryEntry(
|
||||
entry: SecretTargetRegistryEntry,
|
||||
): CompiledTargetRegistryEntry {
|
||||
const pathTokens = parsePathPattern(entry.pathPattern);
|
||||
const pathDynamicTokenCount = countDynamicPatternTokens(pathTokens);
|
||||
const refPathTokens = entry.refPathPattern ? parsePathPattern(entry.refPathPattern) : undefined;
|
||||
const refPathDynamicTokenCount = refPathTokens ? countDynamicPatternTokens(refPathTokens) : 0;
|
||||
if (entry.secretShape === "sibling_ref" && !refPathTokens) {
|
||||
throw new Error(`Missing refPathPattern for sibling_ref target: ${entry.id}`);
|
||||
}
|
||||
if (refPathTokens && refPathDynamicTokenCount !== pathDynamicTokenCount) {
|
||||
throw new Error(`Mismatched wildcard shape for target ref path: ${entry.id}`);
|
||||
}
|
||||
return {
|
||||
...entry,
|
||||
pathTokens,
|
||||
pathDynamicTokenCount,
|
||||
refPathTokens,
|
||||
refPathDynamicTokenCount,
|
||||
};
|
||||
}
|
||||
|
||||
export function matchPathTokens(
|
||||
segments: string[],
|
||||
tokens: PathPatternToken[],
|
||||
): {
|
||||
captures: string[];
|
||||
} | null {
|
||||
const captures: string[] = [];
|
||||
let index = 0;
|
||||
for (const token of tokens) {
|
||||
if (token.kind === "literal") {
|
||||
if (segments[index] !== token.value) {
|
||||
return null;
|
||||
}
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (token.kind === "wildcard") {
|
||||
const value = segments[index];
|
||||
if (!value) {
|
||||
return null;
|
||||
}
|
||||
captures.push(value);
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (segments[index] !== token.field) {
|
||||
return null;
|
||||
}
|
||||
const next = segments[index + 1];
|
||||
if (!next || !/^\d+$/.test(next)) {
|
||||
return null;
|
||||
}
|
||||
captures.push(next);
|
||||
index += 2;
|
||||
}
|
||||
return index === segments.length ? { captures } : null;
|
||||
}
|
||||
|
||||
export function materializePathTokens(
|
||||
tokens: PathPatternToken[],
|
||||
captures: string[],
|
||||
): string[] | null {
|
||||
const out: string[] = [];
|
||||
let captureIndex = 0;
|
||||
for (const token of tokens) {
|
||||
if (token.kind === "literal") {
|
||||
out.push(token.value);
|
||||
continue;
|
||||
}
|
||||
if (token.kind === "wildcard") {
|
||||
const value = captures[captureIndex];
|
||||
if (!value) {
|
||||
return null;
|
||||
}
|
||||
out.push(value);
|
||||
captureIndex += 1;
|
||||
continue;
|
||||
}
|
||||
const arrayIndex = captures[captureIndex];
|
||||
if (!arrayIndex || !/^\d+$/.test(arrayIndex)) {
|
||||
return null;
|
||||
}
|
||||
out.push(token.field, arrayIndex);
|
||||
captureIndex += 1;
|
||||
}
|
||||
return captureIndex === captures.length ? out : null;
|
||||
}
|
||||
|
||||
export function expandPathTokens(root: unknown, tokens: PathPatternToken[]): ExpandedPathMatch[] {
|
||||
const out: ExpandedPathMatch[] = [];
|
||||
const walk = (
|
||||
node: unknown,
|
||||
tokenIndex: number,
|
||||
segments: string[],
|
||||
captures: string[],
|
||||
): void => {
|
||||
const token = tokens[tokenIndex];
|
||||
if (!token) {
|
||||
out.push({ segments, captures, value: node });
|
||||
return;
|
||||
}
|
||||
const isLeaf = tokenIndex === tokens.length - 1;
|
||||
|
||||
if (token.kind === "literal") {
|
||||
if (!isRecord(node)) {
|
||||
return;
|
||||
}
|
||||
if (isLeaf) {
|
||||
out.push({
|
||||
segments: [...segments, token.value],
|
||||
captures,
|
||||
value: node[token.value],
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!Object.prototype.hasOwnProperty.call(node, token.value)) {
|
||||
return;
|
||||
}
|
||||
walk(node[token.value], tokenIndex + 1, [...segments, token.value], captures);
|
||||
return;
|
||||
}
|
||||
|
||||
if (token.kind === "wildcard") {
|
||||
if (!isRecord(node)) {
|
||||
return;
|
||||
}
|
||||
for (const [key, value] of Object.entries(node)) {
|
||||
if (isLeaf) {
|
||||
out.push({
|
||||
segments: [...segments, key],
|
||||
captures: [...captures, key],
|
||||
value,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
walk(value, tokenIndex + 1, [...segments, key], [...captures, key]);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!isRecord(node)) {
|
||||
return;
|
||||
}
|
||||
const items = node[token.field];
|
||||
if (!Array.isArray(items)) {
|
||||
return;
|
||||
}
|
||||
for (let index = 0; index < items.length; index += 1) {
|
||||
const item = items[index];
|
||||
const indexString = String(index);
|
||||
if (isLeaf) {
|
||||
out.push({
|
||||
segments: [...segments, token.field, indexString],
|
||||
captures: [...captures, indexString],
|
||||
value: item,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
walk(
|
||||
item,
|
||||
tokenIndex + 1,
|
||||
[...segments, token.field, indexString],
|
||||
[...captures, indexString],
|
||||
);
|
||||
}
|
||||
};
|
||||
walk(root, 0, [], []);
|
||||
return out;
|
||||
}
|
||||
Reference in New Issue
Block a user