refactor(exec): share policy layer merging · openclaw/openclaw@b60f631

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
`@@ -16,12 +16,7 @@ import type { ModelCompatConfig } from "../config/types.models.js";`
`16`	`16`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`17`	`17`	`import type { DiagnosticTraceContext } from "../infra/diagnostic-trace-context.js";`
`18`	`18`	`import { resolveEventSessionRoutingPolicy } from "../infra/event-session-routing.js";`
`19`		`-import {`
`20`		`-type ExecAsk,`
`21`		`-type ExecMode,`
`22`		`-type ExecSecurity,`
`23`		`-resolveExecPolicyForMode,`
`24`		`-} from "../infra/exec-approvals.js";`
	`19`	`+import { applyExecPolicyLayer } from "../infra/exec-policy.js";`
`25`	`20`	`import { resolveMergedSafeBinProfileFixtures } from "../infra/exec-safe-bin-runtime-policy.js";`
`26`	`21`	`import { logWarn } from "../logger.js";`
`27`	`22`	`import { getPluginToolMeta } from "../plugins/tools.js";`
`@@ -339,35 +334,6 @@ function isApplyPatchAllowedForModel(params: {`
`339`	`334`	`});`
`340`	`335`	`}`
`341`	`336`
`342`		`-type ExecPolicyLayer = {`
`343`		`-mode?: ExecMode;`
`344`		`-security?: ExecSecurity;`
`345`		`-ask?: ExecAsk;`
`346`		`-};`
`347`		`-`
`348`		`-function hasLegacyExecPolicy(exec?: ExecPolicyLayer): boolean {`
`349`		`-return exec?.security !== undefined \|\| exec?.ask !== undefined;`
`350`		`-}`
`351`		`-`
`352`		`-function applyExecPolicyLayer(base: ExecPolicyLayer, layer?: ExecPolicyLayer): ExecPolicyLayer {`
`353`		`-if (!layer) {`
`354`		`-return base;`
`355`		`-}`
`356`		`-if (layer.mode) {`
`357`		`-return {`
`358`		`-mode: layer.mode,`
`359`		`- ...resolveExecPolicyForMode(layer.mode),`
`360`		`-};`
`361`		`-}`
`362`		`-if (hasLegacyExecPolicy(layer)) {`
`363`		`-return {`
`364`		`-security: layer.security ?? base.security,`
`365`		`-ask: layer.ask ?? base.ask,`
`366`		`-};`
`367`		`-}`
`368`		`-return base;`
`369`		`-}`
`370`		`-`
`371`	`337`	`function resolveExecConfig(params: { cfg?: OpenClawConfig; agentId?: string }) {`
`372`	`338`	`const cfg = params.cfg;`
`373`	`339`	`const globalExec = cfg?.tools?.exec;`

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ import {`
`18`	`18`	`resolveExecApprovalsFromFile,`
`19`	`19`	`resolveExecModeFromPolicy,`
`20`	`20`	`resolveExecModePolicy,`
`21`		`-resolveExecPolicyForMode,`
`22`	`21`	`} from "../infra/exec-approvals.js";`
	`22`	`+import { applyExecPolicyLayer } from "../infra/exec-policy.js";`
`23`	`23`	`import { resolveAgentConfig, resolveSessionAgentId } from "./agent-scope.js";`
`24`	`24`	`import { isRequestedExecTargetAllowed, resolveExecTarget } from "./bash-tools.exec-runtime.js";`
`25`	`25`	`import { resolveSandboxRuntimeStatus } from "./sandbox/runtime-status.js";`
`@@ -36,12 +36,6 @@ type ResolvedExecConfig = {`
`36`	`36`
`37`	`37`	`type ExecOverridesConfig = Omit<ResolvedExecConfig, "mode">;`
`38`	`38`
`39`		`-// Legacy security/ask values remain accepted on existing sessions/config, but`
`40`		`-// mode wins when present because it expands to a complete policy tuple.`
`41`		`-function hasLegacyExecPolicyOverride(exec?: ResolvedExecConfig): boolean {`
`42`		`-return exec?.security !== undefined \|\| exec?.ask !== undefined;`
`43`		`-}`
`44`		`-`
`45`	`39`	`// Layering keeps the most specific mode/security/ask while preserving policy`
`46`	`40`	`// bounds from approvals and sandbox availability later in resolution.`
`47`	`41`	`type LayeredExecPolicy = {`
`@@ -50,28 +44,6 @@ type LayeredExecPolicy = {`
`50`	`44`	`ask: ExecAsk;`
`51`	`45`	`};`
`52`	`46`
`53`		`-function applyExecPolicyLayer(`
`54`		`-base: LayeredExecPolicy,`
`55`		`-layer?: ResolvedExecConfig,`
`56`		`-): LayeredExecPolicy {`
`57`		`-if (!layer) {`
`58`		`-return base;`
`59`		`-}`
`60`		`-if (layer.mode) {`
`61`		`-return {`
`62`		`-mode: layer.mode,`
`63`		`- ...resolveExecPolicyForMode(layer.mode),`
`64`		`-};`
`65`		`-}`
`66`		`-if (hasLegacyExecPolicyOverride(layer)) {`
`67`		`-return {`
`68`		`-security: layer.security ?? base.security,`
`69`		`-ask: layer.ask ?? base.ask,`
`70`		`-};`
`71`		`-}`
`72`		`-return base;`
`73`		`-}`
`74`		`-`
`75`	`47`	`function applySessionLegacyExecPolicyLayer(`
`76`	`48`	`base: LayeredExecPolicy,`
`77`	`49`	`sessionEntry?: SessionEntry,`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,31 @@`
	`1`	`+import type { ExecAsk, ExecMode, ExecSecurity } from "./exec-approvals.js";`
	`2`	`+import { resolveExecPolicyForMode } from "./exec-approvals.js";`
	`3`	`+`
	`4`	`+export type ExecPolicyLayer = {`
	`5`	`+mode?: ExecMode;`
	`6`	`+security?: ExecSecurity;`
	`7`	`+ask?: ExecAsk;`
	`8`	`+};`
	`9`	`+`
	`10`	`+// oxlint-disable-next-line typescript/no-unnecessary-type-parameters -- Preserve each caller's required policy fields.`
	`11`	`+export function applyExecPolicyLayer<TBase extends ExecPolicyLayer>(`
	`12`	`+base: TBase,`
	`13`	`+layer?: ExecPolicyLayer,`
	`14`	`+): TBase & ExecPolicyLayer {`
	`15`	`+if (!layer) {`
	`16`	`+return base;`
	`17`	`+}`
	`18`	`+if (layer.mode) {`
	`19`	`+return {`
	`20`	`+mode: layer.mode,`
	`21`	`+ ...resolveExecPolicyForMode(layer.mode),`
	`22`	`+} as TBase & ExecPolicyLayer;`
	`23`	`+}`
	`24`	`+if (layer.security !== undefined \|\| layer.ask !== undefined) {`
	`25`	`+return {`
	`26`	`+security: layer.security ?? base.security,`
	`27`	`+ask: layer.ask ?? base.ask,`
	`28`	`+} as TBase & ExecPolicyLayer;`
	`29`	`+}`
	`30`	`+return base;`
	`31`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,17 @@ import {`
`19`	`19`	`resolveAllowAlwaysPersistenceDecision,`
`20`	`20`	`resolveExecApprovals,`
`21`	`21`	`resolveExecModePolicy,`
`22`		`-resolveExecPolicyForMode,`
`23`	`22`	`type ExecAllowlistEntry,`
`24`	`23`	`type ExecAsk,`
`25`	`24`	`type ExecCommandSegment,`
`26`		`-type ExecMode,`
`27`	`25`	`type ExecSegmentSatisfiedBy,`
`28`	`26`	`type ExecSecurity,`
`29`	`27`	`type SkillBinTrustEntry,`
`30`	`28`	`} from "../infra/exec-approvals.js";`
`31`	`29`	`import type { ExecAuthorizationPlan } from "../infra/exec-authorization-plan.js";`
`32`	`30`	`import type { ExecAutoReviewer } from "../infra/exec-auto-review.js";`
`33`	`31`	`import type { ExecHostRequest, ExecHostResponse, ExecHostRunResult } from "../infra/exec-host.js";`
	`32`	`+import { applyExecPolicyLayer } from "../infra/exec-policy.js";`
`34`	`33`	`import { resolveExecSafeBinRuntimePolicy } from "../infra/exec-safe-bin-runtime-policy.js";`
`35`	`34`	`import {`
`36`	`35`	`extractEnvAssignmentKeysFromDispatchWrappers,`
`@@ -145,12 +144,6 @@ const APPROVAL_SCRIPT_OPERAND_DRIFT_DENIED_MESSAGE =`
`145`	`144`	`"SYSTEM_RUN_DENIED: approval script operand changed before execution";`
`146`	`145`	`type ExecToolConfig = NonNullable<NonNullable<OpenClawConfig["tools"]>["exec"]>;`
`147`	`146`
`148`		`-type LayeredExecPolicy = {`
`149`		`-mode?: ExecMode;`
`150`		`-security: ExecSecurity;`
`151`		`-ask: ExecAsk;`
`152`		`-};`
`153`		`-`
`154`	`147`	`type EffectiveSystemRunExecPolicy = {`
`155`	`148`	`agentExec: ExecToolConfig \| undefined;`
`156`	`149`	`globalExec: ExecToolConfig \| undefined;`
`@@ -160,29 +153,6 @@ type EffectiveSystemRunExecPolicy = {`
`160`	`153`	`autoReview: boolean;`
`161`	`154`	`};`
`162`	`155`
`163`		`-function hasLegacyExecPolicyOverride(exec?: ExecToolConfig): boolean {`
`164`		`-return exec?.security !== undefined \|\| exec?.ask !== undefined;`
`165`		`-}`
`166`		`-`
`167`		`-function applyExecPolicyLayer(base: LayeredExecPolicy, layer?: ExecToolConfig): LayeredExecPolicy {`
`168`		`-if (!layer) {`
`169`		`-return base;`
`170`		`-}`
`171`		`-if (layer.mode) {`
`172`		`-return {`
`173`		`-mode: layer.mode,`
`174`		`- ...resolveExecPolicyForMode(layer.mode),`
`175`		`-};`
`176`		`-}`
`177`		`-if (hasLegacyExecPolicyOverride(layer)) {`
`178`		`-return {`
`179`		`-security: layer.security ?? base.security,`
`180`		`-ask: layer.ask ?? base.ask,`
`181`		`-};`
`182`		`-}`
`183`		`-return base;`
`184`		`-}`
`185`		`-`
`186`	`156`	`function warnWritableTrustedDirOnce(message: string): void {`
`187`	`157`	`if (safeBinTrustedDirWarningCache.has(message)) {`
`188`	`158`	`return;`

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

推荐订阅源

Recent Commits to openclaw:main