LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
#2519: reject invalid UTF-8 in PSD XMP resources
ronibalthazar36d6762f083e
diff --git a/crates/engine/src/tests_export.rs b/crates/engine/src/tests_export.rsindex 0d9b8c7ce..a835ecba4 100644--- a/crates/engine/src/tests_export.rs+++ b/crates/engine/src/tests_export.rs@@ -693,6 +693,30 @@ fn remove_location_refuses_a_psd_with_unreadable_xmp() {let _ = std::fs::remove_dir_all(&dir);}+#[test]+fn remove_location_refuses_a_psd_with_invalid_utf8_xmp() {+ let dir = temp_dir("export-noloc-psd-invalid-utf8");+ let path = dir.join("Invalid.psd");+ let gps = lightcraft_meta::Metadata { gps: Some(lightcraft_meta::Gps { latitude: 45.0, longitude: 7.0, altitude: None }), ..Default::default() };+ let xmp = lightcraft_meta::write_xmp(&gps, None);+ let pixels = [40, 80, 120];+ let image = lightcraft_codecs::EncodeImage::new(1, 1, 3, lightcraft_codecs::Samples::U8(&pixels));+ let embedded = lightcraft_codecs::EncodeMeta { xmp: Some(&xmp), ..Default::default() };+ let mut bytes = lightcraft_codecs::encode_psd(&image, &embedded).unwrap();+ assert_eq!(lightcraft_meta::extract(&bytes).gps, gps.gps);+ let latitude = bytes.windows(2).position(|bytes| bytes == b"45").unwrap();+ bytes[latitude] = 0xff;+ assert!(lightcraft_meta::extract(&bytes).gps.is_none());+ std::fs::write(&path, bytes).unwrap();++ let mut session = Session::new().with_fs();+ session.execute("library.import", &json!({"paths": [path.to_string_lossy()]})).unwrap();+ let id = session.catalog.photos().next().unwrap().id;+ let err = export_photo(&mut session, id, &ExportOptions::from_json(&json!({"format": "original", "removeLocation": true})), 1).err().unwrap();+ assert!(err.contains("can't verify location metadata") && err.contains("malformed PSD/PSB"), "{err}");+ let _ = std::fs::remove_dir_all(&dir);+}+#[test]fn remove_location_refuses_a_psd_with_unreadable_resources() {let dir = temp_dir("export-noloc-psd-malformed");diff --git a/crates/meta/README.md b/crates/meta/README.mdindex c7199cd03..d724049ec 100644--- a/crates/meta/README.md+++ b/crates/meta/README.md@@ -33,6 +33,7 @@ and node count are limited.No panics on malformed input: proptests feed random bytes to every container walker and random text to theXMP parser; truncation tests cut a sample JPEG at every byte and exercise truncated PSD/PSB headers andimage-resource records with hostile declared lengths.+PSD/PSB XMP resources require valid UTF-8; trailing NUL padding is trimmed after validation.## Sourcesdiff --git a/crates/meta/src/psd.rs b/crates/meta/src/psd.rsindex a314ff54d..bda16d960 100644--- a/crates/meta/src/psd.rs+++ b/crates/meta/src/psd.rs@@ -64,14 +64,14 @@ fn parse_resources(bytes: &[u8]) -> Option<Embedded> {1058 if exif.is_some() => return None,1058 => exif = Some(data),1060 if xmp.is_some() => return None,- 1060 => xmp = Some(data),+ 1060 => xmp = Some(std::str::from_utf8(data).ok()?),_ => {}}}Some(Embedded {exif: exif.map(crate::strip_exif_header).map(<[u8]>::to_vec),- xmp: xmp.map(|bytes| String::from_utf8_lossy(bytes).trim_end_matches('\0').to_string()),+ xmp: xmp.map(|text| text.trim_end_matches('\0').to_string()),..Default::default()})}@@ -192,6 +192,38 @@ mod tests {assert!(matches!(crate::try_extract(&file), Err(crate::ExtractError::MalformedPsd)));}+ #[test]+ fn try_extract_rejects_invalid_utf8_psd_xmp() {+ let mut xmp = crate::write_xmp(&dated_metadata(), None).into_bytes();+ let latitude = xmp.windows(2).position(|bytes| bytes == b"45").unwrap();+ xmp[latitude] = 0xff;+ let lossy = crate::parse_xmp(&String::from_utf8_lossy(&xmp)).unwrap();+ assert!(lossy.metadata.gps.is_none(), "lossy decoding hides the corrupted GPS value without an XML error");++ for version in [1, 2] {+ let file = image(version, &[], &resource(1060, b"", &xmp));+ assert!(matches!(crate::try_extract(&file), Err(crate::ExtractError::MalformedPsd)));+ assert_eq!(embedded(&file), Embedded::default());+ assert_eq!(crate::extract(&file), Metadata::default());+ }+ }++ #[test]+ fn psd_xmp_preserves_valid_utf8_and_trailing_nul_trimming() {+ let metadata = Metadata { title: Some("Café 山".into()), ..dated_metadata() };+ let xmp = crate::write_xmp(&metadata, None);+ let mut padded = xmp.as_bytes().to_vec();+ padded.extend_from_slice(b"\0\0");++ for version in [1, 2] {+ let file = image(version, &[], &resource(1060, b"", &padded));+ assert_eq!(embedded(&file).xmp.as_deref(), Some(xmp.as_str()));+ let actual = crate::try_extract(&file).unwrap();+ assert_eq!(actual.gps, metadata.gps);+ assert_eq!(actual.title, metadata.title);+ }+ }+#[test]fn try_extract_rejects_duplicate_psd_exif_and_xmp_resources() {let gps = dated_metadata();