mirror of
https://github.com/0xrsydn/idx-cli.git
synced 2026-11-07 09:45:36 +00:00
fix(npm): no cache fallback without an absolute home directory
The release-gate Codex review found the relative-path fix incomplete: with XDG_CACHE_HOME unset and HOME empty or relative, the fallback was `.cache/...` under the current directory, so a checkout could plant the binary the launcher runs. Use the home cache only when the home path is absolute; otherwise the package's bin/ is the only location. npm smoke plants such a binary and checks it is never run (it was, before this). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01V3syn2fN2LNo5pvTSqc6eh
This commit is contained in:
parent
3041606916
commit
d2cd7115f1
3 changed files with 44 additions and 17 deletions
|
|
@ -56,7 +56,8 @@ The binary goes in the package's `bin/`, or, when that is not writable (a
|
||||||
root-owned `sudo npm install -g` whose postinstall npm 12 skipped), in a
|
root-owned `sudo npm install -g` whose postinstall npm 12 skipped), in a
|
||||||
per-user cache: `$XDG_CACHE_HOME` (if absolute), else `~/.cache`
|
per-user cache: `$XDG_CACHE_HOME` (if absolute), else `~/.cache`
|
||||||
(`~/Library/Caches` on macOS), under `<package>/<version>/<platform>-<arch>/`.
|
(`~/Library/Caches` on macOS), under `<package>/<version>/<platform>-<arch>/`.
|
||||||
The launcher looks in both. A
|
The launcher looks in both. With no absolute cache root (an empty or relative
|
||||||
|
`HOME`) there is no fallback, so nothing under the current directory is run. A
|
||||||
termination signal during that first-run download stops the installer too,
|
termination signal during that first-run download stops the installer too,
|
||||||
and it removes its partial file.
|
and it removes its partial file.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,22 +23,37 @@ const binaryName = process.platform === "win32" ? `${nativeBinary}.exe` : native
|
||||||
// (a root-owned global install whose postinstall npm 12 skipped), in a
|
// (a root-owned global install whose postinstall npm 12 skipped), in a
|
||||||
// per-user cache. scripts/idx.js looks in both, in this order.
|
// per-user cache. scripts/idx.js looks in both, in this order.
|
||||||
const packageBinaryPath = path.join(packageRoot, "bin", binaryName);
|
const packageBinaryPath = path.join(packageRoot, "bin", binaryName);
|
||||||
// A relative XDG_CACHE_HOME is invalid per the XDG spec, and would make the
|
// The cache root must be absolute: a relative one (an XDG_CACHE_HOME that the
|
||||||
// launcher run a binary from the current directory: ignore it.
|
// XDG spec calls invalid, or an empty or relative HOME) would make the
|
||||||
const xdgCacheHome = process.env.XDG_CACHE_HOME;
|
// launcher run a binary from the current directory. Without one there is no
|
||||||
const cacheBinaryPath = path.join(
|
// cache fallback.
|
||||||
xdgCacheHome && path.isAbsolute(xdgCacheHome)
|
function cacheRoot() {
|
||||||
? xdgCacheHome
|
const xdgCacheHome = process.env.XDG_CACHE_HOME;
|
||||||
: process.platform === "darwin"
|
if (xdgCacheHome && path.isAbsolute(xdgCacheHome)) {
|
||||||
? path.join(os.homedir(), "Library", "Caches")
|
return xdgCacheHome;
|
||||||
: path.join(os.homedir(), ".cache"),
|
}
|
||||||
packageName,
|
const home = os.homedir();
|
||||||
packageManifest.version,
|
if (!home || !path.isAbsolute(home)) {
|
||||||
// A home directory shared across machines must not mix architectures.
|
return null;
|
||||||
`${process.platform}-${process.arch}`,
|
}
|
||||||
binaryName,
|
return process.platform === "darwin"
|
||||||
);
|
? path.join(home, "Library", "Caches")
|
||||||
const binaryLocations = [packageBinaryPath, cacheBinaryPath];
|
: path.join(home, ".cache");
|
||||||
|
}
|
||||||
|
const cacheDirectory = cacheRoot();
|
||||||
|
const binaryLocations = [packageBinaryPath];
|
||||||
|
if (cacheDirectory) {
|
||||||
|
binaryLocations.push(
|
||||||
|
path.join(
|
||||||
|
cacheDirectory,
|
||||||
|
packageName,
|
||||||
|
packageManifest.version,
|
||||||
|
// A home directory shared across machines must not mix architectures.
|
||||||
|
`${process.platform}-${process.arch}`,
|
||||||
|
binaryName,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
let binaryPath = packageBinaryPath;
|
let binaryPath = packageBinaryPath;
|
||||||
const githubRepository = "0xrsydn/idx-cli";
|
const githubRepository = "0xrsydn/idx-cli";
|
||||||
const maxRedirects = 5;
|
const maxRedirects = 5;
|
||||||
|
|
|
||||||
|
|
@ -106,6 +106,17 @@ npm_config_cache="$npm_cache" npm install --prefix "$read_only_dir" "${smoke_dir
|
||||||
chmod -R a-w "${read_only_dir}/node_modules/idx-mcp"
|
chmod -R a-w "${read_only_dir}/node_modules/idx-mcp"
|
||||||
XDG_CACHE_HOME="${smoke_dir}/user-cache" IDX_BINARY_URL="${repo_root}/target/release/idx-mcp" \
|
XDG_CACHE_HOME="${smoke_dir}/user-cache" IDX_BINARY_URL="${repo_root}/target/release/idx-mcp" \
|
||||||
"${read_only_dir}/node_modules/.bin/idx-mcp" --help > "${smoke_dir}/read-only-help.txt"
|
"${read_only_dir}/node_modules/.bin/idx-mcp" --help > "${smoke_dir}/read-only-help.txt"
|
||||||
|
# Without an absolute cache root (empty HOME) there is no cache fallback, so a
|
||||||
|
# binary planted under the current directory is never run.
|
||||||
|
planted_dir="${smoke_dir}/planted"
|
||||||
|
planted="${planted_dir}/.cache/idx-mcp/$(node -p 'require("./npm/idx-mcp/package.json").version')/$(node -p 'process.platform + "-" + process.arch')/idx-mcp"
|
||||||
|
mkdir -p "$(dirname "$planted")"
|
||||||
|
printf '#!/bin/sh\necho PLANTED\n' > "$planted"
|
||||||
|
chmod +x "$planted"
|
||||||
|
if (cd "$planted_dir" && HOME='' XDG_CACHE_HOME='' "${read_only_dir}/node_modules/.bin/idx-mcp" --help 2>&1) | grep -q PLANTED; then
|
||||||
|
echo "npm smoke: the launcher ran a binary from the current directory" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
chmod -R u+w "${read_only_dir}/node_modules/idx-mcp"
|
chmod -R u+w "${read_only_dir}/node_modules/idx-mcp"
|
||||||
cached=("${smoke_dir}"/user-cache/idx-mcp/*/*/idx-mcp)
|
cached=("${smoke_dir}"/user-cache/idx-mcp/*/*/idx-mcp)
|
||||||
if ! head -n 1 "${smoke_dir}/read-only-help.txt" | grep -q "MCP server" || [[ ! -x "${cached[0]}" ]]; then
|
if ! head -n 1 "${smoke_dir}/read-only-help.txt" | grep -q "MCP server" || [[ ! -x "${cached[0]}" ]]; then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue