refactor: share browser route navigation policy · openclaw/openclaw@6c309b9

Recent Commits to openclaw:main

vincentkoc · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,18 @@ export function resolveProfileContext(`
`64`	`64`	`return profileCtx;`
`65`	`65`	`}`
`66`	`66`
	`67`	`+export function browserNavigationPolicyForProfile(`
	`68`	`+ctx: BrowserRouteContext,`
	`69`	`+profileCtx: ProfileContext,`
	`70`	`+) {`
	`71`	`+return withBrowserNavigationPolicy(ctx.state().resolved.ssrfPolicy, {`
	`72`	`+browserProxyMode: resolveBrowserNavigationProxyMode({`
	`73`	`+resolved: ctx.state().resolved,`
	`74`	`+profile: profileCtx.profile,`
	`75`	`+}),`
	`76`	`+});`
	`77`	`+}`
	`78`	`+`
`67`	`79`	`export async function getPwAiModule(): Promise<PwAiModule \| null> {`
`68`	`80`	`return await getPwAiModuleBase({ mode: "soft" });`
`69`	`81`	`}`
`@@ -124,12 +136,7 @@ export async function withRouteTabContext<T>(`
`124`	`136`	`if (params.enforceCurrentUrlAllowed) {`
`125`	`137`	`await assertBrowserNavigationResultAllowed({`
`126`	`138`	`url: tab.url,`
`127`		`- ...withBrowserNavigationPolicy(params.ctx.state().resolved.ssrfPolicy, {`
`128`		`-browserProxyMode: resolveBrowserNavigationProxyMode({`
`129`		`-resolved: params.ctx.state().resolved,`
`130`		`-profile: profileCtx.profile,`
`131`		`-}),`
`132`		`-}),`
	`139`	`+ ...browserNavigationPolicyForProfile(params.ctx, profileCtx),`
`133`	`140`	`});`
`134`	`141`	`}`
`135`	`142`	`return await params.run({`
`@@ -169,12 +176,7 @@ export async function resolveSafeRouteTabUrl(params: {`
`169`	`176`	`try {`
`170`	`177`	`await assertBrowserNavigationResultAllowed({`
`171`	`178`	`url: candidateUrl,`
`172`		`- ...withBrowserNavigationPolicy(params.ctx.state().resolved.ssrfPolicy, {`
`173`		`-browserProxyMode: resolveBrowserNavigationProxyMode({`
`174`		`-resolved: params.ctx.state().resolved,`
`175`		`-profile: params.profileCtx.profile,`
`176`		`-}),`
`177`		`-}),`
	`179`	`+ ...browserNavigationPolicyForProfile(params.ctx, params.profileCtx),`
`178`	`180`	`});`
`179`	`181`	`return candidateUrl;`
`180`	`182`	`} catch {`

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@ vi.mock("../../media/store.js", () => ({`
`71`	`71`	`}));`
`72`	`72`
`73`	`73`	`vi.mock("./agent.shared.js", () => ({`
	`74`	`+browserNavigationPolicyForProfile: vi.fn(() => ({`
	`75`	`+ssrfPolicy: { dangerouslyAllowPrivateNetwork: false },`
	`76`	`+})),`
`74`	`77`	`getPwAiModule: vi.fn(async () => null),`
`75`	`78`	`handleRouteError: vi.fn(`
`76`	`79`	`(`

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ vi.mock("../../media/store.js", () => ({`
`64`	`64`	`}));`
`65`	`65`
`66`	`66`	`vi.mock("./agent.shared.js", () => ({`
	`67`	`+browserNavigationPolicyForProfile: vi.fn(() => ({})),`
`67`	`68`	`getPwAiModule: vi.fn(async () => null),`
`68`	`69`	`handleRouteError: vi.fn((_ctx, _res, err) => {`
`69`	`70`	`throw err;`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import path from "node:path";`
`2`	`2`	`import { ensureMediaDir, saveMediaBuffer } from "../../media/store.js";`
`3`		`-import { resolveBrowserNavigationProxyMode } from "../browser-proxy-mode.js";`
`4`	`3`	`import { captureScreenshot, snapshotAria, snapshotRoleViaCdp } from "../cdp.js";`
`5`	`4`	`import {`
`6`	`5`	`evaluateChromeMcpScript,`
`@@ -18,16 +17,16 @@ import {`
`18`	`17`	`assertBrowserNavigationAllowed,`
`19`	`18`	`assertBrowserNavigationResultAllowed,`
`20`	`19`	`} from "../navigation-guard.js";`
`21`		`-import { withBrowserNavigationPolicy } from "../navigation-guard.js";`
`22`	`20`	`import { getBrowserProfileCapabilities } from "../profile-capabilities.js";`
`23`	`21`	`import {`
`24`	`22`	`DEFAULT_BROWSER_SCREENSHOT_MAX_BYTES,`
`25`	`23`	`DEFAULT_BROWSER_SCREENSHOT_MAX_SIDE,`
`26`	`24`	`normalizeBrowserScreenshot,`
`27`	`25`	`} from "../screenshot.js";`
`28`		`-import type { BrowserRouteContext, ProfileContext } from "../server-context.js";`
	`26`	`+import type { BrowserRouteContext } from "../server-context.js";`
`29`	`27`	`import { normalizeBrowserTimerDelayMs } from "../timer-delay.js";`
`30`	`28`	`import {`
	`29`	`+browserNavigationPolicyForProfile,`
`31`	`30`	`getPwAiModule,`
`32`	`31`	`handleRouteError,`
`33`	`32`	`readBody,`
`@@ -49,15 +48,6 @@ import { asyncBrowserRoute, jsonError, toBoolean, toStringOrEmpty } from "./util`
`49`	`48`
`50`	`49`	`const CHROME_MCP_OVERLAY_ATTR = "data-openclaw-mcp-overlay";`
`51`	`50`
`52`		`-function browserNavigationPolicyForProfile(ctx: BrowserRouteContext, profileCtx: ProfileContext) {`
`53`		`-return withBrowserNavigationPolicy(ctx.state().resolved.ssrfPolicy, {`
`54`		`-browserProxyMode: resolveBrowserNavigationProxyMode({`
`55`		`-resolved: ctx.state().resolved,`
`56`		`-profile: profileCtx.profile,`
`57`		`-}),`
`58`		`-});`
`59`		`-}`
`60`		`-`
`61`	`51`	`async function collectChromeMcpSnapshotUrls(params: {`
`62`	`52`	`profileName: string;`
`63`	`53`	`profile?: ChromeMcpProfileOptions;`

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ export const existingSessionRouteState = {`
`31`	`31`
`32`	`32`	`export function createExistingSessionAgentSharedModule() {`
`33`	`33`	`return {`
	`34`	`+browserNavigationPolicyForProfile: vi.fn((ctx: BrowserRouteContext) =>`
	`35`	`+withBrowserNavigationPolicy(ctx.state().resolved.ssrfPolicy),`
	`36`	`+),`
`34`	`37`	`getPwAiModule: vi.fn(async () => null),`
`35`	`38`	`handleRouteError: vi.fn((_ctx: BrowserRouteContext, res: BrowserResponse, err: unknown) => {`
`36`	`39`	`const message = err instanceof Error ? err.message : String(err);`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";`
`2`		`-import { resolveBrowserNavigationProxyMode } from "../browser-proxy-mode.js";`
`3`	`2`	`import {`
`4`	`3`	`BrowserProfileUnavailableError,`
`5`	`4`	`BrowserTabNotFoundError,`
`@@ -12,30 +11,9 @@ import {`
`12`	`11`	`} from "../navigation-guard.js";`
`13`	`12`	`import type { BrowserRouteContext, ProfileContext } from "../server-context.js";`
`14`	`13`	`import { resolveTargetIdFromTabs } from "../target-id.js";`
	`14`	`+import { browserNavigationPolicyForProfile, resolveProfileContext } from "./agent.shared.js";`
`15`	`15`	`import type { BrowserRequest, BrowserResponse, BrowserRouteRegistrar } from "./types.js";`
`16`		`-import { asyncBrowserRoute, getProfileContext, jsonError, toStringOrEmpty } from "./utils.js";`
`17`		`-`
`18`		`-function resolveTabsProfileContext(`
`19`		`-req: BrowserRequest,`
`20`		`-res: BrowserResponse,`
`21`		`-ctx: BrowserRouteContext,`
`22`		`-) {`
`23`		`-const profileCtx = getProfileContext(req, ctx);`
`24`		`-if ("error" in profileCtx) {`
`25`		`-jsonError(res, profileCtx.status, profileCtx.error);`
`26`		`-return null;`
`27`		`-}`
`28`		`-return profileCtx;`
`29`		`-}`
`30`		`-`
`31`		`-function browserNavigationPolicyForProfile(ctx: BrowserRouteContext, profileCtx: ProfileContext) {`
`32`		`-return withBrowserNavigationPolicy(ctx.state().resolved.ssrfPolicy, {`
`33`		`-browserProxyMode: resolveBrowserNavigationProxyMode({`
`34`		`-resolved: ctx.state().resolved,`
`35`		`-profile: profileCtx.profile,`
`36`		`-}),`
`37`		`-});`
`38`		`-}`
	`16`	`+import { asyncBrowserRoute, jsonError, toStringOrEmpty } from "./utils.js";`
`39`	`17`
`40`	`18`	`function handleTabsRouteError(`
`41`	`19`	`ctx: BrowserRouteContext,`
`@@ -59,7 +37,7 @@ async function withTabsProfileRoute(params: {`
`59`	`37`	`mapTabError?: boolean;`
`60`	`38`	`run: (profileCtx: ProfileContext) => Promise<void>;`
`61`	`39`	`}) {`
`62`		`-const profileCtx = resolveTabsProfileContext(params.req, params.res, params.ctx);`
	`40`	`+const profileCtx = resolveProfileContext(params.req, params.res, params.ctx);`
`63`	`41`	`if (!profileCtx) {`
`64`	`42`	`return;`
`65`	`43`	`}`

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

推荐订阅源

Recent Commits to openclaw:main