mirror of
https://github.com/openclaw/openclaw.git
synced 2026-04-05 22:32:12 +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>
233 lines
7.0 KiB
TypeScript
233 lines
7.0 KiB
TypeScript
import type { BaseProbeResult } from "../channels/plugins/types.js";
|
|
import { resolveFetch } from "../infra/fetch.js";
|
|
import { fetchWithTimeout } from "../utils/fetch-timeout.js";
|
|
import { normalizeDiscordToken } from "./token.js";
|
|
|
|
const DISCORD_API_BASE = "https://discord.com/api/v10";
|
|
|
|
export type DiscordProbe = BaseProbeResult & {
|
|
status?: number | null;
|
|
elapsedMs: number;
|
|
bot?: { id?: string | null; username?: string | null };
|
|
application?: DiscordApplicationSummary;
|
|
};
|
|
|
|
export type DiscordPrivilegedIntentStatus = "enabled" | "limited" | "disabled";
|
|
|
|
export type DiscordPrivilegedIntentsSummary = {
|
|
messageContent: DiscordPrivilegedIntentStatus;
|
|
guildMembers: DiscordPrivilegedIntentStatus;
|
|
presence: DiscordPrivilegedIntentStatus;
|
|
};
|
|
|
|
export type DiscordApplicationSummary = {
|
|
id?: string | null;
|
|
flags?: number | null;
|
|
intents?: DiscordPrivilegedIntentsSummary;
|
|
};
|
|
|
|
const DISCORD_APP_FLAG_GATEWAY_PRESENCE = 1 << 12;
|
|
const DISCORD_APP_FLAG_GATEWAY_PRESENCE_LIMITED = 1 << 13;
|
|
const DISCORD_APP_FLAG_GATEWAY_GUILD_MEMBERS = 1 << 14;
|
|
const DISCORD_APP_FLAG_GATEWAY_GUILD_MEMBERS_LIMITED = 1 << 15;
|
|
const DISCORD_APP_FLAG_GATEWAY_MESSAGE_CONTENT = 1 << 18;
|
|
const DISCORD_APP_FLAG_GATEWAY_MESSAGE_CONTENT_LIMITED = 1 << 19;
|
|
|
|
async function fetchDiscordApplicationMe(
|
|
token: string,
|
|
timeoutMs: number,
|
|
fetcher: typeof fetch,
|
|
): Promise<{ id?: string; flags?: number } | undefined> {
|
|
try {
|
|
const appResponse = await fetchDiscordApplicationMeResponse(token, timeoutMs, fetcher);
|
|
if (!appResponse || !appResponse.ok) {
|
|
return undefined;
|
|
}
|
|
return (await appResponse.json()) as { id?: string; flags?: number };
|
|
} catch {
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
async function fetchDiscordApplicationMeResponse(
|
|
token: string,
|
|
timeoutMs: number,
|
|
fetcher: typeof fetch,
|
|
): Promise<Response | undefined> {
|
|
const normalized = normalizeDiscordToken(token, "channels.discord.token");
|
|
if (!normalized) {
|
|
return undefined;
|
|
}
|
|
return await fetchWithTimeout(
|
|
`${DISCORD_API_BASE}/oauth2/applications/@me`,
|
|
{ headers: { Authorization: `Bot ${normalized}` } },
|
|
timeoutMs,
|
|
getResolvedFetch(fetcher),
|
|
);
|
|
}
|
|
|
|
export function resolveDiscordPrivilegedIntentsFromFlags(
|
|
flags: number,
|
|
): DiscordPrivilegedIntentsSummary {
|
|
const resolve = (enabledBit: number, limitedBit: number) => {
|
|
if ((flags & enabledBit) !== 0) {
|
|
return "enabled";
|
|
}
|
|
if ((flags & limitedBit) !== 0) {
|
|
return "limited";
|
|
}
|
|
return "disabled";
|
|
};
|
|
return {
|
|
presence: resolve(DISCORD_APP_FLAG_GATEWAY_PRESENCE, DISCORD_APP_FLAG_GATEWAY_PRESENCE_LIMITED),
|
|
guildMembers: resolve(
|
|
DISCORD_APP_FLAG_GATEWAY_GUILD_MEMBERS,
|
|
DISCORD_APP_FLAG_GATEWAY_GUILD_MEMBERS_LIMITED,
|
|
),
|
|
messageContent: resolve(
|
|
DISCORD_APP_FLAG_GATEWAY_MESSAGE_CONTENT,
|
|
DISCORD_APP_FLAG_GATEWAY_MESSAGE_CONTENT_LIMITED,
|
|
),
|
|
};
|
|
}
|
|
|
|
export async function fetchDiscordApplicationSummary(
|
|
token: string,
|
|
timeoutMs: number,
|
|
fetcher: typeof fetch = fetch,
|
|
): Promise<DiscordApplicationSummary | undefined> {
|
|
const json = await fetchDiscordApplicationMe(token, timeoutMs, fetcher);
|
|
if (!json) {
|
|
return undefined;
|
|
}
|
|
const flags =
|
|
typeof json.flags === "number" && Number.isFinite(json.flags) ? json.flags : undefined;
|
|
return {
|
|
id: json.id ?? null,
|
|
flags: flags ?? null,
|
|
intents:
|
|
typeof flags === "number" ? resolveDiscordPrivilegedIntentsFromFlags(flags) : undefined,
|
|
};
|
|
}
|
|
|
|
function getResolvedFetch(fetcher: typeof fetch): typeof fetch {
|
|
const fetchImpl = resolveFetch(fetcher);
|
|
if (!fetchImpl) {
|
|
throw new Error("fetch is not available");
|
|
}
|
|
return fetchImpl;
|
|
}
|
|
|
|
export async function probeDiscord(
|
|
token: string,
|
|
timeoutMs: number,
|
|
opts?: { fetcher?: typeof fetch; includeApplication?: boolean },
|
|
): Promise<DiscordProbe> {
|
|
const started = Date.now();
|
|
const fetcher = opts?.fetcher ?? fetch;
|
|
const includeApplication = opts?.includeApplication === true;
|
|
const normalized = normalizeDiscordToken(token, "channels.discord.token");
|
|
const result: DiscordProbe = {
|
|
ok: false,
|
|
status: null,
|
|
error: null,
|
|
elapsedMs: 0,
|
|
};
|
|
if (!normalized) {
|
|
return {
|
|
...result,
|
|
error: "missing token",
|
|
elapsedMs: Date.now() - started,
|
|
};
|
|
}
|
|
try {
|
|
const res = await fetchWithTimeout(
|
|
`${DISCORD_API_BASE}/users/@me`,
|
|
{ headers: { Authorization: `Bot ${normalized}` } },
|
|
timeoutMs,
|
|
getResolvedFetch(fetcher),
|
|
);
|
|
if (!res.ok) {
|
|
result.status = res.status;
|
|
result.error = `getMe failed (${res.status})`;
|
|
return { ...result, elapsedMs: Date.now() - started };
|
|
}
|
|
const json = (await res.json()) as { id?: string; username?: string };
|
|
result.ok = true;
|
|
result.bot = {
|
|
id: json.id ?? null,
|
|
username: json.username ?? null,
|
|
};
|
|
if (includeApplication) {
|
|
result.application =
|
|
(await fetchDiscordApplicationSummary(normalized, timeoutMs, fetcher)) ?? undefined;
|
|
}
|
|
return { ...result, elapsedMs: Date.now() - started };
|
|
} catch (err) {
|
|
return {
|
|
...result,
|
|
status: err instanceof Response ? err.status : result.status,
|
|
error: err instanceof Error ? err.message : String(err),
|
|
elapsedMs: Date.now() - started,
|
|
};
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Extract the application (bot user) ID from a Discord bot token by
|
|
* base64-decoding the first segment. Discord tokens have the format:
|
|
* base64(user_id) . timestamp . hmac
|
|
* The decoded first segment is the numeric snowflake ID as a plain string,
|
|
* so we keep it as a string to avoid precision loss for IDs that exceed
|
|
* Number.MAX_SAFE_INTEGER.
|
|
*/
|
|
export function parseApplicationIdFromToken(token: string): string | undefined {
|
|
const normalized = normalizeDiscordToken(token, "channels.discord.token");
|
|
if (!normalized) {
|
|
return undefined;
|
|
}
|
|
const firstDot = normalized.indexOf(".");
|
|
if (firstDot <= 0) {
|
|
return undefined;
|
|
}
|
|
try {
|
|
const decoded = Buffer.from(normalized.slice(0, firstDot), "base64").toString("utf-8");
|
|
if (/^\d+$/.test(decoded)) {
|
|
return decoded;
|
|
}
|
|
return undefined;
|
|
} catch {
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
export async function fetchDiscordApplicationId(
|
|
token: string,
|
|
timeoutMs: number,
|
|
fetcher: typeof fetch = fetch,
|
|
): Promise<string | undefined> {
|
|
const normalized = normalizeDiscordToken(token, "channels.discord.token");
|
|
if (!normalized) {
|
|
return undefined;
|
|
}
|
|
try {
|
|
const res = await fetchDiscordApplicationMeResponse(token, timeoutMs, fetcher);
|
|
if (!res) {
|
|
return undefined;
|
|
}
|
|
if (res.ok) {
|
|
const json = (await res.json()) as { id?: string };
|
|
if (json?.id) {
|
|
return json.id;
|
|
}
|
|
}
|
|
// Non-ok HTTP response (401, 403, etc.) — fail fast so credential
|
|
// errors surface immediately rather than being masked by the fallback.
|
|
return undefined;
|
|
} catch {
|
|
// Transport / timeout error — fall back to extracting the application
|
|
// ID directly from the token to keep the bot starting.
|
|
return parseApplicationIdFromToken(token);
|
|
}
|
|
}
|