mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-24 08:21: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>
175 lines
4.6 KiB
TypeScript
175 lines
4.6 KiB
TypeScript
import { fetchDiscord } from "./api.js";
|
|
import { listGuilds, type DiscordGuildSummary } from "./guilds.js";
|
|
import { normalizeDiscordSlug } from "./monitor/allow-list.js";
|
|
import { normalizeDiscordToken } from "./token.js";
|
|
|
|
type DiscordUser = {
|
|
id: string;
|
|
username: string;
|
|
discriminator?: string;
|
|
global_name?: string;
|
|
bot?: boolean;
|
|
};
|
|
|
|
type DiscordMember = {
|
|
user: DiscordUser;
|
|
nick?: string | null;
|
|
};
|
|
|
|
export type DiscordUserResolution = {
|
|
input: string;
|
|
resolved: boolean;
|
|
id?: string;
|
|
name?: string;
|
|
guildId?: string;
|
|
guildName?: string;
|
|
note?: string;
|
|
};
|
|
|
|
function parseDiscordUserInput(raw: string): {
|
|
userId?: string;
|
|
guildId?: string;
|
|
guildName?: string;
|
|
userName?: string;
|
|
} {
|
|
const trimmed = raw.trim();
|
|
if (!trimmed) {
|
|
return {};
|
|
}
|
|
const mention = trimmed.match(/^<@!?(\d+)>$/);
|
|
if (mention) {
|
|
return { userId: mention[1] };
|
|
}
|
|
const prefixed = trimmed.match(/^(?:user:|discord:)?(\d+)$/i);
|
|
if (prefixed) {
|
|
return { userId: prefixed[1] };
|
|
}
|
|
const split = trimmed.includes("/") ? trimmed.split("/") : trimmed.split("#");
|
|
if (split.length >= 2) {
|
|
const guild = split[0]?.trim();
|
|
const user = split.slice(1).join("#").trim();
|
|
if (guild && /^\d+$/.test(guild)) {
|
|
return { guildId: guild, userName: user };
|
|
}
|
|
return { guildName: guild, userName: user };
|
|
}
|
|
return { userName: trimmed.replace(/^@/, "") };
|
|
}
|
|
|
|
function scoreDiscordMember(member: DiscordMember, query: string): number {
|
|
const q = query.toLowerCase();
|
|
const user = member.user;
|
|
const candidates = [user.username, user.global_name, member.nick ?? undefined]
|
|
.map((value) => value?.toLowerCase())
|
|
.filter(Boolean) as string[];
|
|
let score = 0;
|
|
if (candidates.some((value) => value === q)) {
|
|
score += 3;
|
|
}
|
|
if (candidates.some((value) => value?.includes(q))) {
|
|
score += 1;
|
|
}
|
|
if (!user.bot) {
|
|
score += 1;
|
|
}
|
|
return score;
|
|
}
|
|
|
|
export async function resolveDiscordUserAllowlist(params: {
|
|
token: string;
|
|
entries: string[];
|
|
fetcher?: typeof fetch;
|
|
}): Promise<DiscordUserResolution[]> {
|
|
const token = normalizeDiscordToken(params.token, "channels.discord.token");
|
|
if (!token) {
|
|
return params.entries.map((input) => ({
|
|
input,
|
|
resolved: false,
|
|
}));
|
|
}
|
|
const fetcher = params.fetcher ?? fetch;
|
|
|
|
// Lazy-load guilds: only fetch when an entry actually needs username search.
|
|
// This prevents listGuilds() failures (permissions, network) from blocking
|
|
// resolution of plain user-id entries that don't need guild data at all.
|
|
let guilds: DiscordGuildSummary[] | null = null;
|
|
const getGuilds = async (): Promise<DiscordGuildSummary[]> => {
|
|
if (!guilds) {
|
|
guilds = await listGuilds(token, fetcher);
|
|
}
|
|
return guilds;
|
|
};
|
|
|
|
const results: DiscordUserResolution[] = [];
|
|
|
|
for (const input of params.entries) {
|
|
const parsed = parseDiscordUserInput(input);
|
|
if (parsed.userId) {
|
|
results.push({
|
|
input,
|
|
resolved: true,
|
|
id: parsed.userId,
|
|
});
|
|
continue;
|
|
}
|
|
|
|
const query = parsed.userName?.trim();
|
|
if (!query) {
|
|
results.push({ input, resolved: false });
|
|
continue;
|
|
}
|
|
|
|
const guildName = parsed.guildName?.trim();
|
|
const allGuilds = await getGuilds();
|
|
const guildList = parsed.guildId
|
|
? allGuilds.filter((g) => g.id === parsed.guildId)
|
|
: guildName
|
|
? allGuilds.filter((g) => g.slug === normalizeDiscordSlug(guildName))
|
|
: allGuilds;
|
|
|
|
let best: { member: DiscordMember; guild: DiscordGuildSummary; score: number } | null = null;
|
|
let matches = 0;
|
|
|
|
for (const guild of guildList) {
|
|
const paramsObj = new URLSearchParams({
|
|
query,
|
|
limit: "25",
|
|
});
|
|
const members = await fetchDiscord<DiscordMember[]>(
|
|
`/guilds/${guild.id}/members/search?${paramsObj.toString()}`,
|
|
token,
|
|
fetcher,
|
|
);
|
|
for (const member of members) {
|
|
const score = scoreDiscordMember(member, query);
|
|
if (score === 0) {
|
|
continue;
|
|
}
|
|
matches += 1;
|
|
if (!best || score > best.score) {
|
|
best = { member, guild, score };
|
|
}
|
|
}
|
|
}
|
|
|
|
if (best) {
|
|
const user = best.member.user;
|
|
const name =
|
|
best.member.nick?.trim() || user.global_name?.trim() || user.username?.trim() || undefined;
|
|
results.push({
|
|
input,
|
|
resolved: true,
|
|
id: user.id,
|
|
name,
|
|
guildId: best.guild.id,
|
|
guildName: best.guild.name,
|
|
note: matches > 1 ? "multiple matches; chose best" : undefined,
|
|
});
|
|
} else {
|
|
results.push({ input, resolved: false });
|
|
}
|
|
}
|
|
|
|
return results;
|
|
}
|