Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ tower-http = { version = "0.6", features = ["cors", "fs"] }
urlencoding = "2"

# XML (ReqIF)
quick-xml = { version = "0.37", features = ["serialize", "overlapped-lists"] }
quick-xml = { version = "0.41", features = ["serialize", "overlapped-lists"] }

# WASM component model
# Pinned to >=45.0.3 for RUSTSEC-2026-0188 — WASI hard links and renames
Expand Down
20 changes: 17 additions & 3 deletions rivet-core/src/junit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,20 @@ fn parse_suites(xml: &str) -> Result<Vec<ParsedSuite>, Error> {
{
if let Some(ref mut c) = current_case {
if c.body.is_none() {
// quick-xml 0.41 (RUSTSEC-2026-0194/0195 fix) removed
// `BytesText::unescape()`; it split into `decode()`
// (bytes→str) + the standalone `escape::unescape`
// (entity resolution). Preserve the old decode+unescape
// behavior — JUnit failure/error bodies carry entities
// like `&lt;`/`&amp;` in stack traces.
let text = e
.unescape()
.map(|s| s.trim().to_string())
.decode()
.ok()
.and_then(|d| {
quick_xml::escape::unescape(&d)
.ok()
.map(|u| u.trim().to_string())
})
.unwrap_or_default();
if !text.is_empty() {
c.body = Some(text);
Expand Down Expand Up @@ -416,7 +427,10 @@ fn collect_attrs(e: &quick_xml::events::BytesStart<'_>) -> HashMap<String, Strin
for attr in e.attributes().flatten() {
if let (Ok(key), Ok(val)) = (
std::str::from_utf8(attr.key.local_name().as_ref()),
attr.unescape_value(),
// quick-xml 0.41 deprecated `unescape_value()` for
// `normalized_value(version)` — the spec-compliant attribute-value
// normalization (entity resolution + whitespace). JUnit XML is 1.0.
attr.normalized_value(quick_xml::XmlVersion::Implicit1_0),
) {
map.insert(key.to_string(), val.into_owned());
}
Expand Down
Loading