refactor(security): share tool policy layering · openclaw/openclaw@43f134f

Recent Commits to openclaw:main

vincentkoc · 2026-06-23 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import type { AnyAgentTool } from "./agent-tools.types.js";`
`25`	`25`	`import { resolveProviderToolPolicy } from "./provider-tool-policy.js";`
`26`	`26`	`import { pickSandboxToolPolicy } from "./sandbox-tool-policy.js";`
`27`	`27`	`import type { SandboxToolPolicy } from "./sandbox.js";`
	`28`	`+import { resolveSandboxToolPolicyForAgent } from "./sandbox/tool-policy.js";`
`28`	`29`	`import {`
`29`	`30`	`resolveSubagentCapabilityStore,`
`30`	`31`	`resolveStoredSubagentInheritedToolAllowlist,`
`@@ -144,6 +145,44 @@ export function filterToolsByPolicy(tools: AnyAgentTool[], policy?: SandboxToolP`
`144`	`145`	`return tools.filter((tool) => isToolAllowedByPolicyName(tool.name, policy));`
`145`	`146`	`}`
`146`	`147`
	`148`	`+/** Resolve the shared profile, scope, extra, and sandbox policy layers. */`
	`149`	`+export function resolveConfiguredToolPolicies(params: {`
	`150`	`+cfg: OpenClawConfig;`
	`151`	`+agentTools?: AgentToolsConfig;`
	`152`	`+sandboxMode?: "off" \| "non-main" \| "all";`
	`153`	`+agentId?: string \| null;`
	`154`	`+extraPolicies?: readonly (SandboxToolPolicy \| undefined)[];`
	`155`	`+}): SandboxToolPolicy[] {`
	`156`	`+const policies: SandboxToolPolicy[] = [];`
	`157`	`+const profile = params.agentTools?.profile ?? params.cfg.tools?.profile;`
	`158`	`+const profilePolicy = resolveToolProfilePolicy(profile);`
	`159`	`+if (profilePolicy) {`
	`160`	`+policies.push(profilePolicy);`
	`161`	`+}`
	`162`	`+`
	`163`	`+const globalPolicy = pickSandboxToolPolicy(params.cfg.tools ?? undefined);`
	`164`	`+if (globalPolicy) {`
	`165`	`+policies.push(globalPolicy);`
	`166`	`+}`
	`167`	`+`
	`168`	`+const agentPolicy = pickSandboxToolPolicy(params.agentTools);`
	`169`	`+if (agentPolicy) {`
	`170`	`+policies.push(agentPolicy);`
	`171`	`+}`
	`172`	`+`
	`173`	`+for (const policy of params.extraPolicies ?? []) {`
	`174`	`+if (policy) {`
	`175`	`+policies.push(policy);`
	`176`	`+}`
	`177`	`+}`
	`178`	`+`
	`179`	`+if (params.sandboxMode === "all") {`
	`180`	`+policies.push(resolveSandboxToolPolicyForAgent(params.cfg, params.agentId ?? undefined));`
	`181`	`+}`
	`182`	`+`
	`183`	`+return policies;`
	`184`	`+}`
	`185`	`+`
`147`	`186`	`function collectUniqueStrings(values: Array<string \| null \| undefined>): string[] {`
`148`	`187`	`return normalizeUniqueSingleOrTrimmedStringList(values);`
`149`	`188`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`// Summarizes extra security audit findings for user-facing output.`
`2`		`-import { resolveProviderToolPolicy } from "../agents/agent-tools.policy.js";`
	`2`	`+import {`
	`3`	`+resolveConfiguredToolPolicies,`
	`4`	`+resolveProviderToolPolicy,`
	`5`	`+} from "../agents/agent-tools.policy.js";`
`3`	`6`	`import { parseModelRef } from "../agents/model-selection-normalize.js";`
`4`	`7`	`import { resolveSandboxConfigForAgent } from "../agents/sandbox/config.js";`
`5`		`-import { resolveSandboxToolPolicyForAgent } from "../agents/sandbox/tool-policy.js";`
`6`	`8`	`import type { SandboxToolPolicy } from "../agents/sandbox/types.js";`
`7`	`9`	`import { isToolAllowedByPolicies } from "../agents/tool-policy-match.js";`
`8`		`-import { resolveToolProfilePolicy } from "../agents/tool-policy.js";`
`9`	`10`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`10`	`11`	`import type { AgentToolsConfig } from "../config/types.tools.js";`
`11`	`12`	`import { hasConfiguredInternalHooks } from "../hooks/configured.js";`
`12`	`13`	`import { hasConfiguredWebSearchCredential } from "../plugins/web-search-credential-presence.js";`
`13`	`14`	`import { inferParamBFromIdOrName } from "../shared/model-param-b.js";`
`14`	`15`	`import { collectAuditModelRefs } from "./audit-model-refs.js";`
`15`		`-import { pickSandboxToolPolicy } from "../agents/sandbox-tool-policy.js";`
`16`	`16`
`17`	`17`	`/** Lightweight audit finding shape used by summary-only audit helpers. */`
`18`	`18`	`export type SecurityAuditFinding = {`
`@@ -67,46 +67,23 @@ function resolveToolPolicies(params: {`
`67`	`67`	`modelProvider?: string;`
`68`	`68`	`modelId?: string;`
`69`	`69`	`}): SandboxToolPolicy[] {`
`70`		`-const policies: SandboxToolPolicy[] = [];`
`71`		`-const profile = params.agentTools?.profile ?? params.cfg.tools?.profile;`
`72`		`-const profilePolicy = resolveToolProfilePolicy(profile);`
`73`		`-if (profilePolicy) {`
`74`		`-policies.push(profilePolicy);`
`75`		`-}`
`76`		`-`
`77`		`-const globalPolicy = pickSandboxToolPolicy(params.cfg.tools ?? undefined);`
`78`		`-if (globalPolicy) {`
`79`		`-policies.push(globalPolicy);`
`80`		`-}`
`81`		`-`
`82`		`-const agentPolicy = pickSandboxToolPolicy(params.agentTools);`
`83`		`-if (agentPolicy) {`
`84`		`-policies.push(agentPolicy);`
`85`		`-}`
`86`		`-`
`87`	`70`	`const globalProviderPolicy = resolveProviderToolPolicy({`
`88`	`71`	`byProvider: params.cfg.tools?.byProvider,`
`89`	`72`	`modelProvider: params.modelProvider,`
`90`	`73`	`modelId: params.modelId,`
`91`	`74`	`});`
`92`		`-if (globalProviderPolicy) {`
`93`		`-policies.push(globalProviderPolicy);`
`94`		`-}`
`95`		`-`
`96`	`75`	`const agentProviderPolicy = resolveProviderToolPolicy({`
`97`	`76`	`byProvider: params.agentTools?.byProvider,`
`98`	`77`	`modelProvider: params.modelProvider,`
`99`	`78`	`modelId: params.modelId,`
`100`	`79`	`});`
`101`		`-if (agentProviderPolicy) {`
`102`		`-policies.push(agentProviderPolicy);`
`103`		`-}`
`104`		`-`
`105`		`-if (params.sandboxMode === "all") {`
`106`		`-policies.push(resolveSandboxToolPolicyForAgent(params.cfg, params.agentId ?? undefined));`
`107`		`-}`
`108`		`-`
`109`		`-return policies;`
	`80`	`+return resolveConfiguredToolPolicies({`
	`81`	`+cfg: params.cfg,`
	`82`	`+agentTools: params.agentTools,`
	`83`	`+sandboxMode: params.sandboxMode,`
	`84`	`+agentId: params.agentId,`
	`85`	`+extraPolicies: [globalProviderPolicy, agentProviderPolicy],`
	`86`	`+});`
`110`	`87`	`}`
`111`	`88`
`112`	`89`	`function hasWebSearchKey(cfg: OpenClawConfig, env: NodeJS.ProcessEnv): boolean {`

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,7 @@`
`1`	`1`	`// Resolves filesystem policy for exec and sandbox tool use.`
`2`		`-import { pickSandboxToolPolicy } from "../agents/sandbox-tool-policy.js";`
	`2`	`+import { resolveConfiguredToolPolicies } from "../agents/agent-tools.policy.js";`
`3`	`3`	`import { resolveSandboxConfigForAgent } from "../agents/sandbox/config.js";`
`4`		`-import { resolveSandboxToolPolicyForAgent } from "../agents/sandbox/tool-policy.js";`
`5`		`-import type { SandboxToolPolicy } from "../agents/sandbox/types.js";`
`6`	`4`	`import { isToolAllowedByPolicies } from "../agents/tool-policy-match.js";`
`7`		`-import { resolveToolProfilePolicy } from "../agents/tool-policy.js";`
`8`	`5`	`import type { OpenClawConfig } from "../config/config.js";`
`9`	`6`	`import type { AgentToolsConfig, ExecToolConfig } from "../config/types.tools.js";`
`10`	`7`
`@@ -21,36 +18,6 @@ export type ExecFilesystemPolicyDriftHit = {`
`21`	`18`	`execHost: NonNullable<ExecToolConfig["host"]>;`
`22`	`19`	`};`
`23`	`20`
`24`		`-function resolveToolPolicies(params: {`
`25`		`-cfg: OpenClawConfig;`
`26`		`-agentTools?: AgentToolsConfig;`
`27`		`-sandboxMode: "off" \| "non-main" \| "all";`
`28`		`-agentId?: string;`
`29`		`-}): SandboxToolPolicy[] {`
`30`		`-const policies: SandboxToolPolicy[] = [];`
`31`		`-const profile = params.agentTools?.profile ?? params.cfg.tools?.profile;`
`32`		`-const profilePolicy = resolveToolProfilePolicy(profile);`
`33`		`-if (profilePolicy) {`
`34`		`-policies.push(profilePolicy);`
`35`		`-}`
`36`		`-`
`37`		`-const globalPolicy = pickSandboxToolPolicy(params.cfg.tools ?? undefined);`
`38`		`-if (globalPolicy) {`
`39`		`-policies.push(globalPolicy);`
`40`		`-}`
`41`		`-`
`42`		`-const agentPolicy = pickSandboxToolPolicy(params.agentTools);`
`43`		`-if (agentPolicy) {`
`44`		`-policies.push(agentPolicy);`
`45`		`-}`
`46`		`-`
`47`		`-if (params.sandboxMode === "all") {`
`48`		`-policies.push(resolveSandboxToolPolicyForAgent(params.cfg, params.agentId));`
`49`		`-}`
`50`		`-`
`51`		`-return policies;`
`52`		`-}`
`53`		`-`
`54`	`21`	`function resolveExecHost(params: {`
`55`	`22`	`globalExec?: ExecToolConfig;`
`56`	`23`	`agentExec?: ExecToolConfig;`
`@@ -113,7 +80,7 @@ export function collectExecFilesystemPolicyDriftHits(`
`113`	`80`	`continue;`
`114`	`81`	`}`
`115`	`82`
`116`		`-const policies = resolveToolPolicies({`
	`83`	`+const policies = resolveConfiguredToolPolicies({`
`117`	`84`	`cfg,`
`118`	`85`	`agentTools: context.tools,`
`119`	`86`	`sandboxMode: sandbox.mode,`

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

推荐订阅源

Recent Commits to openclaw:main