diff --git a/Cargo.lock b/Cargo.lock index 48cf38f..8946cb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -798,6 +798,12 @@ dependencies = [ "libc", ] +[[package]] +name = "core_detect" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -815,6 +821,11 @@ dependencies = [ "rustix 1.1.6", ] +[[package]] +name = "craft-codepage" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=ea24422ae9859dc5da398d0462bc87f8e02e0d10#ea24422ae9859dc5da398d0462bc87f8e02e0d10" + [[package]] name = "craft-dialogs" version = "0.1.0" @@ -890,6 +901,16 @@ dependencies = [ "objc2-app-kit 0.3.2", ] +[[package]] +name = "craft-mime" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=ea24422ae9859dc5da398d0462bc87f8e02e0d10#ea24422ae9859dc5da398d0462bc87f8e02e0d10" +dependencies = [ + "chrono", + "craft-codepage", + "encoding_rs", +] + [[package]] name = "craft-quit" version = "0.1.0" @@ -1384,6 +1405,20 @@ dependencies = [ "serde", ] +[[package]] +name = "encoding_rs" +version = "0.8.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89253175e704ab869b04f9db224d38630e0211a53841a79181deae0889e169f5" +dependencies = [ + "cfg-if", + "core_detect", + "multiversion_no_op", + "rustversion", + "scopeguard", + "simdutf8", +] + [[package]] name = "endi" version = "1.1.1" @@ -2744,6 +2779,7 @@ dependencies = [ "base64 0.22.1", "craft-fonts-build", "craft-mcmat", + "craft-mime", "craft-texture", "craft-xml", "dds", @@ -2947,6 +2983,12 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "multiversion_no_op" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" + [[package]] name = "naga" version = "30.0.1" diff --git a/Cargo.toml b/Cargo.toml index c3d9dff..2053454 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,6 +42,8 @@ rust-version = "1.95" repository = "https://github.com/storytold/materialcraft" [workspace.dependencies] +# Standard Base64 output; strict SBS decoding remains app-local. +craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "ea24422ae9859dc5da398d0462bc87f8e02e0d10", version = "0.1.0" } craft-texture-dds = { package = "craft-texture", version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "726ad0f8290bedb6ced60fa06200a6b574f9990d", features = ["dds"] } # Shared XML escaping; SBS model and serialization policy stay app-local. craft-xml = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "b6d9feed23ceae249b40593ed84a668343091627" } diff --git a/crates/formats/Cargo.toml b/crates/formats/Cargo.toml index 45d6fea..500dce3 100644 --- a/crates/formats/Cargo.toml +++ b/crates/formats/Cargo.toml @@ -9,6 +9,7 @@ license.workspace = true workspace = true [dependencies] +craft-mime = { workspace = true } craft-xml = { workspace = true } craft-mcmat = { workspace = true } materialcraft-core = { workspace = true } diff --git a/crates/formats/src/sbs/embedded.rs b/crates/formats/src/sbs/embedded.rs index d3f9431..f7b0974 100644 --- a/crates/formats/src/sbs/embedded.rs +++ b/crates/formats/src/sbs/embedded.rs @@ -31,13 +31,34 @@ pub(super) fn encode_embedded(bytes: &[u8]) -> Result { let mut encoder = flate2::write::ZlibEncoder::new(length.to_be_bytes().to_vec(), flate2::Compression::default()); encoder.write_all(bytes).map_err(|e| FormatError::Io(e.to_string()))?; let raw = encoder.finish().map_err(|e| FormatError::Io(e.to_string()))?; - Ok(base64_engine().encode(raw)) + Ok(craft_mime::transfer::base64(&raw)) } #[cfg(test)] mod tests { use super::*; + #[test] + fn shared_encoder_preserves_embedded_wire_bytes() { + for len in 0..=513 { + let bytes: Vec = (0..len).map(|i| (i % 256) as u8).collect(); + let mut encoder = flate2::write::ZlibEncoder::new((len as u32).to_be_bytes().to_vec(), flate2::Compression::default()); + encoder.write_all(&bytes).unwrap(); + let raw = encoder.finish().unwrap(); + assert_eq!(encode_embedded(&bytes).unwrap(), base64_engine().encode(&raw)); + assert_eq!(decode_embedded(&encode_embedded(&bytes).unwrap()).unwrap(), bytes); + } + } + + #[test] + fn strict_decoder_policy_is_not_replaced_by_mime_tolerance() { + assert!(decode_embedded("!!!!").unwrap_err().starts_with("bad base64:")); + assert!(decode_embedded("AA").unwrap_err().starts_with("bad base64:")); + let encoded = encode_embedded(b"payload").unwrap(); + let spaced = encoded.chars().map(|c| format!("{c} \n")).collect::(); + assert_eq!(decode_embedded(&spaced).unwrap(), b"payload"); + } + #[test] fn decompression_requires_the_declared_length() { let encoded = encode_embedded(&[1, 2, 3, 4]).unwrap();