eblume/kingfisher
1
0
Fork 0
forked from mirrors/kingfisher
Code Pull requests Activity Actions

preparing for v1.100.0

Browse source
This commit is contained in:
Mick Grove 2026-05-18 23:39:05 -04:00
commit c67dcc049d
2 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/decompress.rs
View file

@ -161,6 +161,14 @@ pub fn extract_zip_archive_in_memory(
data: &[u8],
archive_label: &str,
) -> Result<Vec<(String, Vec<u8>)>> {
if data.len() > MAX_INMEM_ZIP_ARCHIVE_BYTES {
anyhow::bail!(
"zip archive {archive_label} is {} bytes, exceeding {} byte in-memory cap",
data.len(),
MAX_INMEM_ZIP_ARCHIVE_BYTES
);
}
// Per-entry cap on decompressed bytes: bounds memory cost of zip bombs.
// Mirrors the disk-streaming variant's cap.
// nosemgrep: this is the defensive cap — do not flag for missing-limit rules.

41
src/scanner/enumerate.rs
View file

@ -704,15 +704,44 @@ fn try_extract_git_blob_archive(
}
// Single-stream decompression (gz/bz2/xz/zlib) gives one logical
// payload — present it as a single entry under the archive name.
CompressedContent::Raw(bytes) => vec![(format!("{}!content", archive_label), bytes)],
CompressedContent::RawFile(path) => match std::fs::read(&path) {
Ok(bytes) => vec![(format!("{}!content", archive_label), bytes)],
Err(e) => {
// payload; cap it just like aggregate archive-entry reads.
CompressedContent::Raw(mut bytes) => {
if bytes.len() as u64 > MAX_DISK_PATH_AGGREGATE_BYTES {
debug!(
"{archive_label} single-stream payload exceeded {MAX_DISK_PATH_AGGREGATE_BYTES} byte cap; truncating"
);
bytes.truncate(MAX_DISK_PATH_AGGREGATE_BYTES as usize);
}
vec![(format!("{}!content", archive_label), bytes)]
}
CompressedContent::RawFile(path) => {
let payload_len = match std::fs::metadata(&path) {
Ok(md) => md.len(),
Err(e) => {
debug!("Failed to stat decompressed payload {}: {e}", path.display());
return Ok(None);
}
};
let file = match std::fs::File::open(&path) {
Ok(file) => file,
Err(e) => {
debug!("Failed to open decompressed payload {}: {e}", path.display());
return Ok(None);
}
};
let to_read = payload_len.min(MAX_DISK_PATH_AGGREGATE_BYTES);
let mut bytes = Vec::with_capacity(to_read as usize);
if let Err(e) = file.take(to_read).read_to_end(&mut bytes) {
debug!("Failed to read decompressed payload {}: {e}", path.display());
return Ok(None);
}
},
if payload_len > MAX_DISK_PATH_AGGREGATE_BYTES {
debug!(
"{archive_label} single-stream payload exceeded {MAX_DISK_PATH_AGGREGATE_BYTES} byte cap; truncating"
);
}
vec![(format!("{}!content", archive_label), bytes)]
}
};
if entries.is_empty() { Ok(None) } else { Ok(Some(entries)) }