* 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>
260 lines
8.3 KiB
TypeScript
260 lines
8.3 KiB
TypeScript
import { isDeepStrictEqual } from "node:util";
|
|
import type { AuthProfileStore } from "../agents/auth-profiles.js";
|
|
import type { OpenClawConfig } from "../config/config.js";
|
|
import {
|
|
resolveSecretInputRef,
|
|
type SecretProviderConfig,
|
|
type SecretRef,
|
|
} from "../config/types.secrets.js";
|
|
import type { SecretsApplyPlan } from "./plan.js";
|
|
import { isRecord } from "./shared.js";
|
|
import {
|
|
discoverAuthProfileSecretTargets,
|
|
discoverConfigSecretTargets,
|
|
} from "./target-registry.js";
|
|
|
|
export type ConfigureCandidate = {
|
|
type: string;
|
|
path: string;
|
|
pathSegments: string[];
|
|
label: string;
|
|
configFile: "openclaw.json" | "auth-profiles.json";
|
|
expectedResolvedValue: "string" | "string-or-object";
|
|
existingRef?: SecretRef;
|
|
isDerived?: boolean;
|
|
agentId?: string;
|
|
providerId?: string;
|
|
accountId?: string;
|
|
authProfileProvider?: string;
|
|
};
|
|
|
|
export type ConfigureSelectedTarget = ConfigureCandidate & {
|
|
ref: SecretRef;
|
|
};
|
|
|
|
export type ConfigureProviderChanges = {
|
|
upserts: Record<string, SecretProviderConfig>;
|
|
deletes: string[];
|
|
};
|
|
|
|
function getSecretProviders(config: OpenClawConfig): Record<string, SecretProviderConfig> {
|
|
if (!isRecord(config.secrets?.providers)) {
|
|
return {};
|
|
}
|
|
return config.secrets.providers;
|
|
}
|
|
|
|
export function buildConfigureCandidates(config: OpenClawConfig): ConfigureCandidate[] {
|
|
return buildConfigureCandidatesForScope({ config });
|
|
}
|
|
|
|
function configureCandidateSortKey(candidate: ConfigureCandidate): string {
|
|
if (candidate.configFile === "auth-profiles.json") {
|
|
const agentId = candidate.agentId ?? "";
|
|
return `auth-profiles:${agentId}:${candidate.path}`;
|
|
}
|
|
return `openclaw:${candidate.path}`;
|
|
}
|
|
|
|
function resolveAuthProfileProvider(
|
|
store: AuthProfileStore,
|
|
pathSegments: string[],
|
|
): string | undefined {
|
|
const profileId = pathSegments[1];
|
|
if (!profileId) {
|
|
return undefined;
|
|
}
|
|
const profile = store.profiles?.[profileId];
|
|
if (!isRecord(profile) || typeof profile.provider !== "string") {
|
|
return undefined;
|
|
}
|
|
const provider = profile.provider.trim();
|
|
return provider.length > 0 ? provider : undefined;
|
|
}
|
|
|
|
export function buildConfigureCandidatesForScope(params: {
|
|
config: OpenClawConfig;
|
|
authoredOpenClawConfig?: OpenClawConfig;
|
|
authProfiles?: {
|
|
agentId: string;
|
|
store: AuthProfileStore;
|
|
};
|
|
}): ConfigureCandidate[] {
|
|
const authoredConfig = params.authoredOpenClawConfig ?? params.config;
|
|
|
|
const hasPathInAuthoredConfig = (pathSegments: string[]): boolean =>
|
|
hasPath(authoredConfig, pathSegments);
|
|
|
|
const openclawCandidates = discoverConfigSecretTargets(params.config)
|
|
.filter((entry) => entry.entry.includeInConfigure)
|
|
.map((entry) => {
|
|
const resolved = resolveSecretInputRef({
|
|
value: entry.value,
|
|
refValue: entry.refValue,
|
|
defaults: params.config.secrets?.defaults,
|
|
});
|
|
const pathExists = hasPathInAuthoredConfig(entry.pathSegments);
|
|
const refPathExists = entry.refPathSegments
|
|
? hasPathInAuthoredConfig(entry.refPathSegments)
|
|
: false;
|
|
return {
|
|
type: entry.entry.targetType,
|
|
path: entry.path,
|
|
pathSegments: [...entry.pathSegments],
|
|
label: entry.path,
|
|
configFile: "openclaw.json" as const,
|
|
expectedResolvedValue: entry.entry.expectedResolvedValue,
|
|
...(resolved.ref ? { existingRef: resolved.ref } : {}),
|
|
...(pathExists || refPathExists ? {} : { isDerived: true }),
|
|
...(entry.providerId ? { providerId: entry.providerId } : {}),
|
|
...(entry.accountId ? { accountId: entry.accountId } : {}),
|
|
};
|
|
});
|
|
|
|
const authCandidates =
|
|
params.authProfiles === undefined
|
|
? []
|
|
: discoverAuthProfileSecretTargets(params.authProfiles.store)
|
|
.filter((entry) => entry.entry.includeInConfigure)
|
|
.map((entry) => {
|
|
const authProfiles = params.authProfiles;
|
|
if (!authProfiles) {
|
|
throw new Error("Missing auth profile scope for configure candidate discovery.");
|
|
}
|
|
const authProfileProvider = resolveAuthProfileProvider(
|
|
authProfiles.store,
|
|
entry.pathSegments,
|
|
);
|
|
const resolved = resolveSecretInputRef({
|
|
value: entry.value,
|
|
refValue: entry.refValue,
|
|
defaults: params.config.secrets?.defaults,
|
|
});
|
|
return {
|
|
type: entry.entry.targetType,
|
|
path: entry.path,
|
|
pathSegments: [...entry.pathSegments],
|
|
label: `${entry.path} (auth profile, agent ${authProfiles.agentId})`,
|
|
configFile: "auth-profiles.json" as const,
|
|
expectedResolvedValue: entry.entry.expectedResolvedValue,
|
|
...(resolved.ref ? { existingRef: resolved.ref } : {}),
|
|
agentId: authProfiles.agentId,
|
|
...(authProfileProvider ? { authProfileProvider } : {}),
|
|
};
|
|
});
|
|
|
|
return [...openclawCandidates, ...authCandidates].toSorted((a, b) =>
|
|
configureCandidateSortKey(a).localeCompare(configureCandidateSortKey(b)),
|
|
);
|
|
}
|
|
|
|
function hasPath(root: unknown, segments: string[]): boolean {
|
|
if (segments.length === 0) {
|
|
return false;
|
|
}
|
|
let cursor: unknown = root;
|
|
for (let index = 0; index < segments.length; index += 1) {
|
|
const segment = segments[index] ?? "";
|
|
if (Array.isArray(cursor)) {
|
|
if (!/^\d+$/.test(segment)) {
|
|
return false;
|
|
}
|
|
const parsedIndex = Number.parseInt(segment, 10);
|
|
if (!Number.isFinite(parsedIndex) || parsedIndex < 0 || parsedIndex >= cursor.length) {
|
|
return false;
|
|
}
|
|
if (index === segments.length - 1) {
|
|
return true;
|
|
}
|
|
cursor = cursor[parsedIndex];
|
|
continue;
|
|
}
|
|
if (!isRecord(cursor)) {
|
|
return false;
|
|
}
|
|
if (!Object.prototype.hasOwnProperty.call(cursor, segment)) {
|
|
return false;
|
|
}
|
|
if (index === segments.length - 1) {
|
|
return true;
|
|
}
|
|
cursor = cursor[segment];
|
|
}
|
|
return false;
|
|
}
|
|
|
|
export function collectConfigureProviderChanges(params: {
|
|
original: OpenClawConfig;
|
|
next: OpenClawConfig;
|
|
}): ConfigureProviderChanges {
|
|
const originalProviders = getSecretProviders(params.original);
|
|
const nextProviders = getSecretProviders(params.next);
|
|
|
|
const upserts: Record<string, SecretProviderConfig> = {};
|
|
const deletes: string[] = [];
|
|
|
|
for (const [providerAlias, nextProviderConfig] of Object.entries(nextProviders)) {
|
|
const current = originalProviders[providerAlias];
|
|
if (isDeepStrictEqual(current, nextProviderConfig)) {
|
|
continue;
|
|
}
|
|
upserts[providerAlias] = structuredClone(nextProviderConfig);
|
|
}
|
|
|
|
for (const providerAlias of Object.keys(originalProviders)) {
|
|
if (!Object.prototype.hasOwnProperty.call(nextProviders, providerAlias)) {
|
|
deletes.push(providerAlias);
|
|
}
|
|
}
|
|
|
|
return {
|
|
upserts,
|
|
deletes: deletes.toSorted(),
|
|
};
|
|
}
|
|
|
|
export function hasConfigurePlanChanges(params: {
|
|
selectedTargets: ReadonlyMap<string, ConfigureSelectedTarget>;
|
|
providerChanges: ConfigureProviderChanges;
|
|
}): boolean {
|
|
return (
|
|
params.selectedTargets.size > 0 ||
|
|
Object.keys(params.providerChanges.upserts).length > 0 ||
|
|
params.providerChanges.deletes.length > 0
|
|
);
|
|
}
|
|
|
|
export function buildSecretsConfigurePlan(params: {
|
|
selectedTargets: ReadonlyMap<string, ConfigureSelectedTarget>;
|
|
providerChanges: ConfigureProviderChanges;
|
|
generatedAt?: string;
|
|
}): SecretsApplyPlan {
|
|
return {
|
|
version: 1,
|
|
protocolVersion: 1,
|
|
generatedAt: params.generatedAt ?? new Date().toISOString(),
|
|
generatedBy: "openclaw secrets configure",
|
|
targets: [...params.selectedTargets.values()].map((entry) => ({
|
|
type: entry.type,
|
|
path: entry.path,
|
|
pathSegments: [...entry.pathSegments],
|
|
ref: entry.ref,
|
|
...(entry.agentId ? { agentId: entry.agentId } : {}),
|
|
...(entry.providerId ? { providerId: entry.providerId } : {}),
|
|
...(entry.accountId ? { accountId: entry.accountId } : {}),
|
|
...(entry.authProfileProvider ? { authProfileProvider: entry.authProfileProvider } : {}),
|
|
})),
|
|
...(Object.keys(params.providerChanges.upserts).length > 0
|
|
? { providerUpserts: params.providerChanges.upserts }
|
|
: {}),
|
|
...(params.providerChanges.deletes.length > 0
|
|
? { providerDeletes: params.providerChanges.deletes }
|
|
: {}),
|
|
options: {
|
|
scrubEnv: true,
|
|
scrubAuthProfilesForProviderTargets: true,
|
|
scrubLegacyAuthJson: true,
|
|
},
|
|
};
|
|
}
|