github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 13:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(network): normalize SSRF IP parsing and monitor typing

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-22 18:55:12 +01:00
parent 4ed87a6672
commit 98427453ba
5 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/telegram/monitor.test.ts
View File

@@ -28,7 +28,7 @@ const { initSpy, runSpy, loadConfig } = vi.hoisted(() => ({
runSpy: vi.fn(() => ({
task: () => Promise.resolve(),
stop: vi.fn(),
isRunning: () => false,
isRunning: (): boolean => false,
})),
loadConfig: vi.fn(() => ({
agents: { defaults: { maxConcurrent: 2 } },
@@ -214,10 +214,12 @@ describe("monitorTelegramProvider (grammY)", () => {
.mockImplementationOnce(() => ({
task: () => Promise.reject(networkError),
stop: vi.fn(),
isRunning: (): boolean => false,
}))
.mockImplementationOnce(() => ({
task: () => Promise.resolve(),
stop: vi.fn(),
isRunning: (): boolean => false,
}));
await monitorTelegramProvider({ token: "tok" });
@@ -331,6 +333,7 @@ describe("monitorTelegramProvider (grammY)", () => {
runSpy.mockImplementationOnce(() => ({
task: () => Promise.reject(new Error("bad token")),
stop: vi.fn(),
isRunning: (): boolean => false,
}));
await expect(monitorTelegramProvider({ token: "tok" })).rejects.toThrow("bad token");

7
src/telegram/monitor.ts
View File

@@ -167,13 +167,14 @@ export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) {
abortSignal: opts.abortSignal,
publicUrl: opts.webhookUrl,
});
if (opts.abortSignal && !opts.abortSignal.aborted) {
const abortSignal = opts.abortSignal;
if (abortSignal && !abortSignal.aborted) {
await new Promise<void>((resolve) => {
const onAbort = () => {
opts.abortSignal?.removeEventListener("abort", onAbort);
abortSignal.removeEventListener("abort", onAbort);
resolve();
};
opts.abortSignal.addEventListener("abort", onAbort, { once: true });
abortSignal.addEventListener("abort", onAbort, { once: true });
});
}
return;