惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

Y
Y Combinator Blog
The GitHub Blog
The GitHub Blog
Vercel News
Vercel News
D
DataBreaches.Net
MongoDB | Blog
MongoDB | Blog
H
Help Net Security
小众软件
小众软件
美团技术团队
T
The Blog of Author Tim Ferriss
爱范儿
爱范儿
D
Docker
Martin Fowler
Martin Fowler
大猫的无限游戏
大猫的无限游戏
博客园 - 聂微东
Blog — PlanetScale
Blog — PlanetScale
H
Hackread – Cybersecurity News, Data Breaches, AI and More
罗磊的独立博客
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
V
V2EX
S
SegmentFault 最新的问题
云风的 BLOG
云风的 BLOG
B
Blog
雷峰网
雷峰网
The Cloudflare Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(sandbox): honor explicit docker env (#82763) · opencl...
joshavant · 2026-05-17 · via Recent Commits to openclaw:main

@@ -4,8 +4,11 @@ import {

44

materializeWindowsSpawnProgram,

55

resolveWindowsSpawnProgram,

66

} from "../../plugin-sdk/windows-spawn.js";

7-

import { sanitizeEnvVars } from "./sanitize-env-vars.js";

8-

import type { EnvSanitizationOptions } from "./sanitize-env-vars.js";

7+

import {

8+

sanitizeEnvVars,

9+

sanitizeExplicitSandboxEnvVars,

10+

type EnvSanitizationOptions,

11+

} from "./sanitize-env-vars.js";

9121013

type ExecDockerRawOptions = {

1114

allowFailure?: boolean;

@@ -165,7 +168,10 @@ export function execDockerRaw(

165168

import { formatCliCommand } from "../../cli/command-format.js";

166169

import { markOpenClawExecEnv } from "../../infra/openclaw-exec-env.js";

167170

import { defaultRuntime } from "../../runtime.js";

168-

import { computeSandboxConfigHash } from "./config-hash.js";

171+

import {

172+

computeSandboxConfigHash,

173+

SANDBOX_DOCKER_EXPLICIT_ENV_POLICY_EPOCH,

174+

} from "./config-hash.js";

169175

import { DEFAULT_SANDBOX_IMAGE } from "./constants.js";

170176

import { readRegistryEntry, updateRegistry } from "./registry.js";

171177

import { resolveSandboxAgentId, resolveSandboxScopeKey, slugifySessionKey } from "./shared.js";

@@ -179,6 +185,31 @@ const HOT_CONTAINER_WINDOW_MS = 5 * 60 * 1000;

179185180186

export type ExecDockerOptions = ExecDockerRawOptions;

181187188+

function envRecordsEqual(left: Record<string, string>, right: Record<string, string>): boolean {

189+

const leftEntries = Object.entries(left).toSorted(([leftKey], [rightKey]) =>

190+

leftKey.localeCompare(rightKey),

191+

);

192+

const rightEntries = Object.entries(right).toSorted(([leftKey], [rightKey]) =>

193+

leftKey.localeCompare(rightKey),

194+

);

195+

if (leftEntries.length !== rightEntries.length) {

196+

return false;

197+

}

198+

return leftEntries.every(([key, value], index) => {

199+

const rightEntry = rightEntries[index];

200+

return rightEntry?.[0] === key && rightEntry[1] === value;

201+

});

202+

}

203+204+

export function resolveDockerEnvPolicyEpoch(env: Record<string, string | undefined> | undefined) {

205+

const explicitEnv = env ?? {};

206+

const previousAllowed = sanitizeEnvVars(explicitEnv).allowed;

207+

const currentAllowed = sanitizeExplicitSandboxEnvVars(explicitEnv).allowed;

208+

return envRecordsEqual(previousAllowed, currentAllowed)

209+

? undefined

210+

: SANDBOX_DOCKER_EXPLICIT_ENV_POLICY_EPOCH;

211+

}

212+182213

export async function execDocker(args: string[], opts?: ExecDockerOptions) {

183214

const result = await execDockerRaw(args, opts);

184215

return {

@@ -382,6 +413,11 @@ export function buildSandboxCreateArgs(params: {

382413

allowSourcesOutsideAllowedRoots?: boolean;

383414

allowReservedContainerTargets?: boolean;

384415

allowContainerNamespaceJoin?: boolean;

416+

/**

417+

* @deprecated Docker container creation now treats cfg.env as explicit sandbox

418+

* configuration and ignores host-env name filters. This field is kept so SDK

419+

* callers with existing object literals do not hit excess-property failures.

420+

*/

385421

envSanitizationOptions?: EnvSanitizationOptions;

386422

}) {

387423

// Runtime security validation: blocks dangerous bind mounts, network modes, and profiles.

@@ -425,12 +461,16 @@ export function buildSandboxCreateArgs(params: {

425461

if (params.cfg.user) {

426462

args.push("--user", params.cfg.user);

427463

}

428-

const envSanitization = sanitizeEnvVars(params.cfg.env ?? {}, params.envSanitizationOptions);

464+

const envSanitization = sanitizeExplicitSandboxEnvVars(params.cfg.env ?? {});

429465

if (envSanitization.blocked.length > 0) {

430-

log.warn(`Blocked sensitive environment variables: ${envSanitization.blocked.join(", ")}`);

466+

log.warn(

467+

`Blocked invalid configured sandbox environment variables: ${envSanitization.blocked.join(", ")}`,

468+

);

431469

}

432470

if (envSanitization.warnings.length > 0) {

433-

log.warn(`Suspicious environment variables: ${envSanitization.warnings.join(", ")}`);

471+

log.warn(

472+

`Suspicious configured sandbox environment variables: ${envSanitization.warnings.join(", ")}`,

473+

);

434474

}

435475

for (const [key, value] of Object.entries(markOpenClawExecEnv(envSanitization.allowed))) {

436476

args.push("--env", `${key}=${value}`);

@@ -562,6 +602,7 @@ export async function ensureSandboxContainer(params: {

562602

const containerName = name.slice(0, 63);

563603

const expectedHash = computeSandboxConfigHash({

564604

docker: params.cfg.docker,

605+

dockerEnvPolicyEpoch: resolveDockerEnvPolicyEpoch(params.cfg.docker.env),

565606

workspaceAccess: params.cfg.workspaceAccess,

566607

workspaceDir: params.workspaceDir,

567608

agentWorkspaceDir: params.agentWorkspaceDir,