Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(html2md): detect empty inline SVGs structurally

kevin91e9b568bd4b
diff --git a/Cargo.lock b/Cargo.lock
index 8a7194f3d..74d3f8463 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2718,9 +2718,12 @@ dependencies = [
name = "moli-html2md"
version = "0.1.0"
dependencies = [
+ "base64 0.22.1",
"html5ever",
"markup5ever_rcdom",
+ "percent-encoding",
"pulldown-cmark",
+ "roxmltree 0.21.1",
"serde_json",
]
diff --git a/moli-html2md/Cargo.toml b/moli-html2md/Cargo.toml
index 1698234b1..d6af376db 100644
--- a/moli-html2md/Cargo.toml
+++ b/moli-html2md/Cargo.toml
@@ -8,6 +8,11 @@ description = "Read-only DOM to Markdown conversion with an iterative state mach
[lints]
workspace = true
+[dependencies]
+base64 = "0.22"
+percent-encoding = "2.3"
+roxmltree = "0.21"
+
[dev-dependencies]
html5ever = "0.39"
markup5ever_rcdom = "0.39"
diff --git a/moli-html2md/src/machine.rs b/moli-html2md/src/machine.rs
index e79dd48c3..dbbcf43d7 100644
--- a/moli-html2md/src/machine.rs
+++ b/moli-html2md/src/machine.rs
@@ -442,10 +442,45 @@ impl<'a, D: Dom + ?Sized> Machine<'a, D> {
}
fn is_empty_svg_placeholder(src: &str) -> bool {
- let lower = src.to_ascii_lowercase();
- lower.starts_with("data:image/svg+xml,%3csvg")
- && lower.ends_with("%3c/svg%3e")
- && lower.matches("%3c").count() == 2
+ use base64::Engine as _;
+
+ let Some((media_type, payload)) = src
+ .strip_prefix("data:")
+ .and_then(|uri| uri.split_once(','))
+ else {
+ return false;
+ };
+ let mut parts = media_type.split(';');
+ if !parts
+ .next()
+ .is_some_and(|kind| kind.eq_ignore_ascii_case("image/svg+xml"))
+ {
+ return false;
+ }
+ let encoded = parts.any(|part| part.eq_ignore_ascii_case("base64"));
+ let svg = if encoded {
+ let Ok(bytes) = base64::engine::general_purpose::STANDARD.decode(payload) else {
+ return false;
+ };
+ let Ok(text) = String::from_utf8(bytes) else {
+ return false;
+ };
+ text
+ } else {
+ let Ok(text) = percent_encoding::percent_decode_str(payload).decode_utf8() else {
+ return false;
+ };
+ text.into_owned()
+ };
+ let Ok(document) = roxmltree::Document::parse(&svg) else {
+ return false;
+ };
+ let root = document.root_element();
+ root.tag_name().name() == "svg"
+ && root.children().all(|child| {
+ child.is_comment()
+ || child.is_text() && child.text().is_none_or(|text| text.trim().is_empty())
+ })
}
fn class_language(class: Option<&str>) -> Option<&str> {
diff --git a/moli-html2md/tests/regressions.rs b/moli-html2md/tests/regressions.rs
index 1959ed734..1e9d5e1c7 100644
--- a/moli-html2md/tests/regressions.rs
+++ b/moli-html2md/tests/regressions.rs
@@ -231,6 +231,15 @@ fn empty_svg_lazy_image_placeholders_do_not_emit_data_uris() {
let html = format!("before<img alt='Recipe photo' src=\"{placeholder}\">after");
assert_eq!(markdown(&html, false), "beforeRecipe photoafter");
+ for src in [
+ "data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'/>",
+ "data:image/svg+xml;charset=utf-8,%3Csvg%3E%20%3C!--empty--%3E%20%3C/svg%3E",
+ "data:image/svg+xml;base64,PHN2Zy8+",
+ ] {
+ let html = format!("before<img src=\"{src}\">after");
+ assert_eq!(markdown(&html, false), "beforeafter");
+ }
+
let html =
format!("before<img alt='Recipe photo' aria-hidden='true' src=\"{placeholder}\">after");
assert_eq!(markdown(&html, false), "beforeafter");
@@ -238,6 +247,9 @@ fn empty_svg_lazy_image_placeholders_do_not_emit_data_uris() {
let real_svg = "data:image/svg+xml,%3Csvg%3E%3Cpath%20d='M0%200'/%3E%3C/svg%3E";
let html = format!("<img alt='Logo' src=\"{real_svg}\">");
assert!(markdown(&html, false).contains(real_svg));
+ let text_svg = "data:image/svg+xml,%3Csvg%3E%3Ctext%3ELogo%3C/text%3E%3C/svg%3E";
+ let html = format!("<img alt='Logo' src=\"{text_svg}\">");
+ assert!(markdown(&html, false).contains(text_svg));
}
#[test]