mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-13 19:10:39 +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>
347 lines
11 KiB
TypeScript
347 lines
11 KiB
TypeScript
import type {
|
|
ChannelOnboardingAdapter,
|
|
ChannelOnboardingDmPolicy,
|
|
OpenClawConfig,
|
|
DmPolicy,
|
|
WizardPrompter,
|
|
} from "openclaw/plugin-sdk";
|
|
import {
|
|
DEFAULT_ACCOUNT_ID,
|
|
addWildcardAllowFrom,
|
|
formatDocsLink,
|
|
mergeAllowFromEntries,
|
|
normalizeAccountId,
|
|
promptAccountId,
|
|
} from "openclaw/plugin-sdk";
|
|
import {
|
|
listBlueBubblesAccountIds,
|
|
resolveBlueBubblesAccount,
|
|
resolveDefaultBlueBubblesAccountId,
|
|
} from "./accounts.js";
|
|
import { hasConfiguredSecretInput, normalizeSecretInputString } from "./secret-input.js";
|
|
import { parseBlueBubblesAllowTarget } from "./targets.js";
|
|
import { normalizeBlueBubblesServerUrl } from "./types.js";
|
|
|
|
const channel = "bluebubbles" as const;
|
|
|
|
function setBlueBubblesDmPolicy(cfg: OpenClawConfig, dmPolicy: DmPolicy): OpenClawConfig {
|
|
const allowFrom =
|
|
dmPolicy === "open" ? addWildcardAllowFrom(cfg.channels?.bluebubbles?.allowFrom) : undefined;
|
|
return {
|
|
...cfg,
|
|
channels: {
|
|
...cfg.channels,
|
|
bluebubbles: {
|
|
...cfg.channels?.bluebubbles,
|
|
dmPolicy,
|
|
...(allowFrom ? { allowFrom } : {}),
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
function setBlueBubblesAllowFrom(
|
|
cfg: OpenClawConfig,
|
|
accountId: string,
|
|
allowFrom: string[],
|
|
): OpenClawConfig {
|
|
if (accountId === DEFAULT_ACCOUNT_ID) {
|
|
return {
|
|
...cfg,
|
|
channels: {
|
|
...cfg.channels,
|
|
bluebubbles: {
|
|
...cfg.channels?.bluebubbles,
|
|
allowFrom,
|
|
},
|
|
},
|
|
};
|
|
}
|
|
return {
|
|
...cfg,
|
|
channels: {
|
|
...cfg.channels,
|
|
bluebubbles: {
|
|
...cfg.channels?.bluebubbles,
|
|
accounts: {
|
|
...cfg.channels?.bluebubbles?.accounts,
|
|
[accountId]: {
|
|
...cfg.channels?.bluebubbles?.accounts?.[accountId],
|
|
allowFrom,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
function parseBlueBubblesAllowFromInput(raw: string): string[] {
|
|
return raw
|
|
.split(/[\n,]+/g)
|
|
.map((entry) => entry.trim())
|
|
.filter(Boolean);
|
|
}
|
|
|
|
async function promptBlueBubblesAllowFrom(params: {
|
|
cfg: OpenClawConfig;
|
|
prompter: WizardPrompter;
|
|
accountId?: string;
|
|
}): Promise<OpenClawConfig> {
|
|
const accountId =
|
|
params.accountId && normalizeAccountId(params.accountId)
|
|
? (normalizeAccountId(params.accountId) ?? DEFAULT_ACCOUNT_ID)
|
|
: resolveDefaultBlueBubblesAccountId(params.cfg);
|
|
const resolved = resolveBlueBubblesAccount({ cfg: params.cfg, accountId });
|
|
const existing = resolved.config.allowFrom ?? [];
|
|
await params.prompter.note(
|
|
[
|
|
"Allowlist BlueBubbles DMs by handle or chat target.",
|
|
"Examples:",
|
|
"- +15555550123",
|
|
"- user@example.com",
|
|
"- chat_id:123",
|
|
"- chat_guid:iMessage;-;+15555550123",
|
|
"Multiple entries: comma- or newline-separated.",
|
|
`Docs: ${formatDocsLink("/channels/bluebubbles", "bluebubbles")}`,
|
|
].join("\n"),
|
|
"BlueBubbles allowlist",
|
|
);
|
|
const entry = await params.prompter.text({
|
|
message: "BlueBubbles allowFrom (handle or chat_id)",
|
|
placeholder: "+15555550123, user@example.com, chat_id:123",
|
|
initialValue: existing[0] ? String(existing[0]) : undefined,
|
|
validate: (value) => {
|
|
const raw = String(value ?? "").trim();
|
|
if (!raw) {
|
|
return "Required";
|
|
}
|
|
const parts = parseBlueBubblesAllowFromInput(raw);
|
|
for (const part of parts) {
|
|
if (part === "*") {
|
|
continue;
|
|
}
|
|
const parsed = parseBlueBubblesAllowTarget(part);
|
|
if (parsed.kind === "handle" && !parsed.handle) {
|
|
return `Invalid entry: ${part}`;
|
|
}
|
|
}
|
|
return undefined;
|
|
},
|
|
});
|
|
const parts = parseBlueBubblesAllowFromInput(String(entry));
|
|
const unique = mergeAllowFromEntries(undefined, parts);
|
|
return setBlueBubblesAllowFrom(params.cfg, accountId, unique);
|
|
}
|
|
|
|
const dmPolicy: ChannelOnboardingDmPolicy = {
|
|
label: "BlueBubbles",
|
|
channel,
|
|
policyKey: "channels.bluebubbles.dmPolicy",
|
|
allowFromKey: "channels.bluebubbles.allowFrom",
|
|
getCurrent: (cfg) => cfg.channels?.bluebubbles?.dmPolicy ?? "pairing",
|
|
setPolicy: (cfg, policy) => setBlueBubblesDmPolicy(cfg, policy),
|
|
promptAllowFrom: promptBlueBubblesAllowFrom,
|
|
};
|
|
|
|
export const blueBubblesOnboardingAdapter: ChannelOnboardingAdapter = {
|
|
channel,
|
|
getStatus: async ({ cfg }) => {
|
|
const configured = listBlueBubblesAccountIds(cfg).some((accountId) => {
|
|
const account = resolveBlueBubblesAccount({ cfg, accountId });
|
|
return account.configured;
|
|
});
|
|
return {
|
|
channel,
|
|
configured,
|
|
statusLines: [`BlueBubbles: ${configured ? "configured" : "needs setup"}`],
|
|
selectionHint: configured ? "configured" : "iMessage via BlueBubbles app",
|
|
quickstartScore: configured ? 1 : 0,
|
|
};
|
|
},
|
|
configure: async ({ cfg, prompter, accountOverrides, shouldPromptAccountIds }) => {
|
|
const blueBubblesOverride = accountOverrides.bluebubbles?.trim();
|
|
const defaultAccountId = resolveDefaultBlueBubblesAccountId(cfg);
|
|
let accountId = blueBubblesOverride
|
|
? normalizeAccountId(blueBubblesOverride)
|
|
: defaultAccountId;
|
|
if (shouldPromptAccountIds && !blueBubblesOverride) {
|
|
accountId = await promptAccountId({
|
|
cfg,
|
|
prompter,
|
|
label: "BlueBubbles",
|
|
currentId: accountId,
|
|
listAccountIds: listBlueBubblesAccountIds,
|
|
defaultAccountId,
|
|
});
|
|
}
|
|
|
|
let next = cfg;
|
|
const resolvedAccount = resolveBlueBubblesAccount({ cfg: next, accountId });
|
|
const validateServerUrlInput = (value: unknown): string | undefined => {
|
|
const trimmed = String(value ?? "").trim();
|
|
if (!trimmed) {
|
|
return "Required";
|
|
}
|
|
try {
|
|
const normalized = normalizeBlueBubblesServerUrl(trimmed);
|
|
new URL(normalized);
|
|
return undefined;
|
|
} catch {
|
|
return "Invalid URL format";
|
|
}
|
|
};
|
|
const promptServerUrl = async (initialValue?: string): Promise<string> => {
|
|
const entered = await prompter.text({
|
|
message: "BlueBubbles server URL",
|
|
placeholder: "http://192.168.1.100:1234",
|
|
initialValue,
|
|
validate: validateServerUrlInput,
|
|
});
|
|
return String(entered).trim();
|
|
};
|
|
|
|
// Prompt for server URL
|
|
let serverUrl = resolvedAccount.config.serverUrl?.trim();
|
|
if (!serverUrl) {
|
|
await prompter.note(
|
|
[
|
|
"Enter the BlueBubbles server URL (e.g., http://192.168.1.100:1234).",
|
|
"Find this in the BlueBubbles Server app under Connection.",
|
|
`Docs: ${formatDocsLink("/channels/bluebubbles", "bluebubbles")}`,
|
|
].join("\n"),
|
|
"BlueBubbles server URL",
|
|
);
|
|
serverUrl = await promptServerUrl();
|
|
} else {
|
|
const keepUrl = await prompter.confirm({
|
|
message: `BlueBubbles server URL already set (${serverUrl}). Keep it?`,
|
|
initialValue: true,
|
|
});
|
|
if (!keepUrl) {
|
|
serverUrl = await promptServerUrl(serverUrl);
|
|
}
|
|
}
|
|
|
|
// Prompt for password
|
|
const existingPassword = resolvedAccount.config.password;
|
|
const existingPasswordText = normalizeSecretInputString(existingPassword);
|
|
const hasConfiguredPassword = hasConfiguredSecretInput(existingPassword);
|
|
let password: unknown = existingPasswordText;
|
|
if (!hasConfiguredPassword) {
|
|
await prompter.note(
|
|
[
|
|
"Enter the BlueBubbles server password.",
|
|
"Find this in the BlueBubbles Server app under Settings.",
|
|
].join("\n"),
|
|
"BlueBubbles password",
|
|
);
|
|
const entered = await prompter.text({
|
|
message: "BlueBubbles password",
|
|
validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
|
|
});
|
|
password = String(entered).trim();
|
|
} else {
|
|
const keepPassword = await prompter.confirm({
|
|
message: "BlueBubbles password already set. Keep it?",
|
|
initialValue: true,
|
|
});
|
|
if (!keepPassword) {
|
|
const entered = await prompter.text({
|
|
message: "BlueBubbles password",
|
|
validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
|
|
});
|
|
password = String(entered).trim();
|
|
} else if (!existingPasswordText) {
|
|
password = existingPassword;
|
|
}
|
|
}
|
|
|
|
// Prompt for webhook path (optional)
|
|
const existingWebhookPath = resolvedAccount.config.webhookPath?.trim();
|
|
const wantsWebhook = await prompter.confirm({
|
|
message: "Configure a custom webhook path? (default: /bluebubbles-webhook)",
|
|
initialValue: Boolean(existingWebhookPath && existingWebhookPath !== "/bluebubbles-webhook"),
|
|
});
|
|
let webhookPath = "/bluebubbles-webhook";
|
|
if (wantsWebhook) {
|
|
const entered = await prompter.text({
|
|
message: "Webhook path",
|
|
placeholder: "/bluebubbles-webhook",
|
|
initialValue: existingWebhookPath || "/bluebubbles-webhook",
|
|
validate: (value) => {
|
|
const trimmed = String(value ?? "").trim();
|
|
if (!trimmed) {
|
|
return "Required";
|
|
}
|
|
if (!trimmed.startsWith("/")) {
|
|
return "Path must start with /";
|
|
}
|
|
return undefined;
|
|
},
|
|
});
|
|
webhookPath = String(entered).trim();
|
|
}
|
|
|
|
// Apply config
|
|
if (accountId === DEFAULT_ACCOUNT_ID) {
|
|
next = {
|
|
...next,
|
|
channels: {
|
|
...next.channels,
|
|
bluebubbles: {
|
|
...next.channels?.bluebubbles,
|
|
enabled: true,
|
|
serverUrl,
|
|
password,
|
|
webhookPath,
|
|
},
|
|
},
|
|
};
|
|
} else {
|
|
next = {
|
|
...next,
|
|
channels: {
|
|
...next.channels,
|
|
bluebubbles: {
|
|
...next.channels?.bluebubbles,
|
|
enabled: true,
|
|
accounts: {
|
|
...next.channels?.bluebubbles?.accounts,
|
|
[accountId]: {
|
|
...next.channels?.bluebubbles?.accounts?.[accountId],
|
|
enabled: next.channels?.bluebubbles?.accounts?.[accountId]?.enabled ?? true,
|
|
serverUrl,
|
|
password,
|
|
webhookPath,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
await prompter.note(
|
|
[
|
|
"Configure the webhook URL in BlueBubbles Server:",
|
|
"1. Open BlueBubbles Server → Settings → Webhooks",
|
|
"2. Add your OpenClaw gateway URL + webhook path",
|
|
" Example: https://your-gateway-host:3000/bluebubbles-webhook",
|
|
"3. Enable the webhook and save",
|
|
"",
|
|
`Docs: ${formatDocsLink("/channels/bluebubbles", "bluebubbles")}`,
|
|
].join("\n"),
|
|
"BlueBubbles next steps",
|
|
);
|
|
|
|
return { cfg: next, accountId };
|
|
},
|
|
dmPolicy,
|
|
disable: (cfg) => ({
|
|
...cfg,
|
|
channels: {
|
|
...cfg.channels,
|
|
bluebubbles: { ...cfg.channels?.bluebubbles, enabled: false },
|
|
},
|
|
}),
|
|
};
|