fix(sandbox): strict profile no longer lets a child rewrite ~/.kigi
Port of upstream grok-build 1.0.14 ("--sandbox strict now restricts
writes to ~/.grok/sessions only"), shaped for Kigi.
The strict profile granted the whole ~/.kigi read-write, so a sandboxed
command could plant a global SessionStart hook or flip
`[sandbox].profile` in config.toml for the next launch. Landlock cannot
carve a child out of a write grant, so the home is now read-only
except an explicit allowlist of state subtrees (run, sessions,
worktrees, worktree_pool, tasks, memory, logs, debug, crash, memtrace,
trace-exports); config.toml, auth.json, sandbox.toml, hooks/, bin/ and
vendor/ stay read-only. A symlinked state dir under the home is
followed only to the default ~/.kigi/sessions.
What the process itself writes there after enforcement moves or is
minted first:
- kigi-shell `apply_sandbox` mints the device id, extracts the bundled
rg and the bundled skills BEFORE enforcement for every profile that
restricts home writes (`restricts_home_writes`, custom profiles
extending strict included).
- The sandbox audit log lives at ~/.kigi/sessions/sandbox-events.jsonl.
- Leader lock/socket default to ~/.kigi/run/, the leader stderr log to
~/.kigi/logs/leader.log; discovery scans run/ and the legacy root,
and the default target prefers the current socket.
Root-level caches (version.json, agent_id, slash-mru.json, pager.toml,
claude_import_state.json) degrade best-effort under strict; documented.
Claude-Session: https://claude.ai/code/session_01RUqV8HVGXcAETyYbZ2tPQ4
This commit is contained in:
1 parent
cadc46f5dc
commit
97c934a647
13 files changed
+300
-25
No files matched your search
@@ -360,6 +360,23 @@ pub fn requires_read_deny(profile: &ProfileName, workspace: &Path) -> bool {
|
||||
pub fn requires_read_deny(_profile: &ProfileName, _workspace: &Path) -> bool {
|
||||
false
|
||||
}
|
||||
/// Whether the resolved profile leaves `~/.kigi` read-only outside its
|
||||
/// state dirs (strict and every profile extending it), so files first use
|
||||
/// would write there must be minted before enforcement.
|
||||
#[cfg(all(feature = "enforce", unix))]
|
||||
pub fn restricts_home_writes(profile: &ProfileName, workspace: &Path) -> bool {
|
||||
if *profile == ProfileName::Off {
|
||||
return false;
|
||||
}
|
||||
let config = profiles::load_sandbox_config(workspace);
|
||||
profile
|
||||
.resolve_profile(workspace, &config)
|
||||
.is_ok_and(|resolved| !resolved.read_write.contains(&paths::kigi_home()))
|
||||
}
|
||||
#[cfg(not(all(feature = "enforce", unix)))]
|
||||
pub fn restricts_home_writes(_profile: &ProfileName, _workspace: &Path) -> bool {
|
||||
false
|
||||
}
|
||||
/// A profile's resolved bwrap deny plan: read-only mounts (`deny_write`),
|
||||
/// bound-over unreadable placeholders (`deny_read`), and whether the profile
|
||||
/// carries deny globs (`has_globs`, so the re-exec proceeds even with zero
|
||||
@@ -717,3 +734,31 @@ mod tests {
|
||||
let _ = std::fs::remove_dir_all(&ws_ws);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(all(test, feature = "enforce", unix))]
|
||||
mod home_write_tests {
|
||||
use super::{ProfileName, restricts_home_writes};
|
||||
|
||||
#[test]
|
||||
fn strict_restricts_home_writes_and_workspace_does_not() {
|
||||
let workspace = std::env::temp_dir();
|
||||
assert!(restricts_home_writes(&ProfileName::Strict, &workspace));
|
||||
assert!(!restricts_home_writes(&ProfileName::Workspace, &workspace));
|
||||
assert!(!restricts_home_writes(&ProfileName::ReadOnly, &workspace));
|
||||
assert!(!restricts_home_writes(&ProfileName::Off, &workspace));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn custom_profile_extending_strict_inherits_the_restriction() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let project = tmp.path().join(".kigi");
|
||||
std::fs::create_dir_all(&project).unwrap();
|
||||
std::fs::write(
|
||||
project.join("sandbox.toml"),
|
||||
"[profiles.audit-home-write-test]\nextends = \"strict\"\n",
|
||||
)
|
||||
.unwrap();
|
||||
let custom = ProfileName::Custom("audit-home-write-test".to_string());
|
||||
assert!(restricts_home_writes(&custom, tmp.path()));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user