mirror of
https://github.com/openclaw/openclaw.git
synced 2026-04-01 20:31:19 +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>
249 lines
8.1 KiB
TypeScript
249 lines
8.1 KiB
TypeScript
import type { OpenClawConfig } from "../config/config.js";
|
|
import type { SecretInput } from "../config/types.secrets.js";
|
|
import { isSecureWebSocketUrl } from "../gateway/net.js";
|
|
import type { GatewayBonjourBeacon } from "../infra/bonjour-discovery.js";
|
|
import { discoverGatewayBeacons } from "../infra/bonjour-discovery.js";
|
|
import { resolveWideAreaDiscoveryDomain } from "../infra/widearea-dns.js";
|
|
import type { WizardPrompter } from "../wizard/prompts.js";
|
|
import {
|
|
promptSecretRefForOnboarding,
|
|
resolveSecretInputModeForEnvSelection,
|
|
} from "./auth-choice.apply-helpers.js";
|
|
import { detectBinary } from "./onboard-helpers.js";
|
|
import type { SecretInputMode } from "./onboard-types.js";
|
|
|
|
const DEFAULT_GATEWAY_URL = "ws://127.0.0.1:18789";
|
|
|
|
function pickHost(beacon: GatewayBonjourBeacon): string | undefined {
|
|
// Security: TXT is unauthenticated. Prefer the resolved service endpoint host.
|
|
return beacon.host || beacon.tailnetDns || beacon.lanHost;
|
|
}
|
|
|
|
function buildLabel(beacon: GatewayBonjourBeacon): string {
|
|
const host = pickHost(beacon);
|
|
// Security: Prefer the resolved service endpoint port.
|
|
const port = beacon.port ?? beacon.gatewayPort ?? 18789;
|
|
const title = beacon.displayName ?? beacon.instanceName;
|
|
const hint = host ? `${host}:${port}` : "host unknown";
|
|
return `${title} (${hint})`;
|
|
}
|
|
|
|
function ensureWsUrl(value: string): string {
|
|
const trimmed = value.trim();
|
|
if (!trimmed) {
|
|
return DEFAULT_GATEWAY_URL;
|
|
}
|
|
return trimmed;
|
|
}
|
|
|
|
function validateGatewayWebSocketUrl(value: string): string | undefined {
|
|
const trimmed = value.trim();
|
|
if (!trimmed.startsWith("ws://") && !trimmed.startsWith("wss://")) {
|
|
return "URL must start with ws:// or wss://";
|
|
}
|
|
if (
|
|
!isSecureWebSocketUrl(trimmed, {
|
|
allowPrivateWs: process.env.OPENCLAW_ALLOW_INSECURE_PRIVATE_WS === "1",
|
|
})
|
|
) {
|
|
return (
|
|
"Use wss:// for remote hosts, or ws://127.0.0.1/localhost via SSH tunnel. " +
|
|
"Break-glass: OPENCLAW_ALLOW_INSECURE_PRIVATE_WS=1 for trusted private networks."
|
|
);
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
export async function promptRemoteGatewayConfig(
|
|
cfg: OpenClawConfig,
|
|
prompter: WizardPrompter,
|
|
options?: { secretInputMode?: SecretInputMode },
|
|
): Promise<OpenClawConfig> {
|
|
let selectedBeacon: GatewayBonjourBeacon | null = null;
|
|
let suggestedUrl = cfg.gateway?.remote?.url ?? DEFAULT_GATEWAY_URL;
|
|
|
|
const hasBonjourTool = (await detectBinary("dns-sd")) || (await detectBinary("avahi-browse"));
|
|
const wantsDiscover = hasBonjourTool
|
|
? await prompter.confirm({
|
|
message: "Discover gateway on LAN (Bonjour)?",
|
|
initialValue: true,
|
|
})
|
|
: false;
|
|
|
|
if (!hasBonjourTool) {
|
|
await prompter.note(
|
|
[
|
|
"Bonjour discovery requires dns-sd (macOS) or avahi-browse (Linux).",
|
|
"Docs: https://docs.openclaw.ai/gateway/discovery",
|
|
].join("\n"),
|
|
"Discovery",
|
|
);
|
|
}
|
|
|
|
if (wantsDiscover) {
|
|
const wideAreaDomain = resolveWideAreaDiscoveryDomain({
|
|
configDomain: cfg.discovery?.wideArea?.domain,
|
|
});
|
|
const spin = prompter.progress("Searching for gateways…");
|
|
const beacons = await discoverGatewayBeacons({ timeoutMs: 2000, wideAreaDomain });
|
|
spin.stop(beacons.length > 0 ? `Found ${beacons.length} gateway(s)` : "No gateways found");
|
|
|
|
if (beacons.length > 0) {
|
|
const selection = await prompter.select({
|
|
message: "Select gateway",
|
|
options: [
|
|
...beacons.map((beacon, index) => ({
|
|
value: String(index),
|
|
label: buildLabel(beacon),
|
|
})),
|
|
{ value: "manual", label: "Enter URL manually" },
|
|
],
|
|
});
|
|
if (selection !== "manual") {
|
|
const idx = Number.parseInt(String(selection), 10);
|
|
selectedBeacon = Number.isFinite(idx) ? (beacons[idx] ?? null) : null;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (selectedBeacon) {
|
|
const host = pickHost(selectedBeacon);
|
|
const port = selectedBeacon.port ?? selectedBeacon.gatewayPort ?? 18789;
|
|
if (host) {
|
|
const mode = await prompter.select({
|
|
message: "Connection method",
|
|
options: [
|
|
{
|
|
value: "direct",
|
|
label: `Direct gateway WS (${host}:${port})`,
|
|
},
|
|
{ value: "ssh", label: "SSH tunnel (loopback)" },
|
|
],
|
|
});
|
|
if (mode === "direct") {
|
|
suggestedUrl = `wss://${host}:${port}`;
|
|
await prompter.note(
|
|
[
|
|
"Direct remote access defaults to TLS.",
|
|
`Using: ${suggestedUrl}`,
|
|
"If your gateway is loopback-only, choose SSH tunnel and keep ws://127.0.0.1:18789.",
|
|
].join("\n"),
|
|
"Direct remote",
|
|
);
|
|
} else {
|
|
suggestedUrl = DEFAULT_GATEWAY_URL;
|
|
await prompter.note(
|
|
[
|
|
"Start a tunnel before using the CLI:",
|
|
`ssh -N -L 18789:127.0.0.1:18789 <user>@${host}${
|
|
selectedBeacon.sshPort ? ` -p ${selectedBeacon.sshPort}` : ""
|
|
}`,
|
|
"Docs: https://docs.openclaw.ai/gateway/remote",
|
|
].join("\n"),
|
|
"SSH tunnel",
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
const urlInput = await prompter.text({
|
|
message: "Gateway WebSocket URL",
|
|
initialValue: suggestedUrl,
|
|
validate: (value) => validateGatewayWebSocketUrl(String(value)),
|
|
});
|
|
const url = ensureWsUrl(String(urlInput));
|
|
|
|
const authChoice = await prompter.select({
|
|
message: "Gateway auth",
|
|
options: [
|
|
{ value: "token", label: "Token (recommended)" },
|
|
{ value: "password", label: "Password" },
|
|
{ value: "off", label: "No auth" },
|
|
],
|
|
});
|
|
|
|
let token: SecretInput | undefined = cfg.gateway?.remote?.token;
|
|
let password: SecretInput | undefined = cfg.gateway?.remote?.password;
|
|
if (authChoice === "token") {
|
|
const selectedMode = await resolveSecretInputModeForEnvSelection({
|
|
prompter,
|
|
explicitMode: options?.secretInputMode,
|
|
copy: {
|
|
modeMessage: "How do you want to provide this gateway token?",
|
|
plaintextLabel: "Enter token now",
|
|
plaintextHint: "Stores the token directly in OpenClaw config",
|
|
},
|
|
});
|
|
if (selectedMode === "ref") {
|
|
const resolved = await promptSecretRefForOnboarding({
|
|
provider: "gateway-remote-token",
|
|
config: cfg,
|
|
prompter,
|
|
preferredEnvVar: "OPENCLAW_GATEWAY_TOKEN",
|
|
copy: {
|
|
sourceMessage: "Where is this gateway token stored?",
|
|
envVarPlaceholder: "OPENCLAW_GATEWAY_TOKEN",
|
|
},
|
|
});
|
|
token = resolved.ref;
|
|
} else {
|
|
token = String(
|
|
await prompter.text({
|
|
message: "Gateway token",
|
|
initialValue: typeof token === "string" ? token : undefined,
|
|
validate: (value) => (value?.trim() ? undefined : "Required"),
|
|
}),
|
|
).trim();
|
|
}
|
|
password = undefined;
|
|
} else if (authChoice === "password") {
|
|
const selectedMode = await resolveSecretInputModeForEnvSelection({
|
|
prompter,
|
|
explicitMode: options?.secretInputMode,
|
|
copy: {
|
|
modeMessage: "How do you want to provide this gateway password?",
|
|
plaintextLabel: "Enter password now",
|
|
plaintextHint: "Stores the password directly in OpenClaw config",
|
|
},
|
|
});
|
|
if (selectedMode === "ref") {
|
|
const resolved = await promptSecretRefForOnboarding({
|
|
provider: "gateway-remote-password",
|
|
config: cfg,
|
|
prompter,
|
|
preferredEnvVar: "OPENCLAW_GATEWAY_PASSWORD",
|
|
copy: {
|
|
sourceMessage: "Where is this gateway password stored?",
|
|
envVarPlaceholder: "OPENCLAW_GATEWAY_PASSWORD",
|
|
},
|
|
});
|
|
password = resolved.ref;
|
|
} else {
|
|
password = String(
|
|
await prompter.text({
|
|
message: "Gateway password",
|
|
initialValue: typeof password === "string" ? password : undefined,
|
|
validate: (value) => (value?.trim() ? undefined : "Required"),
|
|
}),
|
|
).trim();
|
|
}
|
|
token = undefined;
|
|
} else {
|
|
token = undefined;
|
|
password = undefined;
|
|
}
|
|
|
|
return {
|
|
...cfg,
|
|
gateway: {
|
|
...cfg.gateway,
|
|
mode: "remote",
|
|
remote: {
|
|
url,
|
|
...(token !== undefined ? { token } : {}),
|
|
...(password !== undefined ? { password } : {}),
|
|
},
|
|
},
|
|
};
|
|
}
|