* 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>
129 lines
3.5 KiB
TypeScript
129 lines
3.5 KiB
TypeScript
import type { AuthProfileCredential, AuthProfileStore } from "../agents/auth-profiles.js";
|
|
import { resolveSecretInputRef } from "../config/types.secrets.js";
|
|
import {
|
|
pushAssignment,
|
|
pushWarning,
|
|
type ResolverContext,
|
|
type SecretDefaults,
|
|
} from "./runtime-shared.js";
|
|
import { isNonEmptyString } from "./shared.js";
|
|
|
|
type ApiKeyCredentialLike = AuthProfileCredential & {
|
|
type: "api_key";
|
|
key?: string;
|
|
keyRef?: unknown;
|
|
};
|
|
|
|
type TokenCredentialLike = AuthProfileCredential & {
|
|
type: "token";
|
|
token?: string;
|
|
tokenRef?: unknown;
|
|
};
|
|
|
|
function collectApiKeyProfileAssignment(params: {
|
|
profile: ApiKeyCredentialLike;
|
|
profileId: string;
|
|
agentDir: string;
|
|
defaults: SecretDefaults | undefined;
|
|
context: ResolverContext;
|
|
}): void {
|
|
const {
|
|
explicitRef: keyRef,
|
|
inlineRef: inlineKeyRef,
|
|
ref: resolvedKeyRef,
|
|
} = resolveSecretInputRef({
|
|
value: params.profile.key,
|
|
refValue: params.profile.keyRef,
|
|
defaults: params.defaults,
|
|
});
|
|
if (!resolvedKeyRef) {
|
|
return;
|
|
}
|
|
if (!keyRef && inlineKeyRef) {
|
|
params.profile.keyRef = inlineKeyRef;
|
|
}
|
|
if (keyRef && isNonEmptyString(params.profile.key)) {
|
|
pushWarning(params.context, {
|
|
code: "SECRETS_REF_OVERRIDES_PLAINTEXT",
|
|
path: `${params.agentDir}.auth-profiles.${params.profileId}.key`,
|
|
message: `auth-profiles ${params.profileId}: keyRef is set; runtime will ignore plaintext key.`,
|
|
});
|
|
}
|
|
pushAssignment(params.context, {
|
|
ref: resolvedKeyRef,
|
|
path: `${params.agentDir}.auth-profiles.${params.profileId}.key`,
|
|
expected: "string",
|
|
apply: (value) => {
|
|
params.profile.key = String(value);
|
|
},
|
|
});
|
|
}
|
|
|
|
function collectTokenProfileAssignment(params: {
|
|
profile: TokenCredentialLike;
|
|
profileId: string;
|
|
agentDir: string;
|
|
defaults: SecretDefaults | undefined;
|
|
context: ResolverContext;
|
|
}): void {
|
|
const {
|
|
explicitRef: tokenRef,
|
|
inlineRef: inlineTokenRef,
|
|
ref: resolvedTokenRef,
|
|
} = resolveSecretInputRef({
|
|
value: params.profile.token,
|
|
refValue: params.profile.tokenRef,
|
|
defaults: params.defaults,
|
|
});
|
|
if (!resolvedTokenRef) {
|
|
return;
|
|
}
|
|
if (!tokenRef && inlineTokenRef) {
|
|
params.profile.tokenRef = inlineTokenRef;
|
|
}
|
|
if (tokenRef && isNonEmptyString(params.profile.token)) {
|
|
pushWarning(params.context, {
|
|
code: "SECRETS_REF_OVERRIDES_PLAINTEXT",
|
|
path: `${params.agentDir}.auth-profiles.${params.profileId}.token`,
|
|
message: `auth-profiles ${params.profileId}: tokenRef is set; runtime will ignore plaintext token.`,
|
|
});
|
|
}
|
|
pushAssignment(params.context, {
|
|
ref: resolvedTokenRef,
|
|
path: `${params.agentDir}.auth-profiles.${params.profileId}.token`,
|
|
expected: "string",
|
|
apply: (value) => {
|
|
params.profile.token = String(value);
|
|
},
|
|
});
|
|
}
|
|
|
|
export function collectAuthStoreAssignments(params: {
|
|
store: AuthProfileStore;
|
|
context: ResolverContext;
|
|
agentDir: string;
|
|
}): void {
|
|
const defaults = params.context.sourceConfig.secrets?.defaults;
|
|
for (const [profileId, profile] of Object.entries(params.store.profiles)) {
|
|
if (profile.type === "api_key") {
|
|
collectApiKeyProfileAssignment({
|
|
profile: profile as ApiKeyCredentialLike,
|
|
profileId,
|
|
agentDir: params.agentDir,
|
|
defaults,
|
|
context: params.context,
|
|
});
|
|
continue;
|
|
}
|
|
if (profile.type === "token") {
|
|
collectTokenProfileAssignment({
|
|
profile: profile as TokenCredentialLike,
|
|
profileId,
|
|
agentDir: params.agentDir,
|
|
defaults,
|
|
context: params.context,
|
|
});
|
|
}
|
|
}
|
|
}
|