mirror of
https://github.com/moltbot/moltbot.git
synced 2026-03-07 22:44:16 +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>
257 lines
8.5 KiB
TypeScript
257 lines
8.5 KiB
TypeScript
import { formatCliCommand } from "../../../cli/command-format.js";
|
|
import type { OpenClawConfig } from "../../../config/config.js";
|
|
import { hasConfiguredSecretInput } from "../../../config/types.secrets.js";
|
|
import { DEFAULT_ACCOUNT_ID } from "../../../routing/session-key.js";
|
|
import {
|
|
listTelegramAccountIds,
|
|
resolveDefaultTelegramAccountId,
|
|
resolveTelegramAccount,
|
|
} from "../../../telegram/accounts.js";
|
|
import { formatDocsLink } from "../../../terminal/links.js";
|
|
import type { WizardPrompter } from "../../../wizard/prompts.js";
|
|
import { fetchTelegramChatId } from "../../telegram/api.js";
|
|
import type { ChannelOnboardingAdapter, ChannelOnboardingDmPolicy } from "../onboarding-types.js";
|
|
import {
|
|
applySingleTokenPromptResult,
|
|
patchChannelConfigForAccount,
|
|
promptSingleChannelSecretInput,
|
|
promptResolvedAllowFrom,
|
|
resolveAccountIdForConfigure,
|
|
resolveOnboardingAccountId,
|
|
setChannelDmPolicyWithAllowFrom,
|
|
setOnboardingChannelEnabled,
|
|
splitOnboardingEntries,
|
|
} from "./helpers.js";
|
|
|
|
const channel = "telegram" as const;
|
|
|
|
async function noteTelegramTokenHelp(prompter: WizardPrompter): Promise<void> {
|
|
await prompter.note(
|
|
[
|
|
"1) Open Telegram and chat with @BotFather",
|
|
"2) Run /newbot (or /mybots)",
|
|
"3) Copy the token (looks like 123456:ABC...)",
|
|
"Tip: you can also set TELEGRAM_BOT_TOKEN in your env.",
|
|
`Docs: ${formatDocsLink("/telegram")}`,
|
|
"Website: https://openclaw.ai",
|
|
].join("\n"),
|
|
"Telegram bot token",
|
|
);
|
|
}
|
|
|
|
async function noteTelegramUserIdHelp(prompter: WizardPrompter): Promise<void> {
|
|
await prompter.note(
|
|
[
|
|
`1) DM your bot, then read from.id in \`${formatCliCommand("openclaw logs --follow")}\` (safest)`,
|
|
"2) Or call https://api.telegram.org/bot<bot_token>/getUpdates and read message.from.id",
|
|
"3) Third-party: DM @userinfobot or @getidsbot",
|
|
`Docs: ${formatDocsLink("/telegram")}`,
|
|
"Website: https://openclaw.ai",
|
|
].join("\n"),
|
|
"Telegram user id",
|
|
);
|
|
}
|
|
|
|
export function normalizeTelegramAllowFromInput(raw: string): string {
|
|
return raw
|
|
.trim()
|
|
.replace(/^(telegram|tg):/i, "")
|
|
.trim();
|
|
}
|
|
|
|
export function parseTelegramAllowFromId(raw: string): string | null {
|
|
const stripped = normalizeTelegramAllowFromInput(raw);
|
|
return /^\d+$/.test(stripped) ? stripped : null;
|
|
}
|
|
|
|
async function promptTelegramAllowFrom(params: {
|
|
cfg: OpenClawConfig;
|
|
prompter: WizardPrompter;
|
|
accountId: string;
|
|
tokenOverride?: string;
|
|
}): Promise<OpenClawConfig> {
|
|
const { cfg, prompter, accountId } = params;
|
|
const resolved = resolveTelegramAccount({ cfg, accountId });
|
|
const existingAllowFrom = resolved.config.allowFrom ?? [];
|
|
await noteTelegramUserIdHelp(prompter);
|
|
|
|
const token = params.tokenOverride?.trim() || resolved.token;
|
|
if (!token) {
|
|
await prompter.note("Telegram token missing; username lookup is unavailable.", "Telegram");
|
|
}
|
|
const unique = await promptResolvedAllowFrom({
|
|
prompter,
|
|
existing: existingAllowFrom,
|
|
token,
|
|
message: "Telegram allowFrom (numeric sender id; @username resolves to id)",
|
|
placeholder: "@username",
|
|
label: "Telegram allowlist",
|
|
parseInputs: splitOnboardingEntries,
|
|
parseId: parseTelegramAllowFromId,
|
|
invalidWithoutTokenNote:
|
|
"Telegram token missing; use numeric sender ids (usernames require a bot token).",
|
|
resolveEntries: async ({ token: tokenValue, entries }) => {
|
|
const results = await Promise.all(
|
|
entries.map(async (entry) => {
|
|
const numericId = parseTelegramAllowFromId(entry);
|
|
if (numericId) {
|
|
return { input: entry, resolved: true, id: numericId };
|
|
}
|
|
const stripped = normalizeTelegramAllowFromInput(entry);
|
|
if (!stripped) {
|
|
return { input: entry, resolved: false, id: null };
|
|
}
|
|
const username = stripped.startsWith("@") ? stripped : `@${stripped}`;
|
|
const id = await fetchTelegramChatId({ token: tokenValue, chatId: username });
|
|
return { input: entry, resolved: Boolean(id), id };
|
|
}),
|
|
);
|
|
return results;
|
|
},
|
|
});
|
|
|
|
return patchChannelConfigForAccount({
|
|
cfg,
|
|
channel: "telegram",
|
|
accountId,
|
|
patch: { dmPolicy: "allowlist", allowFrom: unique },
|
|
});
|
|
}
|
|
|
|
async function promptTelegramAllowFromForAccount(params: {
|
|
cfg: OpenClawConfig;
|
|
prompter: WizardPrompter;
|
|
accountId?: string;
|
|
}): Promise<OpenClawConfig> {
|
|
const accountId = resolveOnboardingAccountId({
|
|
accountId: params.accountId,
|
|
defaultAccountId: resolveDefaultTelegramAccountId(params.cfg),
|
|
});
|
|
return promptTelegramAllowFrom({
|
|
cfg: params.cfg,
|
|
prompter: params.prompter,
|
|
accountId,
|
|
});
|
|
}
|
|
|
|
const dmPolicy: ChannelOnboardingDmPolicy = {
|
|
label: "Telegram",
|
|
channel,
|
|
policyKey: "channels.telegram.dmPolicy",
|
|
allowFromKey: "channels.telegram.allowFrom",
|
|
getCurrent: (cfg) => cfg.channels?.telegram?.dmPolicy ?? "pairing",
|
|
setPolicy: (cfg, policy) =>
|
|
setChannelDmPolicyWithAllowFrom({
|
|
cfg,
|
|
channel: "telegram",
|
|
dmPolicy: policy,
|
|
}),
|
|
promptAllowFrom: promptTelegramAllowFromForAccount,
|
|
};
|
|
|
|
export const telegramOnboardingAdapter: ChannelOnboardingAdapter = {
|
|
channel,
|
|
getStatus: async ({ cfg }) => {
|
|
const configured = listTelegramAccountIds(cfg).some((accountId) => {
|
|
const account = resolveTelegramAccount({ cfg, accountId });
|
|
return (
|
|
Boolean(account.token) ||
|
|
Boolean(account.config.tokenFile?.trim()) ||
|
|
hasConfiguredSecretInput(account.config.botToken)
|
|
);
|
|
});
|
|
return {
|
|
channel,
|
|
configured,
|
|
statusLines: [`Telegram: ${configured ? "configured" : "needs token"}`],
|
|
selectionHint: configured ? "recommended · configured" : "recommended · newcomer-friendly",
|
|
quickstartScore: configured ? 1 : 10,
|
|
};
|
|
},
|
|
configure: async ({
|
|
cfg,
|
|
prompter,
|
|
options,
|
|
accountOverrides,
|
|
shouldPromptAccountIds,
|
|
forceAllowFrom,
|
|
}) => {
|
|
const defaultTelegramAccountId = resolveDefaultTelegramAccountId(cfg);
|
|
const telegramAccountId = await resolveAccountIdForConfigure({
|
|
cfg,
|
|
prompter,
|
|
label: "Telegram",
|
|
accountOverride: accountOverrides.telegram,
|
|
shouldPromptAccountIds,
|
|
listAccountIds: listTelegramAccountIds,
|
|
defaultAccountId: defaultTelegramAccountId,
|
|
});
|
|
|
|
let next = cfg;
|
|
const resolvedAccount = resolveTelegramAccount({
|
|
cfg: next,
|
|
accountId: telegramAccountId,
|
|
});
|
|
const hasConfiguredBotToken = hasConfiguredSecretInput(resolvedAccount.config.botToken);
|
|
const hasConfigToken =
|
|
hasConfiguredBotToken || Boolean(resolvedAccount.config.tokenFile?.trim());
|
|
const accountConfigured = Boolean(resolvedAccount.token) || hasConfigToken;
|
|
const allowEnv = telegramAccountId === DEFAULT_ACCOUNT_ID;
|
|
const canUseEnv =
|
|
allowEnv && !hasConfigToken && Boolean(process.env.TELEGRAM_BOT_TOKEN?.trim());
|
|
|
|
if (!accountConfigured) {
|
|
await noteTelegramTokenHelp(prompter);
|
|
}
|
|
|
|
const tokenResult = await promptSingleChannelSecretInput({
|
|
cfg: next,
|
|
prompter,
|
|
providerHint: "telegram",
|
|
credentialLabel: "Telegram bot token",
|
|
secretInputMode: options?.secretInputMode,
|
|
accountConfigured,
|
|
canUseEnv,
|
|
hasConfigToken,
|
|
envPrompt: "TELEGRAM_BOT_TOKEN detected. Use env var?",
|
|
keepPrompt: "Telegram token already configured. Keep it?",
|
|
inputPrompt: "Enter Telegram bot token",
|
|
preferredEnvVar: allowEnv ? "TELEGRAM_BOT_TOKEN" : undefined,
|
|
});
|
|
|
|
let resolvedTokenForAllowFrom: string | undefined;
|
|
if (tokenResult.action === "use-env") {
|
|
next = applySingleTokenPromptResult({
|
|
cfg: next,
|
|
channel: "telegram",
|
|
accountId: telegramAccountId,
|
|
tokenPatchKey: "botToken",
|
|
tokenResult: { useEnv: true, token: null },
|
|
});
|
|
resolvedTokenForAllowFrom = process.env.TELEGRAM_BOT_TOKEN?.trim() || undefined;
|
|
} else if (tokenResult.action === "set") {
|
|
next = applySingleTokenPromptResult({
|
|
cfg: next,
|
|
channel: "telegram",
|
|
accountId: telegramAccountId,
|
|
tokenPatchKey: "botToken",
|
|
tokenResult: { useEnv: false, token: tokenResult.value },
|
|
});
|
|
resolvedTokenForAllowFrom = tokenResult.resolvedValue;
|
|
}
|
|
|
|
if (forceAllowFrom) {
|
|
next = await promptTelegramAllowFrom({
|
|
cfg: next,
|
|
prompter,
|
|
accountId: telegramAccountId,
|
|
tokenOverride: resolvedTokenForAllowFrom,
|
|
});
|
|
}
|
|
|
|
return { cfg: next, accountId: telegramAccountId };
|
|
},
|
|
dmPolicy,
|
|
disable: (cfg) => setOnboardingChannelEnabled(cfg, channel, false),
|
|
};
|