Record format dependencies and normalize container formatting

This commit is contained in:
Dylan M. Taylor committed 2026-11-15 17:48:05 +00:00
1 parent d052bfdd5c
commit 1b79c4b83a
2 files changed
+21 -11

No files matched your search

Generated
+10
View File
@@ -1821,6 +1821,16 @@ dependencies = [
"craft-fonts-build",
]
[[package]]
name = "craft-format"
version = "0.1.0"
dependencies = [
"craft-zip",
"proptest",
"serde_json",
"sha2 0.10.9",
]
[[package]]
name = "craft-gainmap"
version = "0.1.0"
+11 -11
View File
@@ -154,7 +154,8 @@ impl Writer {
if self.names.len().saturating_add(entries) > self.limits.max_entries {
return 0;
}
budget.saturating_sub(self.names.len().saturating_add(entries).saturating_mul(256).saturating_add(65_536))
budget
.saturating_sub(self.names.len().saturating_add(entries).saturating_mul(256).saturating_add(65_536))
.min((self.limits.max_expanded)().saturating_sub(self.expanded))
}
@@ -202,20 +203,18 @@ impl Reader {
// ZIP archives are typically small-to-moderate size.
let leaked: &'static [u8] = Box::leak(bytes.into_boxed_slice());
let mut archive = craft_zip::Archive::open(leaked, craft_zip::Limits {
max_entries: limits.max_entries as u64,
max_total_bytes: (limits.max_expanded)() as u64,
}).map_err(invalid)?;
let mut archive = craft_zip::Archive::open(
leaked,
craft_zip::Limits { max_entries: limits.max_entries as u64, max_total_bytes: (limits.max_expanded)() as u64 },
)
.map_err(invalid)?;
// Validate entry names match format rules: no empty, no backslashes,
// no path components that are "." or "..", and no duplicates.
let mut name_set = BTreeSet::new();
for entry_idx in 0..archive.len() {
if let Ok(Some(name)) = archive.entry_name(entry_idx) {
if name.is_empty()
|| name.contains('\\')
|| name.split('/').any(|c| c.is_empty() || c == "." || c == "..")
|| !name_set.insert(name)
if name.is_empty() || name.contains('\\') || name.split('/').any(|c| c.is_empty() || c == "." || c == "..") || !name_set.insert(name)
{
return Err(invalid("duplicate or invalid archive entry"));
}
@@ -329,8 +328,9 @@ impl Thumbnail {
if !self.valid(png) {
return Ok(());
}
let key = serde_json::to_vec(&serde_json::json!({"format": self.format, "app": self.app, "document": digest(document), "payload": digest(png)}))
.map_err(invalid)?;
let key =
serde_json::to_vec(&serde_json::json!({"format": self.format, "app": self.app, "document": digest(document), "payload": digest(png)}))
.map_err(invalid)?;
if !writer.room(2, key.len().saturating_add(png.len()), budget) {
return Ok(());
}