Fixed panic parsing broken HTMLs

stalwartlabs · Jan 15, 2025 · 4838e5f · 4838e5f
1 parent 6bb468c
commit 4838e5f
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ members = [
 [profile.dev]
 opt-level = 0
 debug = 1
-codegen-units = 4
+#codegen-units = 4
 lto = false
 incremental = true
 panic = 'unwind'

diff --git a/crates/smtp/src/queue/manager.rs b/crates/smtp/src/queue/manager.rs
@@ -144,8 +144,16 @@ impl Queue {
                                 Total = queue_events.len(),
                                 Details = self
                                     .on_hold
-                                    .keys()
-                                    .copied()
+                                    .values()
+                                    .fold([0, 0, 0], |mut acc, v| {
+                                        match v {
+                                            OnHold::InFlight => acc[0] += 1,
+                                            OnHold::ConcurrencyLimited { .. } => acc[1] += 1,
+                                            OnHold::Locked { .. } => acc[2] += 1,
+                                        }
+                                        acc
+                                    })
+                                    .into_iter()
                                     .map(trc::Value::from)
                                     .collect::<Vec<_>>(),
                                 Limit = max_in_flight,
@@ -176,7 +184,20 @@ impl Queue {
                                         Queue(trc::QueueEvent::BackPressure),
                                         Reason = "Queue outbound processing capacity for this node exceeded.",
                                         Total = queue_events.len(),
-                                        Details = self.on_hold.keys().copied().map(trc::Value::from).collect::<Vec<_>>(),
+                                        Details = self
+                                            .on_hold
+                                            .values()
+                                            .fold([0, 0, 0], |mut acc, v| {
+                                                match v {
+                                                    OnHold::InFlight => acc[0] += 1,
+                                                    OnHold::ConcurrencyLimited { .. } => acc[1] += 1,
+                                                    OnHold::Locked { .. } => acc[2] += 1,
+                                                }
+                                                acc
+                                            })
+                                            .into_iter()
+                                            .map(trc::Value::from)
+                                            .collect::<Vec<_>>(),
                                         Limit = max_in_flight,
                                     );
                                 }

diff --git a/crates/spam-filter/src/modules/html.rs b/crates/spam-filter/src/modules/html.rs
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
  */
 
- use mail_parser::decoders::html::add_html_token;
+use mail_parser::decoders::html::add_html_token;
 
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub enum HtmlToken {
@@ -201,10 +201,14 @@ pub fn html_to_tokens(input: &str) -> Vec<HtmlToken> {
                                     match ch {
                                         b'>' if !in_quote => {
                                             if !value.is_empty() {
-                                                attributes.last_mut().unwrap().1 =
-                                                    String::from_utf8(value)
-                                                        .unwrap_or_default()
-                                                        .into();
+                                                let value =
+                                                    String::from_utf8(value).unwrap_or_default();
+                                                if let Some((_, v)) = attributes.last_mut() {
+                                                    *v = value.into();
+                                                } else {
+                                                    // Broken attribute
+                                                    attributes.push((0, Some(value)));
+                                                }
                                             }
                                             break 'outer;
                                         }
@@ -226,8 +230,13 @@ pub fn html_to_tokens(input: &str) -> Vec<HtmlToken> {
                                 }
 
                                 if !value.is_empty() {
-                                    attributes.last_mut().unwrap().1 =
-                                        String::from_utf8(value).unwrap_or_default().into();
+                                    let value = String::from_utf8(value).unwrap_or_default();
+                                    if let Some((_, v)) = attributes.last_mut() {
+                                        *v = value.into();
+                                    } else {
+                                        // Broken attribute
+                                        attributes.push((0, Some(value)));
+                                    }
                                 }
                             }
                             b' ' | b'\t' | b'\r' | b'\n' => {