* 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>
165 lines
5.2 KiB
TypeScript
165 lines
5.2 KiB
TypeScript
import type { BaseProbeResult } from "openclaw/plugin-sdk";
|
|
import { normalizeSecretInputString } from "./secret-input.js";
|
|
import { buildBlueBubblesApiUrl, blueBubblesFetchWithTimeout } from "./types.js";
|
|
|
|
export type BlueBubblesProbe = BaseProbeResult & {
|
|
status?: number | null;
|
|
};
|
|
|
|
export type BlueBubblesServerInfo = {
|
|
os_version?: string;
|
|
server_version?: string;
|
|
private_api?: boolean;
|
|
helper_connected?: boolean;
|
|
proxy_service?: string;
|
|
detected_icloud?: string;
|
|
computer_id?: string;
|
|
};
|
|
|
|
/** Cache server info by account ID to avoid repeated API calls.
|
|
* Size-capped to prevent unbounded growth (#4948). */
|
|
const MAX_SERVER_INFO_CACHE_SIZE = 64;
|
|
const serverInfoCache = new Map<string, { info: BlueBubblesServerInfo; expires: number }>();
|
|
const CACHE_TTL_MS = 10 * 60 * 1000; // 10 minutes
|
|
|
|
function buildCacheKey(accountId?: string): string {
|
|
return accountId?.trim() || "default";
|
|
}
|
|
|
|
/**
|
|
* Fetch server info from BlueBubbles API and cache it.
|
|
* Returns cached result if available and not expired.
|
|
*/
|
|
export async function fetchBlueBubblesServerInfo(params: {
|
|
baseUrl?: string | null;
|
|
password?: string | null;
|
|
accountId?: string;
|
|
timeoutMs?: number;
|
|
}): Promise<BlueBubblesServerInfo | null> {
|
|
const baseUrl = normalizeSecretInputString(params.baseUrl);
|
|
const password = normalizeSecretInputString(params.password);
|
|
if (!baseUrl || !password) {
|
|
return null;
|
|
}
|
|
|
|
const cacheKey = buildCacheKey(params.accountId);
|
|
const cached = serverInfoCache.get(cacheKey);
|
|
if (cached && cached.expires > Date.now()) {
|
|
return cached.info;
|
|
}
|
|
|
|
const url = buildBlueBubblesApiUrl({ baseUrl, path: "/api/v1/server/info", password });
|
|
try {
|
|
const res = await blueBubblesFetchWithTimeout(url, { method: "GET" }, params.timeoutMs ?? 5000);
|
|
if (!res.ok) {
|
|
return null;
|
|
}
|
|
const payload = (await res.json().catch(() => null)) as Record<string, unknown> | null;
|
|
const data = payload?.data as BlueBubblesServerInfo | undefined;
|
|
if (data) {
|
|
serverInfoCache.set(cacheKey, { info: data, expires: Date.now() + CACHE_TTL_MS });
|
|
// Evict oldest entries if cache exceeds max size
|
|
if (serverInfoCache.size > MAX_SERVER_INFO_CACHE_SIZE) {
|
|
const oldest = serverInfoCache.keys().next().value;
|
|
if (oldest !== undefined) {
|
|
serverInfoCache.delete(oldest);
|
|
}
|
|
}
|
|
}
|
|
return data ?? null;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get cached server info synchronously (for use in listActions).
|
|
* Returns null if not cached or expired.
|
|
*/
|
|
export function getCachedBlueBubblesServerInfo(accountId?: string): BlueBubblesServerInfo | null {
|
|
const cacheKey = buildCacheKey(accountId);
|
|
const cached = serverInfoCache.get(cacheKey);
|
|
if (cached && cached.expires > Date.now()) {
|
|
return cached.info;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Read cached private API capability for a BlueBubbles account.
|
|
* Returns null when capability is unknown (for example, before first probe).
|
|
*/
|
|
export function getCachedBlueBubblesPrivateApiStatus(accountId?: string): boolean | null {
|
|
const info = getCachedBlueBubblesServerInfo(accountId);
|
|
if (!info || typeof info.private_api !== "boolean") {
|
|
return null;
|
|
}
|
|
return info.private_api;
|
|
}
|
|
|
|
export function isBlueBubblesPrivateApiStatusEnabled(status: boolean | null): boolean {
|
|
return status === true;
|
|
}
|
|
|
|
export function isBlueBubblesPrivateApiEnabled(accountId?: string): boolean {
|
|
return isBlueBubblesPrivateApiStatusEnabled(getCachedBlueBubblesPrivateApiStatus(accountId));
|
|
}
|
|
|
|
/**
|
|
* Parse macOS version string (e.g., "15.0.1" or "26.0") into major version number.
|
|
*/
|
|
export function parseMacOSMajorVersion(version?: string | null): number | null {
|
|
if (!version) {
|
|
return null;
|
|
}
|
|
const match = /^(\d+)/.exec(version.trim());
|
|
return match ? Number.parseInt(match[1], 10) : null;
|
|
}
|
|
|
|
/**
|
|
* Check if the cached server info indicates macOS 26 or higher.
|
|
* Returns false if no cached info is available (fail open for action listing).
|
|
*/
|
|
export function isMacOS26OrHigher(accountId?: string): boolean {
|
|
const info = getCachedBlueBubblesServerInfo(accountId);
|
|
if (!info?.os_version) {
|
|
return false;
|
|
}
|
|
const major = parseMacOSMajorVersion(info.os_version);
|
|
return major !== null && major >= 26;
|
|
}
|
|
|
|
/** Clear the server info cache (for testing) */
|
|
export function clearServerInfoCache(): void {
|
|
serverInfoCache.clear();
|
|
}
|
|
|
|
export async function probeBlueBubbles(params: {
|
|
baseUrl?: string | null;
|
|
password?: string | null;
|
|
timeoutMs?: number;
|
|
}): Promise<BlueBubblesProbe> {
|
|
const baseUrl = normalizeSecretInputString(params.baseUrl);
|
|
const password = normalizeSecretInputString(params.password);
|
|
if (!baseUrl) {
|
|
return { ok: false, error: "serverUrl not configured" };
|
|
}
|
|
if (!password) {
|
|
return { ok: false, error: "password not configured" };
|
|
}
|
|
const url = buildBlueBubblesApiUrl({ baseUrl, path: "/api/v1/ping", password });
|
|
try {
|
|
const res = await blueBubblesFetchWithTimeout(url, { method: "GET" }, params.timeoutMs);
|
|
if (!res.ok) {
|
|
return { ok: false, status: res.status, error: `HTTP ${res.status}` };
|
|
}
|
|
return { ok: true, status: res.status };
|
|
} catch (err) {
|
|
return {
|
|
ok: false,
|
|
status: null,
|
|
error: err instanceof Error ? err.message : String(err),
|
|
};
|
|
}
|
|
}
|