CalvinBackup/gstack
1
0
Fork 0
mirror of https://github.com/garrytan/gstack.git synced 2026-09-09 22:48:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(memory-ingest): GIT_CEILING_DIRECTORIES defense-in-depth on the import child (#2144)

Browse Source 
Second layer under #2560's --include-gitignored: a realpath'd ceiling at the
staging dir's parent pushes any git-enumerating collector off the git fast
path (which sees zero files under ~/.gstack's ignore-everything root) onto
its plain FS walk, even on gbrain builds whose flag semantics drift. Ceiling
is realpath'd because git compares canonicalized directories during
discovery — a staging dir reached through a symlink (macOS /var ->
/private/var, symlinked $GSTACK_HOME) otherwise never matches.

Behavioral tests prove discovery stops at the ceiling from the staging dir,
including through a symlinked path, using git itself — no gbrain required.

Mechanism ported from time-attack/gstack (GStack 2).

Co-authored-by: Sina Matian <sina@time-attack.dev>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-08-14 11:47:25 -07:00
co-authored by Sina Matian Claude Fable 5
parent b1ee32ad86
commit 7531ae2b16
2 changed files with 85 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/gstack-memory-ingest.ts
+27 -7
View File
@@ -52,6 +52,7 @@ import {
readSync,
closeSync,
rmSync,
realpathSync,
} from "fs";
import { join, basename, dirname } from "path";
import { execFileSync, spawnSync, spawn, type ChildProcess } from "child_process";
@@ -1424,13 +1425,32 @@ function runGbrainImport(
// still reporting `written: N` from the staged count. Silent data loss
// on every run. A working run logs `import.collect_files done ... files=N`
// with N > 0 and takes minutes, not seconds.
const child = spawnGbrainAsync([
"import",
stagingDir,
"--no-embed",
"--include-gitignored",
"--json",
]);
//
// GIT_CEILING_DIRECTORIES is the second layer of the same #2144 defense:
// it stops git's upward repo discovery at the staging dir's parent, so a
// git-enumerating collector fails cleanly out of the git fast path and
// falls back to its plain FS walk even on gbrain builds whose flag
// semantics drift. The ceiling must be the REAL path — git compares
// canonicalized directories during discovery, and a staging dir reached
// through a symlink (macOS /var -> /private/var, symlinked $GSTACK_HOME)
// otherwise never matches the ceiling entry. Scoped to this one child;
// no on-disk state, staging-guard/resume contracts untouched.
let ceiling: string;
try {
ceiling = realpathSync(dirname(stagingDir));
} catch {
ceiling = dirname(stagingDir); // staging parent vanished mid-run; spawn will fail loudly anyway
}
const baseEnv: NodeJS.ProcessEnv = {
...process.env,
GIT_CEILING_DIRECTORIES: process.env.GIT_CEILING_DIRECTORIES
? `${ceiling}:${process.env.GIT_CEILING_DIRECTORIES}`
: ceiling,
};
const child = spawnGbrainAsync(
["import", stagingDir, "--no-embed", "--include-gitignored", "--json"],
{ baseEnv },
);
_activeImportChild = child;
let stdout = "";
let stderr = "";