mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-12 07:20:45 +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>
326 lines
11 KiB
TypeScript
326 lines
11 KiB
TypeScript
import type { OpenClawConfig } from "../../../config/config.js";
|
|
import type { DiscordGuildEntry } from "../../../config/types.discord.js";
|
|
import { hasConfiguredSecretInput } from "../../../config/types.secrets.js";
|
|
import {
|
|
listDiscordAccountIds,
|
|
resolveDefaultDiscordAccountId,
|
|
resolveDiscordAccount,
|
|
} from "../../../discord/accounts.js";
|
|
import { normalizeDiscordSlug } from "../../../discord/monitor/allow-list.js";
|
|
import {
|
|
resolveDiscordChannelAllowlist,
|
|
type DiscordChannelResolution,
|
|
} from "../../../discord/resolve-channels.js";
|
|
import { resolveDiscordUserAllowlist } from "../../../discord/resolve-users.js";
|
|
import { DEFAULT_ACCOUNT_ID } from "../../../routing/session-key.js";
|
|
import { formatDocsLink } from "../../../terminal/links.js";
|
|
import type { WizardPrompter } from "../../../wizard/prompts.js";
|
|
import type { ChannelOnboardingAdapter, ChannelOnboardingDmPolicy } from "../onboarding-types.js";
|
|
import { configureChannelAccessWithAllowlist } from "./channel-access-configure.js";
|
|
import {
|
|
applySingleTokenPromptResult,
|
|
parseMentionOrPrefixedId,
|
|
noteChannelLookupFailure,
|
|
noteChannelLookupSummary,
|
|
patchChannelConfigForAccount,
|
|
promptLegacyChannelAllowFrom,
|
|
promptSingleChannelSecretInput,
|
|
resolveAccountIdForConfigure,
|
|
resolveOnboardingAccountId,
|
|
setAccountGroupPolicyForChannel,
|
|
setLegacyChannelDmPolicyWithAllowFrom,
|
|
setOnboardingChannelEnabled,
|
|
} from "./helpers.js";
|
|
|
|
const channel = "discord" as const;
|
|
|
|
async function noteDiscordTokenHelp(prompter: WizardPrompter): Promise<void> {
|
|
await prompter.note(
|
|
[
|
|
"1) Discord Developer Portal → Applications → New Application",
|
|
"2) Bot → Add Bot → Reset Token → copy token",
|
|
"3) OAuth2 → URL Generator → scope 'bot' → invite to your server",
|
|
"Tip: enable Message Content Intent if you need message text. (Bot → Privileged Gateway Intents → Message Content Intent)",
|
|
`Docs: ${formatDocsLink("/discord", "discord")}`,
|
|
].join("\n"),
|
|
"Discord bot token",
|
|
);
|
|
}
|
|
|
|
function setDiscordGuildChannelAllowlist(
|
|
cfg: OpenClawConfig,
|
|
accountId: string,
|
|
entries: Array<{
|
|
guildKey: string;
|
|
channelKey?: string;
|
|
}>,
|
|
): OpenClawConfig {
|
|
const baseGuilds =
|
|
accountId === DEFAULT_ACCOUNT_ID
|
|
? (cfg.channels?.discord?.guilds ?? {})
|
|
: (cfg.channels?.discord?.accounts?.[accountId]?.guilds ?? {});
|
|
const guilds: Record<string, DiscordGuildEntry> = { ...baseGuilds };
|
|
for (const entry of entries) {
|
|
const guildKey = entry.guildKey || "*";
|
|
const existing = guilds[guildKey] ?? {};
|
|
if (entry.channelKey) {
|
|
const channels = { ...existing.channels };
|
|
channels[entry.channelKey] = { allow: true };
|
|
guilds[guildKey] = { ...existing, channels };
|
|
} else {
|
|
guilds[guildKey] = existing;
|
|
}
|
|
}
|
|
return patchChannelConfigForAccount({
|
|
cfg,
|
|
channel: "discord",
|
|
accountId,
|
|
patch: { guilds },
|
|
});
|
|
}
|
|
|
|
async function promptDiscordAllowFrom(params: {
|
|
cfg: OpenClawConfig;
|
|
prompter: WizardPrompter;
|
|
accountId?: string;
|
|
}): Promise<OpenClawConfig> {
|
|
const accountId = resolveOnboardingAccountId({
|
|
accountId: params.accountId,
|
|
defaultAccountId: resolveDefaultDiscordAccountId(params.cfg),
|
|
});
|
|
const resolved = resolveDiscordAccount({ cfg: params.cfg, accountId });
|
|
const token = resolved.token;
|
|
const existing =
|
|
params.cfg.channels?.discord?.allowFrom ?? params.cfg.channels?.discord?.dm?.allowFrom ?? [];
|
|
const parseId = (value: string) =>
|
|
parseMentionOrPrefixedId({
|
|
value,
|
|
mentionPattern: /^<@!?(\d+)>$/,
|
|
prefixPattern: /^(user:|discord:)/i,
|
|
idPattern: /^\d+$/,
|
|
});
|
|
|
|
return promptLegacyChannelAllowFrom({
|
|
cfg: params.cfg,
|
|
channel: "discord",
|
|
prompter: params.prompter,
|
|
existing,
|
|
token,
|
|
noteTitle: "Discord allowlist",
|
|
noteLines: [
|
|
"Allowlist Discord DMs by username (we resolve to user ids).",
|
|
"Examples:",
|
|
"- 123456789012345678",
|
|
"- @alice",
|
|
"- alice#1234",
|
|
"Multiple entries: comma-separated.",
|
|
`Docs: ${formatDocsLink("/discord", "discord")}`,
|
|
],
|
|
message: "Discord allowFrom (usernames or ids)",
|
|
placeholder: "@alice, 123456789012345678",
|
|
parseId,
|
|
invalidWithoutTokenNote: "Bot token missing; use numeric user ids (or mention form) only.",
|
|
resolveEntries: ({ token, entries }) =>
|
|
resolveDiscordUserAllowlist({
|
|
token,
|
|
entries,
|
|
}),
|
|
});
|
|
}
|
|
|
|
const dmPolicy: ChannelOnboardingDmPolicy = {
|
|
label: "Discord",
|
|
channel,
|
|
policyKey: "channels.discord.dmPolicy",
|
|
allowFromKey: "channels.discord.allowFrom",
|
|
getCurrent: (cfg) =>
|
|
cfg.channels?.discord?.dmPolicy ?? cfg.channels?.discord?.dm?.policy ?? "pairing",
|
|
setPolicy: (cfg, policy) =>
|
|
setLegacyChannelDmPolicyWithAllowFrom({
|
|
cfg,
|
|
channel: "discord",
|
|
dmPolicy: policy,
|
|
}),
|
|
promptAllowFrom: promptDiscordAllowFrom,
|
|
};
|
|
|
|
export const discordOnboardingAdapter: ChannelOnboardingAdapter = {
|
|
channel,
|
|
getStatus: async ({ cfg }) => {
|
|
const configured = listDiscordAccountIds(cfg).some((accountId) => {
|
|
const account = resolveDiscordAccount({ cfg, accountId });
|
|
return Boolean(account.token) || hasConfiguredSecretInput(account.config.token);
|
|
});
|
|
return {
|
|
channel,
|
|
configured,
|
|
statusLines: [`Discord: ${configured ? "configured" : "needs token"}`],
|
|
selectionHint: configured ? "configured" : "needs token",
|
|
quickstartScore: configured ? 2 : 1,
|
|
};
|
|
},
|
|
configure: async ({ cfg, prompter, options, accountOverrides, shouldPromptAccountIds }) => {
|
|
const defaultDiscordAccountId = resolveDefaultDiscordAccountId(cfg);
|
|
const discordAccountId = await resolveAccountIdForConfigure({
|
|
cfg,
|
|
prompter,
|
|
label: "Discord",
|
|
accountOverride: accountOverrides.discord,
|
|
shouldPromptAccountIds,
|
|
listAccountIds: listDiscordAccountIds,
|
|
defaultAccountId: defaultDiscordAccountId,
|
|
});
|
|
|
|
let next = cfg;
|
|
const resolvedAccount = resolveDiscordAccount({
|
|
cfg: next,
|
|
accountId: discordAccountId,
|
|
});
|
|
const hasConfigToken = hasConfiguredSecretInput(resolvedAccount.config.token);
|
|
const accountConfigured = Boolean(resolvedAccount.token) || hasConfigToken;
|
|
const allowEnv = discordAccountId === DEFAULT_ACCOUNT_ID;
|
|
const canUseEnv = allowEnv && !hasConfigToken && Boolean(process.env.DISCORD_BOT_TOKEN?.trim());
|
|
|
|
if (!accountConfigured) {
|
|
await noteDiscordTokenHelp(prompter);
|
|
}
|
|
|
|
const tokenResult = await promptSingleChannelSecretInput({
|
|
cfg: next,
|
|
prompter,
|
|
providerHint: "discord",
|
|
credentialLabel: "Discord bot token",
|
|
secretInputMode: options?.secretInputMode,
|
|
accountConfigured,
|
|
canUseEnv,
|
|
hasConfigToken,
|
|
envPrompt: "DISCORD_BOT_TOKEN detected. Use env var?",
|
|
keepPrompt: "Discord token already configured. Keep it?",
|
|
inputPrompt: "Enter Discord bot token",
|
|
preferredEnvVar: allowEnv ? "DISCORD_BOT_TOKEN" : undefined,
|
|
});
|
|
|
|
let resolvedTokenForAllowlist: string | undefined;
|
|
if (tokenResult.action === "use-env") {
|
|
next = applySingleTokenPromptResult({
|
|
cfg: next,
|
|
channel: "discord",
|
|
accountId: discordAccountId,
|
|
tokenPatchKey: "token",
|
|
tokenResult: { useEnv: true, token: null },
|
|
});
|
|
resolvedTokenForAllowlist = process.env.DISCORD_BOT_TOKEN?.trim() || undefined;
|
|
} else if (tokenResult.action === "set") {
|
|
next = applySingleTokenPromptResult({
|
|
cfg: next,
|
|
channel: "discord",
|
|
accountId: discordAccountId,
|
|
tokenPatchKey: "token",
|
|
tokenResult: { useEnv: false, token: tokenResult.value },
|
|
});
|
|
resolvedTokenForAllowlist = tokenResult.resolvedValue;
|
|
}
|
|
|
|
const currentEntries = Object.entries(resolvedAccount.config.guilds ?? {}).flatMap(
|
|
([guildKey, value]) => {
|
|
const channels = value?.channels ?? {};
|
|
const channelKeys = Object.keys(channels);
|
|
if (channelKeys.length === 0) {
|
|
const input = /^\d+$/.test(guildKey) ? `guild:${guildKey}` : guildKey;
|
|
return [input];
|
|
}
|
|
return channelKeys.map((channelKey) => `${guildKey}/${channelKey}`);
|
|
},
|
|
);
|
|
next = await configureChannelAccessWithAllowlist({
|
|
cfg: next,
|
|
prompter,
|
|
label: "Discord channels",
|
|
currentPolicy: resolvedAccount.config.groupPolicy ?? "allowlist",
|
|
currentEntries,
|
|
placeholder: "My Server/#general, guildId/channelId, #support",
|
|
updatePrompt: Boolean(resolvedAccount.config.guilds),
|
|
setPolicy: (cfg, policy) =>
|
|
setAccountGroupPolicyForChannel({
|
|
cfg,
|
|
channel: "discord",
|
|
accountId: discordAccountId,
|
|
groupPolicy: policy,
|
|
}),
|
|
resolveAllowlist: async ({ cfg, entries }) => {
|
|
const accountWithTokens = resolveDiscordAccount({
|
|
cfg,
|
|
accountId: discordAccountId,
|
|
});
|
|
let resolved: DiscordChannelResolution[] = entries.map((input) => ({
|
|
input,
|
|
resolved: false,
|
|
}));
|
|
const activeToken = accountWithTokens.token || resolvedTokenForAllowlist || "";
|
|
if (activeToken && entries.length > 0) {
|
|
try {
|
|
resolved = await resolveDiscordChannelAllowlist({
|
|
token: activeToken,
|
|
entries,
|
|
});
|
|
const resolvedChannels = resolved.filter((entry) => entry.resolved && entry.channelId);
|
|
const resolvedGuilds = resolved.filter(
|
|
(entry) => entry.resolved && entry.guildId && !entry.channelId,
|
|
);
|
|
const unresolved = resolved
|
|
.filter((entry) => !entry.resolved)
|
|
.map((entry) => entry.input);
|
|
await noteChannelLookupSummary({
|
|
prompter,
|
|
label: "Discord channels",
|
|
resolvedSections: [
|
|
{
|
|
title: "Resolved channels",
|
|
values: resolvedChannels
|
|
.map((entry) => entry.channelId)
|
|
.filter((value): value is string => Boolean(value)),
|
|
},
|
|
{
|
|
title: "Resolved guilds",
|
|
values: resolvedGuilds
|
|
.map((entry) => entry.guildId)
|
|
.filter((value): value is string => Boolean(value)),
|
|
},
|
|
],
|
|
unresolved,
|
|
});
|
|
} catch (err) {
|
|
await noteChannelLookupFailure({
|
|
prompter,
|
|
label: "Discord channels",
|
|
error: err,
|
|
});
|
|
}
|
|
}
|
|
return resolved;
|
|
},
|
|
applyAllowlist: ({ cfg, resolved }) => {
|
|
const allowlistEntries: Array<{ guildKey: string; channelKey?: string }> = [];
|
|
for (const entry of resolved) {
|
|
const guildKey =
|
|
entry.guildId ??
|
|
(entry.guildName ? normalizeDiscordSlug(entry.guildName) : undefined) ??
|
|
"*";
|
|
const channelKey =
|
|
entry.channelId ??
|
|
(entry.channelName ? normalizeDiscordSlug(entry.channelName) : undefined);
|
|
if (!channelKey && guildKey === "*") {
|
|
continue;
|
|
}
|
|
allowlistEntries.push({ guildKey, ...(channelKey ? { channelKey } : {}) });
|
|
}
|
|
return setDiscordGuildChannelAllowlist(cfg, discordAccountId, allowlistEntries);
|
|
},
|
|
});
|
|
|
|
return { cfg: next, accountId: discordAccountId };
|
|
},
|
|
dmPolicy,
|
|
disable: (cfg) => setOnboardingChannelEnabled(cfg, channel, false),
|
|
};
|