Skip to content

Commit 8aec641

Browse files
shengyfuCopilot
andcommitted
Reject oversized managed owner claim files
Read one byte past the claim limit before deserializing so a valid JSON prefix cannot hide oversized whitespace or trailing data. Cover the boundary and preserved owner lifecycle through real CLI clients. Co-authored-by: Copilot App <[email protected]>
1 parent 7e9acd8 commit 8aec641

3 files changed

Lines changed: 68 additions & 2 deletions

File tree

‎SHARED_WORKTREE_INDEXES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,8 @@ mismatch is an error, not a silently different corpus.
996996
`{"token":"<bootstrap-token>"}`. Retry that token to recover the same issued
997997
claim after response loss. Persist the result's `claim` object outside the
998998
worktree, not the whole owner record or CLI envelope.
999+
Claim files are limited to 1 MiB, including whitespace; larger files are
1000+
rejected before deserialization or acquiring the owner guard.
9991001
2. Start and supervise `tgrep shared owner-hold --claim CLAIM_FILE`, keeping its
10001002
stdin open. After its `holding:true` response, call `owners.register` with
10011003
`{"claim":<issued-claim>}`. A Rust client can instead retain `OwnerGuard`.

‎tgrep-cli/src/serve/shared/protocol_v2.rs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,15 @@ pub(super) fn manage(root: &Path, method: &str, params: &str) -> Result<()> {
214214
}
215215

216216
pub(super) fn owner_hold(path: &Path) -> Result<()> {
217-
let claim: OwnerClaim =
218-
serde_json::from_reader(File::open(path)?.take(managed::MAX_REQUEST_BYTES as u64))?;
217+
let mut bytes = Vec::new();
218+
File::open(path)?
219+
.take(managed::MAX_REQUEST_BYTES as u64 + 1)
220+
.read_to_end(&mut bytes)?;
221+
ensure!(
222+
bytes.len() <= managed::MAX_REQUEST_BYTES,
223+
"managed owner claim exceeds its size limit"
224+
);
225+
let claim: OwnerClaim = serde_json::from_slice(&bytes)?;
219226
let guard = OwnerGuard::claim(claim)?;
220227
println!("{}", json!({"holding":true,"claim":guard.registration()}));
221228
std::io::stdout().flush()?;

‎tgrep-cli/tests/shared_daemon/managed_clients.rs‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,63 @@ fn escaped_cross_process_readers_block_collection_and_idle_stop_then_allow_exact
658658
}
659659
}
660660

661+
#[test]
662+
fn owner_holder_enforces_claim_file_size_limit() {
663+
let fixture = Fixture::new();
664+
let mut daemon = start(&fixture, &policy(), &["--no-watch"]);
665+
let limit = tgrep_core::managed::MAX_REQUEST_BYTES;
666+
let path = fixture.temp.path().join("owner.claim.json");
667+
for (name, padded_size, suffix) in [
668+
("oversized-whitespace", limit, " "),
669+
("oversized-trailing-data", limit, "{}"),
670+
("compact", 0, ""),
671+
("below-limit", limit - 1, ""),
672+
("at-limit", limit, ""),
673+
] {
674+
let prepared = daemon.rpc("owners.prepare", json!({"token":name}));
675+
let claim: OwnerClaim = serde_json::from_value(prepared["claim"].clone()).unwrap();
676+
let mut bytes = serde_json::to_vec(&claim).unwrap();
677+
if padded_size != 0 {
678+
assert!(bytes.len() < padded_size);
679+
bytes.resize(padded_size, b' ');
680+
}
681+
bytes.extend_from_slice(suffix.as_bytes());
682+
fs::write(&path, &bytes).unwrap();
683+
let mut child =
684+
runtime::Process::start(Command::new(assert_cmd::cargo::cargo_bin("tgrep")).args([
685+
"shared",
686+
"owner-hold",
687+
"--claim",
688+
path.to_str().unwrap(),
689+
]));
690+
if bytes.len() > limit {
691+
child.close_input();
692+
let output = child.finish(Duration::from_secs(30)).unwrap();
693+
assert!(!output.status.success(), "{name}: {output:?}");
694+
assert!(output.stdout.is_empty(), "{name}: {output:?}");
695+
assert!(
696+
String::from_utf8_lossy(&output.stderr)
697+
.contains("managed owner claim exceeds its size limit"),
698+
"{name}: {output:?}"
699+
);
700+
let guard = OwnerGuard::claim(claim.clone()).unwrap();
701+
daemon.rpc("owners.register", json!({"claim":claim}));
702+
daemon.rpc("owners.release", json!({"claim":claim}));
703+
drop(guard);
704+
} else {
705+
let holding = wait_json(&mut child, "holding");
706+
assert_eq!(holding["claim"], prepared["claim"], "{name}");
707+
daemon.rpc("owners.register", json!({"claim":claim}));
708+
daemon.rpc("owners.release", json!({"claim":claim}));
709+
child.close_input();
710+
success(child.finish(Duration::from_secs(30)).unwrap());
711+
}
712+
}
713+
stop(&mut daemon);
714+
drop(daemon);
715+
fixture.temp.close().unwrap();
716+
}
717+
661718
#[test]
662719
fn owner_holder_graceful_eof_releases_its_os_proof_without_guessing_process_identity() {
663720
let fixture = Fixture::new();

0 commit comments

Comments
 (0)