mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-16 12:30:49 +00:00
* 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>
223 lines
8.1 KiB
TypeScript
223 lines
8.1 KiB
TypeScript
import type { OpenClawConfig } from "../config/config.js";
|
|
import { resolveSecretInputRef } from "../config/types.secrets.js";
|
|
|
|
export type ExplicitGatewayAuth = {
|
|
token?: string;
|
|
password?: string;
|
|
};
|
|
|
|
export type ResolvedGatewayCredentials = {
|
|
token?: string;
|
|
password?: string;
|
|
};
|
|
|
|
export type GatewayCredentialMode = "local" | "remote";
|
|
export type GatewayCredentialPrecedence = "env-first" | "config-first";
|
|
export type GatewayRemoteCredentialPrecedence = "remote-first" | "env-first";
|
|
export type GatewayRemoteCredentialFallback = "remote-env-local" | "remote-only";
|
|
|
|
export function trimToUndefined(value: unknown): string | undefined {
|
|
if (typeof value !== "string") {
|
|
return undefined;
|
|
}
|
|
const trimmed = value.trim();
|
|
return trimmed.length > 0 ? trimmed : undefined;
|
|
}
|
|
|
|
function firstDefined(values: Array<string | undefined>): string | undefined {
|
|
for (const value of values) {
|
|
if (value) {
|
|
return value;
|
|
}
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
function throwUnresolvedGatewaySecretInput(path: string): never {
|
|
throw new Error(
|
|
[
|
|
`${path} is configured as a secret reference but is unavailable in this command path.`,
|
|
"Fix: set OPENCLAW_GATEWAY_TOKEN/OPENCLAW_GATEWAY_PASSWORD, pass explicit --token/--password,",
|
|
"or run a gateway command path that resolves secret references before credential selection.",
|
|
].join("\n"),
|
|
);
|
|
}
|
|
|
|
function readGatewayTokenEnv(
|
|
env: NodeJS.ProcessEnv,
|
|
includeLegacyEnv: boolean,
|
|
): string | undefined {
|
|
const primary = trimToUndefined(env.OPENCLAW_GATEWAY_TOKEN);
|
|
if (primary) {
|
|
return primary;
|
|
}
|
|
if (!includeLegacyEnv) {
|
|
return undefined;
|
|
}
|
|
return trimToUndefined(env.CLAWDBOT_GATEWAY_TOKEN);
|
|
}
|
|
|
|
function readGatewayPasswordEnv(
|
|
env: NodeJS.ProcessEnv,
|
|
includeLegacyEnv: boolean,
|
|
): string | undefined {
|
|
const primary = trimToUndefined(env.OPENCLAW_GATEWAY_PASSWORD);
|
|
if (primary) {
|
|
return primary;
|
|
}
|
|
if (!includeLegacyEnv) {
|
|
return undefined;
|
|
}
|
|
return trimToUndefined(env.CLAWDBOT_GATEWAY_PASSWORD);
|
|
}
|
|
|
|
export function resolveGatewayCredentialsFromValues(params: {
|
|
configToken?: unknown;
|
|
configPassword?: unknown;
|
|
env?: NodeJS.ProcessEnv;
|
|
includeLegacyEnv?: boolean;
|
|
tokenPrecedence?: GatewayCredentialPrecedence;
|
|
passwordPrecedence?: GatewayCredentialPrecedence;
|
|
}): ResolvedGatewayCredentials {
|
|
const env = params.env ?? process.env;
|
|
const includeLegacyEnv = params.includeLegacyEnv ?? true;
|
|
const envToken = readGatewayTokenEnv(env, includeLegacyEnv);
|
|
const envPassword = readGatewayPasswordEnv(env, includeLegacyEnv);
|
|
const configToken = trimToUndefined(params.configToken);
|
|
const configPassword = trimToUndefined(params.configPassword);
|
|
const tokenPrecedence = params.tokenPrecedence ?? "env-first";
|
|
const passwordPrecedence = params.passwordPrecedence ?? "env-first";
|
|
|
|
const token =
|
|
tokenPrecedence === "config-first"
|
|
? firstDefined([configToken, envToken])
|
|
: firstDefined([envToken, configToken]);
|
|
const password =
|
|
passwordPrecedence === "config-first"
|
|
? firstDefined([configPassword, envPassword])
|
|
: firstDefined([envPassword, configPassword]);
|
|
|
|
return { token, password };
|
|
}
|
|
|
|
export function resolveGatewayCredentialsFromConfig(params: {
|
|
cfg: OpenClawConfig;
|
|
env?: NodeJS.ProcessEnv;
|
|
explicitAuth?: ExplicitGatewayAuth;
|
|
urlOverride?: string;
|
|
urlOverrideSource?: "cli" | "env";
|
|
modeOverride?: GatewayCredentialMode;
|
|
includeLegacyEnv?: boolean;
|
|
localTokenPrecedence?: GatewayCredentialPrecedence;
|
|
localPasswordPrecedence?: GatewayCredentialPrecedence;
|
|
remoteTokenPrecedence?: GatewayRemoteCredentialPrecedence;
|
|
remotePasswordPrecedence?: GatewayRemoteCredentialPrecedence;
|
|
remoteTokenFallback?: GatewayRemoteCredentialFallback;
|
|
remotePasswordFallback?: GatewayRemoteCredentialFallback;
|
|
}): ResolvedGatewayCredentials {
|
|
const env = params.env ?? process.env;
|
|
const includeLegacyEnv = params.includeLegacyEnv ?? true;
|
|
const explicitToken = trimToUndefined(params.explicitAuth?.token);
|
|
const explicitPassword = trimToUndefined(params.explicitAuth?.password);
|
|
if (explicitToken || explicitPassword) {
|
|
return { token: explicitToken, password: explicitPassword };
|
|
}
|
|
if (trimToUndefined(params.urlOverride) && params.urlOverrideSource !== "env") {
|
|
return {};
|
|
}
|
|
if (trimToUndefined(params.urlOverride) && params.urlOverrideSource === "env") {
|
|
return resolveGatewayCredentialsFromValues({
|
|
configToken: undefined,
|
|
configPassword: undefined,
|
|
env,
|
|
includeLegacyEnv,
|
|
tokenPrecedence: "env-first",
|
|
passwordPrecedence: "env-first",
|
|
});
|
|
}
|
|
|
|
const mode: GatewayCredentialMode =
|
|
params.modeOverride ?? (params.cfg.gateway?.mode === "remote" ? "remote" : "local");
|
|
const remote = params.cfg.gateway?.remote;
|
|
const defaults = params.cfg.secrets?.defaults;
|
|
const authMode = params.cfg.gateway?.auth?.mode;
|
|
const envToken = readGatewayTokenEnv(env, includeLegacyEnv);
|
|
const envPassword = readGatewayPasswordEnv(env, includeLegacyEnv);
|
|
|
|
const remoteToken = trimToUndefined(remote?.token);
|
|
const remotePassword = trimToUndefined(remote?.password);
|
|
const localToken = trimToUndefined(params.cfg.gateway?.auth?.token);
|
|
const localPassword = trimToUndefined(params.cfg.gateway?.auth?.password);
|
|
|
|
const localTokenPrecedence = params.localTokenPrecedence ?? "env-first";
|
|
const localPasswordPrecedence = params.localPasswordPrecedence ?? "env-first";
|
|
|
|
if (mode === "local") {
|
|
// In local mode, prefer gateway.auth.token, but also accept gateway.remote.token
|
|
// as a fallback for cron commands and other local gateway clients.
|
|
// This allows users in remote mode to use a single token for all operations.
|
|
const fallbackToken = localToken ?? remoteToken;
|
|
const fallbackPassword = localPassword ?? remotePassword;
|
|
const localResolved = resolveGatewayCredentialsFromValues({
|
|
configToken: fallbackToken,
|
|
configPassword: fallbackPassword,
|
|
env,
|
|
includeLegacyEnv,
|
|
tokenPrecedence: localTokenPrecedence,
|
|
passwordPrecedence: localPasswordPrecedence,
|
|
});
|
|
const localPasswordCanWin =
|
|
authMode === "password" ||
|
|
(authMode !== "token" &&
|
|
authMode !== "none" &&
|
|
authMode !== "trusted-proxy" &&
|
|
!localResolved.token);
|
|
const localPasswordRef = resolveSecretInputRef({
|
|
value: params.cfg.gateway?.auth?.password,
|
|
defaults,
|
|
}).ref;
|
|
if (localPasswordRef && !localResolved.password && !envPassword && localPasswordCanWin) {
|
|
throwUnresolvedGatewaySecretInput("gateway.auth.password");
|
|
}
|
|
return localResolved;
|
|
}
|
|
|
|
const remoteTokenFallback = params.remoteTokenFallback ?? "remote-env-local";
|
|
const remotePasswordFallback = params.remotePasswordFallback ?? "remote-env-local";
|
|
const remoteTokenPrecedence = params.remoteTokenPrecedence ?? "remote-first";
|
|
const remotePasswordPrecedence = params.remotePasswordPrecedence ?? "env-first";
|
|
|
|
const token =
|
|
remoteTokenFallback === "remote-only"
|
|
? remoteToken
|
|
: remoteTokenPrecedence === "env-first"
|
|
? firstDefined([envToken, remoteToken, localToken])
|
|
: firstDefined([remoteToken, envToken, localToken]);
|
|
const password =
|
|
remotePasswordFallback === "remote-only"
|
|
? remotePassword
|
|
: remotePasswordPrecedence === "env-first"
|
|
? firstDefined([envPassword, remotePassword, localPassword])
|
|
: firstDefined([remotePassword, envPassword, localPassword]);
|
|
|
|
const remoteTokenRef = resolveSecretInputRef({
|
|
value: remote?.token,
|
|
defaults,
|
|
}).ref;
|
|
const remotePasswordRef = resolveSecretInputRef({
|
|
value: remote?.password,
|
|
defaults,
|
|
}).ref;
|
|
const localTokenFallback = remoteTokenFallback === "remote-only" ? undefined : localToken;
|
|
const localPasswordFallback =
|
|
remotePasswordFallback === "remote-only" ? undefined : localPassword;
|
|
if (remoteTokenRef && !token && !envToken && !localTokenFallback && !password) {
|
|
throwUnresolvedGatewaySecretInput("gateway.remote.token");
|
|
}
|
|
if (remotePasswordRef && !password && !envPassword && !localPasswordFallback && !token) {
|
|
throwUnresolvedGatewaySecretInput("gateway.remote.password");
|
|
}
|
|
|
|
return { token, password };
|
|
}
|