fix: bound remote media reference reads [AI] (#88974) · o...

Recent Commits to openclaw:main

pgondhi987 · 2026-06-02 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1758,6 +1758,9 @@ describe("createImageGenerateTool", () => {`
`1758`	`1758`	`const defaultLoadOptions = mockCallArg(webMedia.loadWebMedia, 0, "loadWebMedia", 1);`
`1759`	`1759`	`expect(defaultLoadUrl).toBe("http://198.18.0.153/reference.png");`
`1760`	`1760`	`expect(requireRecord(defaultLoadOptions, "loadWebMedia options").ssrfPolicy).toBeUndefined();`
	`1761`	`+expect(requireRecord(defaultLoadOptions, "loadWebMedia options").readIdleTimeoutMs).toBe(`
	`1762`	`+120_000,`
	`1763`	`+);`
`1761`	`1764`
`1762`	`1765`	`const tool = requireImageGenerateTool(`
`1763`	`1766`	`createImageGenerateTool({`
`@@ -1782,6 +1785,9 @@ describe("createImageGenerateTool", () => {`
`1782`	`1785`	`expect(requireRecord(configuredLoadOptions, "loadWebMedia options").ssrfPolicy).toEqual({`
`1783`	`1786`	`allowRfc2544BenchmarkRange: true,`
`1784`	`1787`	`});`
	`1788`	`+expect(requireRecord(configuredLoadOptions, "loadWebMedia options").readIdleTimeoutMs).toBe(`
	`1789`	`+120_000,`
	`1790`	`+);`
`1785`	`1791`	`expect(mockCallArg(generateImage, 1, "generateImage").ssrfPolicy).toEqual({`
`1786`	`1792`	`allowRfc2544BenchmarkRange: true,`
`1787`	`1793`	`});`

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ import {`
`81`	`81`	`hasGenerationToolAvailability,`
`82`	`82`	`normalizeMediaReferenceInputs,`
`83`	`83`	`readGenerationTimeoutMs,`
	`84`	`+REMOTE_MEDIA_READ_IDLE_TIMEOUT_MS,`
`84`	`85`	`resolveRemoteMediaSsrfPolicy,`
`85`	`86`	`resolveCapabilityModelConfigForTool,`
`86`	`87`	`resolveGenerateAction,`
`@@ -618,6 +619,7 @@ async function loadReferenceImages(params: {`
`618`	`619`	`maxBytes: params.maxBytes,`
`619`	`620`	`localRoots,`
`620`	`621`	`ssrfPolicy: params.ssrfPolicy,`
	`622`	`+ ...(isHttpUrl ? { readIdleTimeoutMs: REMOTE_MEDIA_READ_IDLE_TIMEOUT_MS } : {}),`
`621`	`623`	`});`
`622`	`624`	`if (media.kind !== "image") {`
`623`	`625`	throw new ToolInputError(`Unsupported media type: ${media.kind}`);

Original file line number	Diff line number	Diff line change
`@@ -1981,6 +1981,46 @@ describe("image tool implicit imageModel config", () => {`
`1981`	`1981`	`});`
`1982`	`1982`	`});`
`1983`	`1983`
	`1984`	`+it("passes the shared remote read idle timeout when loading remote image references", async () => {`
	`1985`	`+const fetch = vi.fn(`
	`1986`	`+async () =>`
	`1987`	`+new Response(`
	`1988`	`+JSON.stringify({ content: "ok", base_resp: { status_code: 0, status_msg: "" } }),`
	`1989`	`+),`
	`1990`	`+);`
	`1991`	`+global.fetch = withFetchPreconnect(fetch);`
	`1992`	`+vi.stubEnv("MINIMAX_API_KEY", "minimax-test");`
	`1993`	`+const loadWebMedia = vi.fn(async () => ({`
	`1994`	`+buffer: Buffer.from(ONE_PIXEL_PNG_B64, "base64"),`
	`1995`	`+contentType: "image/png",`
	`1996`	`+kind: "image" as const,`
	`1997`	`+}));`
	`1998`	`+installImageUnderstandingProviderDeps([minimaxProvider, moonshotProvider], {`
	`1999`	`+loadImageWebMediaRuntime: async () => ({`
	`2000`	`+ loadWebMedia,`
	`2001`	`+optimizeImageBufferForWebMedia: async ({ buffer, contentType, fileName }) => ({`
	`2002`	`+ buffer,`
	`2003`	`+contentType: contentType ?? "image/png",`
	`2004`	`+kind: "image",`
	`2005`	`+ fileName,`
	`2006`	`+}),`
	`2007`	`+}),`
	`2008`	`+});`
	`2009`	`+`
	`2010`	`+await withTempAgentDir(async (agentDir) => {`
	`2011`	`+const tool = createRequiredImageTool({`
	`2012`	`+config: createMinimaxImageConfig(),`
	`2013`	`+ agentDir,`
	`2014`	`+});`
	`2015`	`+`
	`2016`	`+await expectImageToolExecOk(tool, "https://example.test/reference.png");`
	`2017`	`+`
	`2018`	`+expect(loadWebMedia).toHaveBeenCalledTimes(1);`
	`2019`	`+const [, options] = fetchCallAt(loadWebMedia, 0);`
	`2020`	`+expect((options as { readIdleTimeoutMs?: number }).readIdleTimeoutMs).toBe(120_000);`
	`2021`	`+});`
	`2022`	`+});`
	`2023`	`+`
`1984`	`2024`	`it("sandboxes image paths like the read tool", async () => {`
`1985`	`2025`	`await withTempSandboxState(async ({ agentDir, sandboxRoot }) => {`
`1986`	`2026`	`await fs.writeFile(path.join(sandboxRoot, "img.png"), "fake", "utf8");`

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ import {`
`59`	`59`	`import {`
`60`	`60`	`applyImageModelConfigDefaults,`
`61`	`61`	`buildTextToolResult,`
	`62`	`+REMOTE_MEDIA_READ_IDLE_TIMEOUT_MS,`
`62`	`63`	`resolveMediaToolInboundRoots,`
`63`	`64`	`resolveMediaToolLocalRoots,`
`64`	`65`	`resolveRemoteMediaSsrfPolicy,`
`@@ -90,6 +91,7 @@ type ImageToolLoadWebMediaOptions = {`
`90`	`91`	`localRoots?: readonly string[] \| "any";`
`91`	`92`	`inboundRoots?: readonly string[];`
`92`	`93`	`ssrfPolicy?: ReturnType<typeof resolveRemoteMediaSsrfPolicy>;`
	`94`	`+readIdleTimeoutMs?: number;`
`93`	`95`	`};`
`94`	`96`
`95`	`97`	`type ImageWebMediaRuntime = {`
`@@ -974,6 +976,7 @@ export function createImageTool(options?: {`
`974`	`976`	`localRoots: mediaLocalRoots,`
`975`	`977`	`inboundRoots: mediaInboundRoots,`
`976`	`978`	`ssrfPolicy: remoteMediaSsrfPolicy,`
	`979`	`+ ...(isHttpUrl ? { readIdleTimeoutMs: REMOTE_MEDIA_READ_IDLE_TIMEOUT_MS } : {}),`
`977`	`980`	`imageCompression,`
`978`	`981`	`});`
`979`	`982`	`if (media.kind !== "image") {`

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,8 @@ type TaskRunDetailHandle = {`
`70`	`70`	`runId: string;`
`71`	`71`	`};`
`72`	`72`
	`73`	`+export const REMOTE_MEDIA_READ_IDLE_TIMEOUT_MS = 120_000;`
	`74`	`+`
`73`	`75`	`export function applyImageModelConfigDefaults(`
`74`	`76`	`cfg: OpenClawConfig \| undefined,`
`75`	`77`	`imageModelConfig: ImageModelConfig,`

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import { coerceImageModelConfig, type ImageModelConfig } from "./image-tool.help`
`20`	`20`	`import {`
`21`	`21`	`applyImageModelConfigDefaults,`
`22`	`22`	`buildTextToolResult,`
	`23`	`+REMOTE_MEDIA_READ_IDLE_TIMEOUT_MS,`
`23`	`24`	`resolveModelFromRegistry,`
`24`	`25`	`resolveMediaToolLocalRoots,`
`25`	`26`	`resolveModelRuntimeApiKey,`
`@@ -54,7 +55,6 @@ const DEFAULT_PROMPT = "Analyze this PDF document.";`
`54`	`55`	`const DEFAULT_MAX_PDFS = 10;`
`55`	`56`	`const DEFAULT_MAX_BYTES_MB = 10;`
`56`	`57`	`const DEFAULT_MAX_PAGES = 20;`
`57`		`-const PDF_REMOTE_READ_IDLE_TIMEOUT_MS = 120_000;`
`58`	`58`
`59`	`59`	`const PDF_MIN_TEXT_CHARS = 200;`
`60`	`60`	`const PDF_MAX_PIXELS = 4_000_000;`
`@@ -457,7 +457,7 @@ export function createPdfTool(options?: {`
`457`	`457`	`: await loadWebMediaRaw(resolvedPathInfo.resolved, {`
`458`	`458`	`maxBytes,`
`459`	`459`	`localRoots,`
`460`		`- ...(isHttpUrl ? { readIdleTimeoutMs: PDF_REMOTE_READ_IDLE_TIMEOUT_MS } : {}),`
	`460`	`+ ...(isHttpUrl ? { readIdleTimeoutMs: REMOTE_MEDIA_READ_IDLE_TIMEOUT_MS } : {}),`
`461`	`461`	`ssrfPolicy: remoteMediaSsrfPolicy,`
`462`	`462`	`});`
`463`	`463`

Original file line number	Diff line number	Diff line change
`@@ -1515,6 +1515,30 @@ describe("createVideoGenerateTool", () => {`
`1515`	`1515`	`expect(call.inputImages?.[1]?.role).toBe("last_frame");`
`1516`	`1516`	`});`
`1517`	`1517`
	`1518`	`+it("passes direct remote reference URLs to the provider without local media loading", async () => {`
	`1519`	`+mockVideoPluginProvider({`
	`1520`	`+imageToVideo: { enabled: true, maxInputImages: 1 },`
	`1521`	`+});`
	`1522`	`+const loadWebMedia = vi.spyOn(webMedia, "loadWebMedia").mockResolvedValue({`
	`1523`	`+kind: "image",`
	`1524`	`+buffer: Buffer.from("image"),`
	`1525`	`+contentType: "image/png",`
	`1526`	`+});`
	`1527`	`+const generateSpy = mockSavedVideoResult();`
	`1528`	`+const tool = createVideoPluginTool();`
	`1529`	`+`
	`1530`	`+await tool.execute("call-1", {`
	`1531`	`+prompt: "lobster",`
	`1532`	`+image: "https://example.test/reference.png",`
	`1533`	`+});`
	`1534`	`+`
	`1535`	`+expect(loadWebMedia).not.toHaveBeenCalled();`
	`1536`	`+const call = firstMockCallArg(generateSpy) as {`
	`1537`	`+inputImages?: Array<{ url?: string }>;`
	`1538`	`+};`
	`1539`	`+expect(call.inputImages).toEqual([{ url: "https://example.test/reference.png" }]);`
	`1540`	`+});`
	`1541`	`+`
`1518`	`1542`	`it("passes web_fetch SSRF policy when loading reference assets", async () => {`
`1519`	`1543`	`mockVideoPluginProvider({`
`1520`	`1544`	`imageToVideo: { enabled: true, maxInputImages: 1 },`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main