M11: PDF/A verify reads UTF-16 XMP packets and keeps GUIDs from being URIs (6.6.2.3.1)

A metadata stream is decoded by its byte order mark (UTF-16 big- or
little-endian, or UTF-8; ISO 16684-1 7.3) before it is parsed. A GUID
is a simple value but not a URI (ISO 16684-1 8.2.2.3), so the
document and instance IDs of xmpMM, stRef and stEvt don't take
rdf:resource.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pq7HyDBXygTf7jcqdsjcfn
This commit is contained in:
mtlcl410andClaude Opus 5.5 committed 2026-11-05 11:48:32 +08:00
1 parent ba4e86c547
commit e3a3317d47
2 files changed
+48 -11

No files matched your search

+19
View File
@@ -550,6 +550,13 @@ fn xmp_simple_values_have_their_lexical_forms() {
assert!(element("pdf:Trapped", "Tr<!-- c -->ue").is_empty());
// rdf:resource makes a URI, which only a text type takes.
assert_eq!(mistyped(r#"><crs:Contrast rdf:resource="5"/>"#), ["crs:Contrast"]);
// A GUID is a simple value but not a URI (ISO 16684-1 8.2.2.3).
assert!(element("xmpMM:DocumentID", "uuid:1234").is_empty());
assert_eq!(mistyped(r#"><xmpMM:DocumentID rdf:resource="uuid:1234"/>"#), ["xmpMM:DocumentID"]);
assert_eq!(
mistyped(r#"><xmpMM:DerivedFrom rdf:parseType="Resource"><stRef:instanceID rdf:resource="uuid:1"/></xmpMM:DerivedFrom>"#),
["xmpMM:DerivedFrom"]
);
}
/// PDF/A-2 6.6.2.3.1, arrays: the kind, every item, and the languages of a language alternative.
@@ -651,6 +658,18 @@ fn xmp_value_types_are_reported_by_verify() {
]
);
assert!(found.iter().all(|i| !i.fixable));
// A UTF-16 packet, either byte order, is read.
for big in [true, false] {
let xmp = format!(
r#"<x:xmpmeta xmlns:x="adobe:ns:meta/"><rdf:RDF {XMP_NS}><rdf:Description rdf:about="" crs:Contrast="high"/></rdf:RDF></x:xmpmeta>"#
);
let mut data = if big { vec![0xFE, 0xFF] } else { vec![0xFF, 0xFE] };
data.extend(xmp.encode_utf16().flat_map(|u| if big { u.to_be_bytes() } else { u.to_le_bytes() }));
let hex: String = data.iter().map(|b| format!("{b:02X}")).collect();
let stream = format!("<< /Type /Metadata /Subtype /XML /Filter /ASCIIHexDecode /Length {} >>\nstream\n{hex}>\nendstream", hex.len() + 1);
let doc = build(&["<< /Type /Catalog /Pages 2 0 R /Metadata 3 0 R >>", "<< /Type /Pages /Kids [] /Count 0 >>", &stream], "");
assert_eq!(issues(&doc).len(), 1, "big-endian: {big}");
}
// A metadata stream of a page counts as well as the catalog's.
let good = metadata(r#"crs:Contrast="5""#);
let doc = build(
+29 -11
View File
@@ -33,9 +33,11 @@ const XML: &str = "http://www.w3.org/XML/1998/namespace";
/// A value type.
#[derive(Debug, Clone, Copy)]
enum Ty {
/// Any simple value: Text and the types derived from it (AgentName, Choice of Text, GUID,
/// Locale, MIMEType, ProperName, RenditionClass, URI, URL, XPath, and the like).
/// Any simple value: Text and the types derived from it (AgentName, Choice of Text, Locale,
/// MIMEType, ProperName, RenditionClass, URI, URL, XPath, and the like).
Text,
/// A GUID: any simple value, but not a URI (ISO 16684-1 8.2.2.3), so not an `rdf:resource`.
Guid,
Integer,
Real,
Boolean,
@@ -113,7 +115,7 @@ const THUMBNAIL: &[Field] = &[(XMP_G_IMG, "format", Text), (XMP_G_IMG, "height",
const RESOURCE_EVENT: &[Field] = &[
(ST_EVT, "action", Text),
(ST_EVT, "changed", Text),
(ST_EVT, "instanceID", Text),
(ST_EVT, "instanceID", Ty::Guid),
(ST_EVT, "parameters", Text),
(ST_EVT, "softwareAgent", Text),
(ST_EVT, "when", Date),
@@ -121,10 +123,10 @@ const RESOURCE_EVENT: &[Field] = &[
/// ISO 16684-1 Table 3 and Part 2 Table 9.
const RESOURCE_REF: &[Field] = &[
(ST_REF, "alternatePaths", Ty::Seq(&Text)),
(ST_REF, "documentID", Text),
(ST_REF, "documentID", Ty::Guid),
(ST_REF, "filePath", Text),
(ST_REF, "fromPart", Text),
(ST_REF, "instanceID", Text),
(ST_REF, "instanceID", Ty::Guid),
(ST_REF, "lastModifyDate", Date),
(ST_REF, "manager", Text),
(ST_REF, "managerVariant", Text),
@@ -249,16 +251,16 @@ const SCHEMAS: &[Schema] = &[
prefix: "xmpMM",
properties: &[
("DerivedFrom", Ty::Struct(RESOURCE_REF)),
("DocumentID", Text),
("DocumentID", Ty::Guid),
("History", Ty::Seq(&Ty::Struct(RESOURCE_EVENT))),
("Ingredients", Ty::Bag(&Ty::Struct(RESOURCE_REF))),
("InstanceID", Text),
("InstanceID", Ty::Guid),
("ManagedFrom", Ty::Struct(RESOURCE_REF)),
("Manager", Text),
("ManageTo", Text),
("ManageUI", Text),
("ManagerVariant", Text),
("OriginalDocumentID", Text),
("OriginalDocumentID", Ty::Guid),
("Pantry", Ty::Bag(&Ty::AnyStruct)),
("RenditionClass", Text),
("RenditionParams", Text),
@@ -461,7 +463,7 @@ pub(crate) fn mistyped_in(objs: &[(ObjRef, std::sync::Arc<Object>)]) -> BTreeSet
break;
}
let Ok(bytes) = budget.decode_within(s, crate::xmp::MAX_XMP_BYTES) else { continue };
let text = String::from_utf8_lossy(&bytes);
let text = unicode(&bytes);
if let Some(parsed) = crate::xmp::parse(&text) {
out.extend(mistyped(&parsed));
}
@@ -469,6 +471,22 @@ pub(crate) fn mistyped_in(objs: &[(ObjRef, std::sync::Arc<Object>)]) -> BTreeSet
out
}
/// A packet's text in the Unicode encoding its byte order mark gives: UTF-16 big- or
/// little-endian, or UTF-8 (ISO 16684-1 7.3).
fn unicode(bytes: &[u8]) -> String {
let utf16 = |data: &[u8], big: bool| -> String {
let (units, _) = data.as_chunks::<2>();
let units = units.iter().map(|&[a, b]| if big { u16::from_be_bytes([a, b]) } else { u16::from_le_bytes([a, b]) });
char::decode_utf16(units).map(|c| c.unwrap_or(char::REPLACEMENT_CHARACTER)).collect()
};
match bytes {
[0xFE, 0xFF, rest @ ..] => utf16(rest, true),
[0xFF, 0xFE, rest @ ..] => utf16(rest, false),
[0xEF, 0xBB, 0xBF, rest @ ..] => String::from_utf8_lossy(rest).into_owned(),
_ => String::from_utf8_lossy(bytes).into_owned(),
}
}
/// The properties of predefined schemas in the packet `doc` whose values don't have their type,
/// as `prefix:name` in name order.
pub(crate) fn mistyped(doc: &roxmltree::Document<'_>) -> BTreeSet<String> {
@@ -531,7 +549,7 @@ fn fits(ty: Ty, e: &Node<'_, '_>, depth: usize) -> bool {
return simple(ty, v);
}
match ty {
Ty::Text | Ty::Integer | Ty::Real | Ty::Boolean | Ty::Date | Ty::Rational => {
Ty::Text | Ty::Guid | Ty::Integer | Ty::Real | Ty::Boolean | Ty::Date | Ty::Rational => {
// `rdf:resource` makes the value a URI, which only a text type takes.
if e.attribute((RDF, "resource")).is_some() {
return matches!(ty, Ty::Text);
@@ -624,7 +642,7 @@ fn simple(ty: Ty, v: &str) -> bool {
Ty::Boolean => matches!(v, "True" | "False"),
Ty::Date => date(v),
Ty::Rational => v.split_once('/').is_some_and(|(n, d)| integer(n) && integer(d)),
Ty::Text => true,
Ty::Text | Ty::Guid => true,
Ty::OneOf(types) => types.iter().any(|t| simple(*t, v)),
_ => false,
}