mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-07 22:00:41 +00:00
* fix(bluebubbles): restore inbound image attachments and accept updated-message events Four interconnected fixes for BlueBubbles inbound media: 1. Strip bundled-undici dispatcher from non-SSRF fetch path so attachment downloads no longer silently fail on Node 22+ (#64105, #61861) 2. Accept updated-message webhook events that carry attachments instead of filtering them as non-reaction events (#65430) 3. Include eventType in the persistent GUID dedup key so updated-message follow-ups are not rejected as duplicates of the original new-message (#52277) 4. Retry attachment fetch from BB API (2s delay) when the initial webhook arrives with an empty attachments array — image-only messages and updated-message events only (#67437) Closes #64105, closes #61861, closes #65430. * fix(bluebubbles): resolve review findings — SSRF policy, reuse extractAttachments, add tests - F1 (BLOCKER): pass undefined instead of {} for SSRF policy when allowPrivateNetwork is false, so localhost BB servers are not blocked. - F2 (IMPORTANT): reuse exported extractAttachments() from monitor-normalize instead of duplicating field extraction logic. - F3 (IMPORTANT): simplify asRecord(asRecord(payload)?.data) to asRecord(payload.data) since payload is already Record<string, unknown>. - F4 (NIT): bind retryMessageId before the guard to eliminate non-null assertion. - F5 (IMPORTANT): add 4 tests for fetchBlueBubblesMessageAttachments covering success, non-ok HTTP, empty data, and guid-less entries. - Add CHANGELOG entry for the user-facing fix. * fix(ci): update raw-fetch allowlist line number after dispatcher strip * fix(bluebubbles): resolve PR review findings (#67510) - monitor-processing: move attachment retry into the !rawBody guard so image-only new-message events that arrive with empty attachments and empty text are recovered via a BB API refetch before being dropped. The existing retry block at the end of processMessageAfterDedupe was unreachable for this case because the !rawBody early-return fired first. (Greptile) - monitor: derive isAttachmentUpdate from the normalized message shape instead of raw payload.data.attachments so updated-message webhooks with attachments under wrapper formats (payload.message, JSON-string payloads) are correctly routed through for processing instead of silently filtered. (Codex) - types: use bundled-undici fetch when init.dispatcher is present so the SSRF guard's DNS-pinning dispatcher is preserved when this function is called as fetchImpl from guarded callers (e.g. the attachment download path via fetchRemoteMedia). Falls back to globalThis.fetch when no dispatcher is present so tests that stub globalThis.fetch keep working. (Codex) - attachments: blueBubblesPolicy returns undefined for the non-private case (matching monitor-processing's helper) so sendBlueBubblesAttachment stops routing localhost BB through the SSRF guard. (Greptile) - scripts/check-no-raw-channel-fetch: bump the types.ts allowlist line to match the restructured non-SSRF branch. * fix(bluebubbles): move attachment retry before rawBody guard, fix stale log Move the attachment retry block (2s BB API refetch for empty attachments) before the !rawBody early-return guard. Previously, image-only messages with text='' and attachments=[] would be dropped by the !rawBody check before the retry could fire, making fix #4 dead code for its primary use-case. Now the retry runs first and recomputes the placeholder from resolved attachments so rawBody becomes non-empty when media is found. Also fix stale log message that still said 'without reaction' after the filter was expanded to pass through attachment updates. * fix(bluebubbles): revert undici import, restore dispatcher-strip approach Revert the @claude bot's undici import in types.ts — it introduced a direct 'undici' dependency that is not declared in the BB extension's package.json and would break isolated plugin installs. Restore the original dispatcher-strip approach which is correct: the SSRF guard already completed validation upstream before calling this function as fetchImpl, so stripping the dispatcher does not weaken security. * fix(bluebubbles): remove dead empty-body recovery block in !rawBody guard The empty-body attachment-recovery block added in the earlier PR revision is now redundant because the main retry block was moved above the rawBody computation in0d7d1c4208. Worse, that leftover block reassigned the (now-const) placeholder variable, throwing `TypeError: Assignment to constant variable` at runtime for image-only messages — breaking the very recovery path it was meant to protect (flagged by Codex on 4bfc2777). Remove the dead block; the up-front retry already handles the image-only case by recovering attachments before the rawBody computation, so once we reach the !rawBody guard with an empty body it is genuinely empty and should drop as before. * fix(ci): update raw-fetch allowlist line after dispatcher-strip revert279dba17d2reverted types.ts back to the dispatcher-strip approach, which put the `fetch(url, ...)` call at line 189 instead of line 198. Bump the allowlist entry to match so `lint:tmp:no-raw-channel-fetch` stops failing check-additional. * test(pdf-tool): update stale opus-4-6 constant to opus-4-7 `628b454eff feat: default Anthropic to Opus 4.7` bumped the bundled anthropic image default to `claude-opus-4-7` but missed updating the `ANTHROPIC_PDF_MODEL` constant in pdf-tool.model-config.test.ts. The tests now fail on any PR that runs the `checks-node-agentic-agents-plugins` shard because the resolver returns 4-7 while the test asserts 4-6. Bump the constant to 4-7 to match the bundled default. --------- Co-authored-by: Lobster <10343873+omarshahine@users.noreply.github.com>
397 lines
13 KiB
TypeScript
397 lines
13 KiB
TypeScript
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
import { safeEqualSecret } from "openclaw/plugin-sdk/browser-security-runtime";
|
|
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
|
|
import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/text-runtime";
|
|
import { resolveBlueBubblesEffectiveAllowPrivateNetwork } from "./accounts.js";
|
|
import { runBlueBubblesCatchup } from "./catchup.js";
|
|
import { createBlueBubblesDebounceRegistry } from "./monitor-debounce.js";
|
|
import {
|
|
asRecord,
|
|
normalizeWebhookMessage,
|
|
normalizeWebhookReaction,
|
|
} from "./monitor-normalize.js";
|
|
import { logVerbose, processMessage, processReaction } from "./monitor-processing.js";
|
|
import {
|
|
_resetBlueBubblesShortIdState,
|
|
resolveBlueBubblesMessageId,
|
|
} from "./monitor-reply-cache.js";
|
|
import {
|
|
DEFAULT_WEBHOOK_PATH,
|
|
normalizeWebhookPath,
|
|
resolveWebhookPathFromConfig,
|
|
type BlueBubblesMonitorOptions,
|
|
type WebhookTarget,
|
|
} from "./monitor-shared.js";
|
|
import { fetchBlueBubblesServerInfo } from "./probe.js";
|
|
import { getBlueBubblesRuntime } from "./runtime.js";
|
|
import {
|
|
WEBHOOK_RATE_LIMIT_DEFAULTS,
|
|
createFixedWindowRateLimiter,
|
|
createWebhookInFlightLimiter,
|
|
registerWebhookTargetWithPluginRoute,
|
|
readWebhookBodyOrReject,
|
|
resolveRequestClientIp,
|
|
resolveWebhookTargetWithAuthOrRejectSync,
|
|
withResolvedWebhookRequestPipeline,
|
|
} from "./webhook-ingress.js";
|
|
|
|
const webhookTargets = new Map<string, WebhookTarget[]>();
|
|
const webhookRateLimiter = createFixedWindowRateLimiter({
|
|
windowMs: WEBHOOK_RATE_LIMIT_DEFAULTS.windowMs,
|
|
maxRequests: WEBHOOK_RATE_LIMIT_DEFAULTS.maxRequests,
|
|
maxTrackedKeys: WEBHOOK_RATE_LIMIT_DEFAULTS.maxTrackedKeys,
|
|
});
|
|
const webhookInFlightLimiter = createWebhookInFlightLimiter();
|
|
const debounceRegistry = createBlueBubblesDebounceRegistry({ processMessage });
|
|
|
|
export function clearBlueBubblesWebhookSecurityStateForTest(): void {
|
|
webhookRateLimiter.clear();
|
|
webhookInFlightLimiter.clear();
|
|
}
|
|
|
|
export function registerBlueBubblesWebhookTarget(target: WebhookTarget): () => void {
|
|
const registered = registerWebhookTargetWithPluginRoute({
|
|
targetsByPath: webhookTargets,
|
|
target,
|
|
route: {
|
|
auth: "plugin",
|
|
match: "exact",
|
|
pluginId: "bluebubbles",
|
|
source: "bluebubbles-webhook",
|
|
accountId: target.account.accountId,
|
|
log: target.runtime.log,
|
|
handler: async (req, res) => {
|
|
const handled = await handleBlueBubblesWebhookRequest(req, res);
|
|
if (!handled && !res.headersSent) {
|
|
res.statusCode = 404;
|
|
res.setHeader("Content-Type", "text/plain; charset=utf-8");
|
|
res.end("Not Found");
|
|
}
|
|
},
|
|
},
|
|
});
|
|
return () => {
|
|
registered.unregister();
|
|
// Clean up debouncer when target is unregistered
|
|
debounceRegistry.removeDebouncer(registered.target);
|
|
};
|
|
}
|
|
|
|
function parseBlueBubblesWebhookPayload(
|
|
rawBody: string,
|
|
): { ok: true; value: unknown } | { ok: false; error: string } {
|
|
const trimmed = rawBody.trim();
|
|
if (!trimmed) {
|
|
return { ok: false, error: "empty payload" };
|
|
}
|
|
try {
|
|
return { ok: true, value: JSON.parse(trimmed) as unknown };
|
|
} catch {
|
|
const params = new URLSearchParams(rawBody);
|
|
const payload = params.get("payload") ?? params.get("data") ?? params.get("message");
|
|
if (!payload) {
|
|
return { ok: false, error: "invalid json" };
|
|
}
|
|
try {
|
|
return { ok: true, value: JSON.parse(payload) as unknown };
|
|
} catch (error) {
|
|
return { ok: false, error: formatErrorMessage(error) };
|
|
}
|
|
}
|
|
}
|
|
|
|
function maskSecret(value: string): string {
|
|
if (value.length <= 6) {
|
|
return "***";
|
|
}
|
|
return `${value.slice(0, 2)}***${value.slice(-2)}`;
|
|
}
|
|
|
|
function normalizeAuthToken(raw: string): string {
|
|
const value = raw.trim();
|
|
if (!value) {
|
|
return "";
|
|
}
|
|
if (normalizeLowercaseStringOrEmpty(value).startsWith("bearer ")) {
|
|
return value.slice("bearer ".length).trim();
|
|
}
|
|
return value;
|
|
}
|
|
|
|
function safeEqualAuthToken(aRaw: string, bRaw: string): boolean {
|
|
const a = normalizeAuthToken(aRaw);
|
|
const b = normalizeAuthToken(bRaw);
|
|
if (!a || !b) {
|
|
return false;
|
|
}
|
|
return safeEqualSecret(a, b);
|
|
}
|
|
|
|
function collectTrustedProxies(targets: readonly WebhookTarget[]): string[] {
|
|
const proxies = new Set<string>();
|
|
for (const target of targets) {
|
|
for (const proxy of target.config.gateway?.trustedProxies ?? []) {
|
|
const normalized = proxy.trim();
|
|
if (normalized) {
|
|
proxies.add(normalized);
|
|
}
|
|
}
|
|
}
|
|
return [...proxies];
|
|
}
|
|
|
|
function resolveWebhookAllowRealIpFallback(targets: readonly WebhookTarget[]): boolean {
|
|
return targets.some((target) => target.config.gateway?.allowRealIpFallback === true);
|
|
}
|
|
|
|
function resolveWebhookClientIp(
|
|
req: IncomingMessage,
|
|
trustedProxies: readonly string[],
|
|
allowRealIpFallback: boolean,
|
|
): string {
|
|
if (!req.headers["x-forwarded-for"] && !(allowRealIpFallback && req.headers["x-real-ip"])) {
|
|
return req.socket.remoteAddress ?? "unknown";
|
|
}
|
|
|
|
// Mirror gateway client-IP trust rules so limiter buckets follow configured proxy hops.
|
|
return (
|
|
resolveRequestClientIp(req, [...trustedProxies], allowRealIpFallback) ??
|
|
req.socket.remoteAddress ??
|
|
"unknown"
|
|
);
|
|
}
|
|
|
|
export async function handleBlueBubblesWebhookRequest(
|
|
req: IncomingMessage,
|
|
res: ServerResponse,
|
|
): Promise<boolean> {
|
|
const requestUrl = new URL(req.url ?? "/", "http://localhost");
|
|
const normalizedPath = normalizeWebhookPath(requestUrl.pathname);
|
|
const pathTargets = webhookTargets.get(normalizedPath) ?? [];
|
|
const trustedProxies = collectTrustedProxies(pathTargets);
|
|
const allowRealIpFallback = resolveWebhookAllowRealIpFallback(pathTargets);
|
|
const clientIp = resolveWebhookClientIp(req, trustedProxies, allowRealIpFallback);
|
|
const rateLimitKey = `${normalizedPath}:${clientIp}`;
|
|
return await withResolvedWebhookRequestPipeline({
|
|
req,
|
|
res,
|
|
targetsByPath: webhookTargets,
|
|
allowMethods: ["POST"],
|
|
rateLimiter: webhookRateLimiter,
|
|
rateLimitKey,
|
|
inFlightLimiter: webhookInFlightLimiter,
|
|
inFlightKey: `${normalizedPath}:${clientIp}`,
|
|
handle: async ({ path, targets }) => {
|
|
const url = requestUrl;
|
|
const guidParam = url.searchParams.get("guid") ?? url.searchParams.get("password");
|
|
const headerToken =
|
|
req.headers["x-guid"] ??
|
|
req.headers["x-password"] ??
|
|
req.headers["x-bluebubbles-guid"] ??
|
|
req.headers["authorization"];
|
|
const guid = (Array.isArray(headerToken) ? headerToken[0] : headerToken) ?? guidParam ?? "";
|
|
const target = resolveWebhookTargetWithAuthOrRejectSync({
|
|
targets,
|
|
res,
|
|
isMatch: (target) => {
|
|
const token = target.account.config.password?.trim() ?? "";
|
|
return safeEqualAuthToken(guid, token);
|
|
},
|
|
});
|
|
if (!target) {
|
|
console.warn(
|
|
`[bluebubbles] webhook rejected: status=${res.statusCode} path=${path} guid=${maskSecret(url.searchParams.get("guid") ?? url.searchParams.get("password") ?? "")}`,
|
|
);
|
|
return true;
|
|
}
|
|
const body = await readWebhookBodyOrReject({
|
|
req,
|
|
res,
|
|
profile: "post-auth",
|
|
invalidBodyMessage: "invalid payload",
|
|
});
|
|
if (!body.ok) {
|
|
console.warn(`[bluebubbles] webhook rejected: status=${res.statusCode}`);
|
|
return true;
|
|
}
|
|
|
|
const parsed = parseBlueBubblesWebhookPayload(body.value);
|
|
if (!parsed.ok) {
|
|
res.statusCode = 400;
|
|
res.end(parsed.error);
|
|
console.warn(`[bluebubbles] webhook rejected: ${parsed.error}`);
|
|
return true;
|
|
}
|
|
|
|
const payload = asRecord(parsed.value) ?? {};
|
|
const firstTarget = targets[0];
|
|
if (firstTarget) {
|
|
logVerbose(
|
|
firstTarget.core,
|
|
firstTarget.runtime,
|
|
`webhook received path=${path} keys=${Object.keys(payload).join(",") || "none"}`,
|
|
);
|
|
}
|
|
const eventTypeRaw = payload.type;
|
|
const eventType = typeof eventTypeRaw === "string" ? eventTypeRaw.trim() : "";
|
|
const allowedEventTypes = new Set([
|
|
"new-message",
|
|
"updated-message",
|
|
"message-reaction",
|
|
"reaction",
|
|
]);
|
|
if (eventType && !allowedEventTypes.has(eventType)) {
|
|
res.statusCode = 200;
|
|
res.end("ok");
|
|
if (firstTarget) {
|
|
logVerbose(firstTarget.core, firstTarget.runtime, `webhook ignored type=${eventType}`);
|
|
}
|
|
return true;
|
|
}
|
|
const reaction = normalizeWebhookReaction(payload);
|
|
// Normalize the webhook message early so the attachment-update detection
|
|
// below sees attachments under any supported wrapper format (`payload.data`,
|
|
// `payload.message`, `payload.data.message`, JSON-string payloads), not just
|
|
// raw `payload.data.attachments`. (#65430, #67510)
|
|
const message = reaction ? null : normalizeWebhookMessage(payload, { eventType });
|
|
// BlueBubbles fires `updated-message` when attachments are indexed after the
|
|
// initial `new-message` (which may arrive with attachments: []). Let those
|
|
// through so the agent can ingest the image. (#65430)
|
|
const isAttachmentUpdate =
|
|
eventType === "updated-message" && (message?.attachments?.length ?? 0) > 0;
|
|
if (
|
|
(eventType === "updated-message" ||
|
|
eventType === "message-reaction" ||
|
|
eventType === "reaction") &&
|
|
!reaction &&
|
|
!isAttachmentUpdate
|
|
) {
|
|
res.statusCode = 200;
|
|
res.end("ok");
|
|
if (firstTarget) {
|
|
logVerbose(
|
|
firstTarget.core,
|
|
firstTarget.runtime,
|
|
`webhook ignored ${eventType || "event"} (no reaction or attachment update)`,
|
|
);
|
|
}
|
|
return true;
|
|
}
|
|
if (!message && !reaction) {
|
|
res.statusCode = 400;
|
|
res.end("invalid payload");
|
|
console.warn("[bluebubbles] webhook rejected: unable to parse message payload");
|
|
return true;
|
|
}
|
|
|
|
target.statusSink?.({ lastInboundAt: Date.now() });
|
|
if (reaction) {
|
|
processReaction(reaction, target).catch((err) => {
|
|
target.runtime.error?.(
|
|
`[${target.account.accountId}] BlueBubbles reaction failed: ${String(err)}`,
|
|
);
|
|
});
|
|
} else if (message) {
|
|
// Route messages through debouncer to coalesce rapid-fire events
|
|
// (e.g., text message + URL balloon arriving as separate webhooks)
|
|
const debouncer = debounceRegistry.getOrCreateDebouncer(target);
|
|
debouncer.enqueue({ message, target }).catch((err) => {
|
|
target.runtime.error?.(
|
|
`[${target.account.accountId}] BlueBubbles webhook failed: ${String(err)}`,
|
|
);
|
|
});
|
|
}
|
|
|
|
res.statusCode = 200;
|
|
res.end("ok");
|
|
if (reaction) {
|
|
if (firstTarget) {
|
|
logVerbose(
|
|
firstTarget.core,
|
|
firstTarget.runtime,
|
|
`webhook accepted reaction sender=${reaction.senderId} msg=${reaction.messageId} action=${reaction.action}`,
|
|
);
|
|
}
|
|
} else if (message) {
|
|
if (firstTarget) {
|
|
logVerbose(
|
|
firstTarget.core,
|
|
firstTarget.runtime,
|
|
`webhook accepted sender=${message.senderId} group=${message.isGroup} chatGuid=${message.chatGuid ?? ""} chatId=${message.chatId ?? ""}`,
|
|
);
|
|
}
|
|
}
|
|
return true;
|
|
},
|
|
});
|
|
}
|
|
|
|
export async function monitorBlueBubblesProvider(
|
|
options: BlueBubblesMonitorOptions,
|
|
): Promise<void> {
|
|
const { account, config, runtime, abortSignal, statusSink } = options;
|
|
const core = getBlueBubblesRuntime();
|
|
const path = options.webhookPath?.trim() || DEFAULT_WEBHOOK_PATH;
|
|
const allowPrivateNetwork = resolveBlueBubblesEffectiveAllowPrivateNetwork({
|
|
baseUrl: account.baseUrl,
|
|
config: account.config,
|
|
});
|
|
|
|
// Fetch and cache server info (for macOS version detection in action gating)
|
|
const serverInfo = await fetchBlueBubblesServerInfo({
|
|
baseUrl: account.baseUrl,
|
|
password: account.config.password,
|
|
accountId: account.accountId,
|
|
timeoutMs: 5000,
|
|
allowPrivateNetwork,
|
|
}).catch(() => null);
|
|
if (serverInfo?.os_version) {
|
|
runtime.log?.(`[${account.accountId}] BlueBubbles server macOS ${serverInfo.os_version}`);
|
|
}
|
|
if (typeof serverInfo?.private_api === "boolean") {
|
|
runtime.log?.(
|
|
`[${account.accountId}] BlueBubbles Private API ${serverInfo.private_api ? "enabled" : "disabled"}`,
|
|
);
|
|
}
|
|
|
|
const target: WebhookTarget = {
|
|
account,
|
|
config,
|
|
runtime,
|
|
core,
|
|
path,
|
|
statusSink,
|
|
};
|
|
const unregister = registerBlueBubblesWebhookTarget(target);
|
|
|
|
return await new Promise((resolve) => {
|
|
const stop = () => {
|
|
unregister();
|
|
resolve();
|
|
};
|
|
|
|
if (abortSignal?.aborted) {
|
|
stop();
|
|
return;
|
|
}
|
|
|
|
abortSignal?.addEventListener("abort", stop, { once: true });
|
|
runtime.log?.(
|
|
`[${account.accountId}] BlueBubbles webhook listening on ${normalizeWebhookPath(path)}`,
|
|
);
|
|
|
|
// Kick off a catchup pass for messages delivered while the webhook
|
|
// target wasn't reachable. Fire-and-forget; the catchup runs through the
|
|
// same processMessage path webhooks use, and #66230's inbound dedupe
|
|
// drops any GUID that was already handled, so this is safe even if a
|
|
// live webhook raced the startup replay. See #66721.
|
|
runBlueBubblesCatchup(target).catch((err) => {
|
|
runtime.error?.(
|
|
`[${account.accountId}] BlueBubbles catchup: unexpected failure: ${String(err)}`,
|
|
);
|
|
});
|
|
});
|
|
}
|
|
|
|
export { _resetBlueBubblesShortIdState, resolveBlueBubblesMessageId, resolveWebhookPathFromConfig };
|