vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 10:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: guard qqbot channel API fetch

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-21 00:37:54 +01:00
parent 039d1010fe
commit a8b81fa8e5
1 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
extensions/qqbot/src/tools/channel.ts
View File

@@ -1,5 +1,6 @@
import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { fetchWithSsrFGuard } from "openclaw/plugin-sdk/ssrf-runtime";
import { getAccessToken } from "../api.js";
import { listQQBotAccountIds, resolveQQBotAccount } from "../config.js";
import { debugError, debugLog } from "../utils/debug-log.js";
@@ -170,8 +171,15 @@ export function registerChannelTool(api: OpenClawPluginApi): void {
debugLog(`[qqbot-channel-api] >>> ${method} ${url} (timeout: ${DEFAULT_TIMEOUT_MS}ms)`);
let res: Response;
let release = async () => {};
try {
res = await fetch(url, fetchOptions);
const guarded = await fetchWithSsrFGuard({
url,
init: fetchOptions,
auditContext: `qqbot.channel-api${p.path}`,
});
res = guarded.response;
release = guarded.release;
} catch (err) {
clearTimeout(timeoutId);
if (err instanceof Error && err.name === "AbortError") {
@@ -192,45 +200,49 @@ export function registerChannelTool(api: OpenClawPluginApi): void {
debugLog(`[qqbot-channel-api] <<< Status: ${res.status} ${res.statusText}`);
const rawBody = await res.text();
if (!rawBody || rawBody.trim() === "") {
if (res.ok) {
return json({ success: true, status: res.status, path: p.path });
}
return json({
error: `API returned ${res.status} ${res.statusText}`,
status: res.status,
path: p.path,
});
}
let parsed: unknown;
try {
parsed = JSON.parse(rawBody);
} catch {
parsed = rawBody;
}
const rawBody = await res.text();
if (!rawBody || rawBody.trim() === "") {
if (res.ok) {
return json({ success: true, status: res.status, path: p.path });
}
return json({
error: `API returned ${res.status} ${res.statusText}`,
status: res.status,
path: p.path,
});
}
let parsed: unknown;
try {
parsed = JSON.parse(rawBody);
} catch {
parsed = rawBody;
}
if (!res.ok) {
const errMsg =
typeof parsed === "object" && parsed && "message" in parsed
? String((parsed as { message?: unknown }).message)
: `${res.status} ${res.statusText}`;
debugError(`[qqbot-channel-api] Error [${method} ${p.path}]: ${errMsg}`);
return json({
error: errMsg,
status: res.status,
path: p.path,
details: parsed,
});
}
if (!res.ok) {
const errMsg =
typeof parsed === "object" && parsed && "message" in parsed
? String((parsed as { message?: unknown }).message)
: `${res.status} ${res.statusText}`;
debugError(`[qqbot-channel-api] Error [${method} ${p.path}]: ${errMsg}`);
return json({
error: errMsg,
success: true,
status: res.status,
path: p.path,
details: parsed,
data: parsed,
});
} finally {
await release();
}
return json({
success: true,
status: res.status,
path: p.path,
data: parsed,
});
} catch (err) {
return json({
error: formatErrorMessage(err),