mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-11 18:40:42 +00:00
[codex] Extract filesystem safety primitives (#77918)
* refactor: extract filesystem safety primitives * refactor: use fs-safe for file access helpers * refactor: reuse fs-safe for media reads * refactor: use fs-safe for image reads * refactor: reuse fs-safe in qqbot media opener * refactor: reuse fs-safe for local media checks * refactor: consume cleaner fs-safe api * refactor: align fs-safe json option names * fix: preserve fs-safe migration contracts * refactor: use fs-safe primitive subpaths * refactor: use grouped fs-safe subpaths * refactor: align fs-safe api usage * refactor: adapt private state store api * chore: refresh proof gate * refactor: follow fs-safe json api split * refactor: follow reduced fs-safe surface * build: default fs-safe python helper off * fix: preserve fs-safe plugin sdk aliases * refactor: consolidate fs-safe usage * refactor: unify fs-safe store usage * refactor: trim fs-safe temp workspace usage * refactor: hide low-level fs-safe primitives * build: use published fs-safe package * fix: preserve outbound recovery durability after rebase * chore: refresh pr checks
This commit is contained in:
committed by
GitHub
parent
61481eb34f
commit
538605ff44
@@ -139,9 +139,9 @@ async function loadFsSafeModule(): Promise<FsSafeModule> {
|
||||
|
||||
function shouldSkipScriptPreflightPathError(
|
||||
error: unknown,
|
||||
SafeOpenError: FsSafeModule["SafeOpenError"],
|
||||
FsSafeError: FsSafeModule["FsSafeError"],
|
||||
): boolean {
|
||||
if (error instanceof SafeOpenError) {
|
||||
if (error instanceof FsSafeError) {
|
||||
return true;
|
||||
}
|
||||
const errorCode = getNodeErrorCode(error);
|
||||
@@ -155,8 +155,8 @@ function resolvePreflightRelativePath(params: { rootDir: string; absPath: string
|
||||
if (/^\.\.(?:[\\/]|$)/u.test(relative) || path.isAbsolute(relative)) {
|
||||
return null;
|
||||
}
|
||||
// Preserve literal "~" path segments under the workdir. `readFileWithinRoot`
|
||||
// expands home prefixes for relative paths, so normalize `~/...` to `./~/...`.
|
||||
// Preserve literal "~" path segments under the workdir. Root reads
|
||||
// expand home prefixes for relative paths, so normalize `~/...` to `./~/...`.
|
||||
return /^~(?:$|[\\/])/u.test(relative) ? `.${path.sep}${relative}` : relative;
|
||||
}
|
||||
|
||||
@@ -973,7 +973,8 @@ async function validateScriptFileForShellBleed(params: {
|
||||
return;
|
||||
}
|
||||
|
||||
const { SafeOpenError, readFileWithinRoot } = await loadFsSafeModule();
|
||||
const { FsSafeError, root: fsRoot } = await loadFsSafeModule();
|
||||
const workspaceRoot = await fsRoot(params.workdir);
|
||||
for (const relOrAbsPath of target.relOrAbsPaths) {
|
||||
const absPath = path.isAbsolute(relOrAbsPath)
|
||||
? path.resolve(relOrAbsPath)
|
||||
@@ -992,16 +993,14 @@ async function validateScriptFileForShellBleed(params: {
|
||||
// Use non-blocking open to avoid stalls if a path is swapped to a FIFO.
|
||||
let content: string;
|
||||
try {
|
||||
const safeRead = await readFileWithinRoot({
|
||||
rootDir: params.workdir,
|
||||
relativePath,
|
||||
const safeRead = await workspaceRoot.read(relativePath, {
|
||||
nonBlockingRead: true,
|
||||
allowSymlinkTargetWithinRoot: true,
|
||||
symlinks: "follow-within-root",
|
||||
maxBytes: 512 * 1024,
|
||||
});
|
||||
content = safeRead.buffer.toString("utf-8");
|
||||
} catch (error) {
|
||||
if (shouldSkipScriptPreflightPathError(error, SafeOpenError)) {
|
||||
if (shouldSkipScriptPreflightPathError(error, FsSafeError)) {
|
||||
// Preflight validation is best-effort: skip path/read failures and
|
||||
// continue to execute the command normally.
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user