Skip to content

chore(deps): bump quick-xml from 0.38.4 to 0.41.0 #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamgell merged 2 commits into from
Aug 8, 2026
Merged

chore(deps): bump quick-xml from 0.38.4 to 0.41.0 #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86bc550
chore(deps): bump quick-xml from 0.38.4 to 0.41.0
dependabot[bot] Aug 3, 2026
843a1a4
fix(intune): migrate evtx_parser to quick-xml 0.41 API
adamgell Aug 8, 2026
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
11 changes: 1 addition & 10 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ font-kit = "0.14"
# The MSRV is now 1.88, so this exact pin is no longer MSRV-mandated; it is
# retained deliberately and can be revisited separately.
evtx = { version = "=0.12.2", optional = true }
quick-xml = { version = "0.38", optional = true }
quick-xml = { version = "0.41", optional = true }
glob = "0.3"
sha2 = "0.11"
tempfile = { version = "3", optional = true }
Expand Down
32 changes: 24 additions & 8 deletions src-tauri/src/intune/evtx_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use quick_xml::encoding::Decoder;
use quick_xml::events::{BytesDecl, BytesRef, BytesStart, Event};
use quick_xml::name::QName;
use quick_xml::Reader;
use quick_xml::XmlVersion;
#[cfg(target_os = "windows")]
use regex::Regex;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -616,7 +617,9 @@ fn has_valid_xml_declaration(declaration: &BytesDecl<'_>, decoder: Decoder) -> b
let Ok(attribute) = attribute else {
return false;
};
let Ok(value) = attribute.decode_and_unescape_value(decoder) else {
let Ok(value) =
attribute.decoded_and_normalized_value(XmlVersion::Implicit1_0, decoder)
else {
return false;
};
match attribute.key.as_ref() {
Expand Down Expand Up @@ -669,7 +672,9 @@ fn has_valid_xml_attributes(start: &BytesStart<'_>, decoder: Decoder) -> bool {
let Ok(attribute) = attribute else {
return false;
};
let Ok(value) = attribute.decode_and_unescape_value(decoder) else {
let Ok(value) =
attribute.decoded_and_normalized_value(XmlVersion::Implicit1_0, decoder)
else {
return false;
};
if !value.chars().all(is_legal_xml_10_character) {
Expand Down Expand Up @@ -699,6 +704,7 @@ fn ordered_event_data(xml: &str) -> Option<Vec<EventLogProperty>> {
let name = xml_start_attribute(&start, "Name", reader.decoder())
.unwrap_or_else(|| format!("Data[{}]", properties.len()));
let value = reader.read_text(QName(b"Data")).ok()?;
let value = value.decode().ok()?;
properties.push(EventLogProperty {
name,
value: decode_esp_xml_text(value.trim()),
Expand Down Expand Up @@ -745,18 +751,24 @@ fn esp_system_fields(xml: &str) -> Option<EspSystemFields> {
if is_direct_system_path(&path) {
match name.as_slice() {
b"EventID" => {
let value = reader.read_text(QName(b"EventID")).ok()?.into_owned();
let value =
reader.read_text(QName(b"EventID")).ok()?.decode().ok()?.into_owned();
fields.event_id.get_or_insert(value);
continue;
}
b"Channel" => {
let value = reader.read_text(QName(b"Channel")).ok()?.into_owned();
let value =
reader.read_text(QName(b"Channel")).ok()?.decode().ok()?.into_owned();
fields.channel.get_or_insert(value);
continue;
}
b"EventRecordID" => {
let value =
reader.read_text(QName(b"EventRecordID")).ok()?.into_owned();
let value = reader
.read_text(QName(b"EventRecordID"))
.ok()?
.decode()
.ok()?
.into_owned();
fields.record_id.get_or_insert(value);
continue;
}
Expand Down Expand Up @@ -826,7 +838,7 @@ fn xml_element_text(xml: &str, element: &str) -> Option<String> {
return reader
.read_text(QName(element.as_bytes()))
.ok()
.map(|value| value.into_owned());
.and_then(|value| value.decode().ok().map(|text| text.into_owned()));
}
Event::Empty(start) if start.name().as_ref() == element.as_bytes() => {
return Some(String::new());
Expand All @@ -845,7 +857,11 @@ fn xml_start_attribute(
start.attributes().find_map(|attribute| {
let attribute = attribute.ok()?;
(attribute.key.as_ref() == attribute_name.as_bytes())
.then(|| attribute.decode_and_unescape_value(decoder).ok())
.then(|| {
attribute
.decoded_and_normalized_value(XmlVersion::Implicit1_0, decoder)
.ok()
})
.flatten()
.map(|value| value.into_owned())
})
Expand Down
Loading