mirror of
https://github.com/morluto/rea.git
synced 2026-11-08 07:46:28 +00:00
* fix: select caller paths through symlinks and .. as the filesystem does CLI adapters, binary target resolution, the reverse-engineering service and the objdump and Rizin command builders made caller-selected paths absolute with path.resolve, which collapses `link/..` lexically. On POSIX the filesystem follows `link` first, so these commands inspected, hashed or launched a different file and returned internally consistent Evidence for it. absoluteCallerPath now owns that step: on POSIX it prefixes a relative path with the working directory and keeps an absolute path as spelled; on Windows, where `..` resolves lexically, it keeps win32.resolve. Fixes #3864 Fixes #3911 Fixes #3912 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: keep firmware, WASM list and output-root paths on the selected file Review follow-up. The CLI already passed firmware and WASM paths through absoluteCallerPath, but snapshotFirmware and SafeOutputTree.create re-resolved them lexically, and the WASM glue and candidate lists still used resolve, so those inputs could still select a sibling file or create output beside the intended directory. absoluteCallerPath now also drops `.` segments and repeated or trailing separators on POSIX, which never change the named file, so selected paths such as `./module.wasm` keep matching their glue references exactly. Every `..` is still left for the filesystem. SafeOutputTree keeps host path syntax; its platform argument selects only the Windows name policy. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: keep directory requirements and relative cwd in caller paths Review follow-up. absoluteCallerPath stripped a trailing `/` or `/.`, so `file/` selected the regular file instead of failing with ENOTDIR; it now keeps one trailing separator. A relative cwd option was appended to the root; it is now made absolute without collapsing `..`. WASM glue matching resolved local literals lexically, so a module selected through `link/..` matched only by basename; the adapter now compares both sides through absoluteCallerPath and still reports each candidate as given. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
33 lines
1.3 KiB
TypeScript
33 lines
1.3 KiB
TypeScript
import { posix, win32 } from "node:path";
|
|
|
|
/**
|
|
* Make a caller-selected local path absolute without changing which file it
|
|
* names. POSIX resolves `..` after following the preceding symlink, so lexical
|
|
* normalization of `link/../file` can select a different file. On POSIX, only
|
|
* interior `.` segments and repeated separators are removed, which never
|
|
* change the named file; every `..` is kept for the filesystem to resolve, and
|
|
* a trailing `/` or `/.` keeps its directory requirement as one trailing `/`.
|
|
* A relative `cwd` is made absolute the same way. Win32 resolves `..`
|
|
* lexically, so normalizing there is exact.
|
|
*/
|
|
export const absoluteCallerPath = (
|
|
path: string,
|
|
{
|
|
cwd = process.cwd(),
|
|
platform = process.platform,
|
|
}: { readonly cwd?: string; readonly platform?: NodeJS.Platform } = {},
|
|
): string => {
|
|
if (platform === "win32") return win32.resolve(cwd, path);
|
|
if (!posix.isAbsolute(path)) {
|
|
const base = posix.isAbsolute(cwd)
|
|
? cwd
|
|
: absoluteCallerPath(cwd, { platform });
|
|
return absoluteCallerPath(`${base}/${path}`, { platform });
|
|
}
|
|
const segments = path
|
|
.split("/")
|
|
.filter((segment) => segment !== "" && segment !== ".");
|
|
const directory = /\/\.?$/u.test(path) && segments.length > 0;
|
|
return `/${segments.join("/")}${directory ? "/" : ""}`;
|
|
};
|