Merge pull request #150 from cea-sec/dependabot/cargo/quick-xml-0.36.0

Bump quick-xml from 0.31.0 to 0.36.0
cea-sec · Jul 11, 2024 · c38b3aa · c38b3aa
2 parents 270161d + c187c91
commit c38b3aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -20,7 +20,7 @@ itoa = "1.0.6"
 libgssapi = { version = "0.7.2", features = ["iov"] }
 log = "0.4.19"
 mime = "0.3.17"
-quick-xml = "0.31.0"
+quick-xml = "0.36.0"
 roxmltree = "0.20.0"
 tokio = { version = "1.35.1", features = ["full"] }
 rdkafka = { version = "0.36.0", features = ["zstd", "libz", "external-lz4"] }

diff --git a/server/src/soap.rs b/server/src/soap.rs
@@ -5,6 +5,7 @@ use quick_xml::reader::Reader;
 use quick_xml::writer::Writer;
 use roxmltree::{Document, Node};
 use std::collections::HashMap;
+use std::io::ErrorKind;
 use std::sync::Arc;
 use uuid::Uuid;
 use xmlparser::XmlCharExt;
@@ -276,7 +277,7 @@ impl Serializable for SubscriptionBody {
                             .write_inner_content(|writer| {
                                 // Copy filter from "query" field
                                 let mut reader = Reader::from_str(&self.query);
-                                reader.trim_text(true);
+                                reader.config_mut().trim_text(true);
                                 loop {
                                     match reader.read_event() {
                                         Ok(Event::Eof) => break,
@@ -291,7 +292,7 @@ impl Serializable for SubscriptionBody {
                                 .create_element("w:Bookmark")
                                 .write_inner_content(|writer| {
                                     let mut reader = Reader::from_str(bookmark);
-                                    reader.trim_text(true);
+                                    reader.config_mut().trim_text(true);
                                     loop {
                                         match reader.read_event() {
                                             Ok(Event::Eof) => break,
@@ -547,11 +548,14 @@ impl Serializable for Body {
                     })?;
             }
             x => {
-                return Err(quick_xml::Error::UnexpectedToken(format!(
-                    "Can not serialize body of {:?}",
-                    x
-                )))
-            } // anyhow!("Can not serialize body of {:?}", x),
+                return Err(quick_xml::Error::Io(
+                    std::io::Error::new(
+                        ErrorKind::Other,
+                        format!("Can not serialize body of {:?}", x),
+                    )
+                    .into(),
+                ))
+            }
         }
         Ok(())
     }