Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/lib/sandbox/build-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ function stageLegacySandboxBuildContext(
fs.cpSync(path.join(rootDir, "scripts"), path.join(buildCtx, "scripts"), {
recursive: true,
});
normalizeReadModesForDockerCopy(path.join(buildCtx, "scripts"));
fs.cpSync(
path.join(rootDir, "src", "lib", "messaging"),
path.join(buildCtx, "src", "lib", "messaging"),
Expand Down Expand Up @@ -260,6 +261,7 @@ function stageOptimizedSandboxBuildContext(
path.join(rootDir, "scripts", "lib", "reviewed-npm-archive.mts"),
path.join(stagedScriptsDir, "lib", "reviewed-npm-archive.mts"),
);
normalizeReadModesForDockerCopy(stagedScriptsDir);

return { buildCtx, stagedDockerfile };
}
Expand Down
54 changes: 53 additions & 1 deletion test/sandbox-build-context.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ describe("sandbox build context staging", () => {
writeFixture(path.join("scripts", "patch-openclaw-issue-4434-diagnostics.mts"));
writeFixture(path.join("scripts", "patch-openclaw-device-self-approval.mts"));
writeFixture(path.join("scripts", "verify-wechat-runtime-lock.mts"));
writeFixture(path.join("scripts", "lib", "reviewed-npm-archive.mts"));
writeFixture(path.join("scripts", "lib", "reviewed-npm-archive.mts"), "fixture\n", 0o700);
fs.chmodSync(path.join(sourceRoot, "scripts"), 0o700);
fs.chmodSync(path.join(sourceRoot, "scripts", "lib"), 0o700);
}

function expectDockerfileScriptCopiesExist(buildCtx: string, stagedDockerfile: string) {
Expand Down Expand Up @@ -187,6 +189,16 @@ describe("sandbox build context staging", () => {
expect(fs.existsSync(path.join(buildCtx, "src", "lib", "tool-disclosure.ts"))).toBe(true);
}

function expectStagedScriptModes(buildCtx: string) {
const stagedScripts = path.join(buildCtx, "scripts");
const stagedLib = path.join(stagedScripts, "lib");
const stagedHelper = path.join(stagedLib, "reviewed-npm-archive.mts");

expect((fs.statSync(stagedScripts).mode & 0o777).toString(8)).toBe("755");
expect((fs.statSync(stagedLib).mode & 0o777).toString(8)).toBe("755");
expect((fs.statSync(stagedHelper).mode & 0o777).toString(8)).toBe("755");
}

it("normalizes copied blueprint modes with chmod a+rX semantics", () => {
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "nemoclaw-build-context-unit-"));
const blueprintDir = path.join(tmpDir, "nemoclaw-blueprint");
Expand Down Expand Up @@ -281,6 +293,46 @@ describe("sandbox build context staging", () => {
}
});

it("optimized staging makes copied scripts readable under a restrictive umask (#7071)", () => {
const sourceRoot = fs.mkdtempSync(path.join(os.tmpdir(), "nemoclaw-build-context-source-"));
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "nemoclaw-build-context-script-mode-"));

try {
writeBuildContextFixture(sourceRoot);
const previousUmask = process.umask(0o077);
try {
const { buildCtx } = stageOptimizedSandboxBuildContext(sourceRoot, tmpDir);
expectStagedScriptModes(buildCtx);
} finally {
process.umask(previousUmask);
}
} finally {
fs.rmSync(sourceRoot, { recursive: true, force: true });
fs.rmSync(tmpDir, { recursive: true, force: true });
}
});

it("legacy staging makes copied scripts readable under a restrictive umask (#7071)", () => {
const sourceRoot = fs.mkdtempSync(path.join(os.tmpdir(), "nemoclaw-build-context-source-"));
const tmpDir = fs.mkdtempSync(
path.join(os.tmpdir(), "nemoclaw-build-context-legacy-script-mode-"),
);

try {
writeBuildContextFixture(sourceRoot);
const previousUmask = process.umask(0o077);
try {
const { buildCtx } = stageLegacySandboxBuildContext(sourceRoot, tmpDir);
expectStagedScriptModes(buildCtx);
} finally {
process.umask(previousUmask);
}
} finally {
fs.rmSync(sourceRoot, { recursive: true, force: true });
fs.rmSync(tmpDir, { recursive: true, force: true });
}
});

it("optimized staging excludes blueprint .venv and extra scripts while preserving required files", () => {
const repoRoot = path.join(import.meta.dirname, "..");
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "nemoclaw-build-context-opt-"));
Expand Down
Loading