1b-agent/OneCAD
1
0 Fork 0
forked from 1b-agent/solidcraft-upstream
Code Pull Requests Activity
Files
cedb51b8ea35bf5a0dba207c83be54b1f3866ca1
OneCAD/crates/io/src/svg.rs
T
Yuu f425089983 io: hostile-input tests for the SVG and DXF readers (#469) (#1083) 
Adds tests that feed truncated, malformed and deeply nested SVG and DXF input to the readers and check that none of it panics.
2026-10-14 13:40:25 -04:00

561 lines
22 KiB
Rust
Raw Blame History

//! SVG (W3C SVG 1.1) geometry for sketches: `path` (all commands), `line`, `rect`, `circle`,
//! `ellipse`, `polyline`, `polygon` and `text`, with `transform`s on elements and groups. User
//! units are CSS pixels (1/96 in) unless the root's `width`/`height` carry units with a
//! `viewBox`; y is flipped so the drawing reads upright in the sketch.
use quick_xml::Reader;
use quick_xml::events::{BytesStart, Event};
use solidcraft_geom::Vec2;
use crate::sketch2d::{Geom2, MAX_DRAWING_BYTES, MAX_ENTITIES};
use crate::{IoError, Result};
const MAX_DEPTH: usize = 256;
const PX_MM: f64 = 25.4 / 96.0;
/// Affine map [a c e; b d f].
#[derive(Clone, Copy, Debug)]
struct Tf([f64; 6]);
impl Tf {
const ID: Tf = Tf([1.0, 0.0, 0.0, 1.0, 0.0, 0.0]);
fn mul(self, o: Tf) -> Tf {
let [a, b, c, d, e, f] = self.0;
let [a2, b2, c2, d2, e2, f2] = o.0;
Tf([a * a2 + c * b2, b * a2 + d * b2, a * c2 + c * d2, b * c2 + d * d2, a * e2 + c * f2 + e, b * e2 + d * f2 + f])
}
fn apply(self, p: Vec2) -> Vec2 {
let [a, b, c, d, e, f] = self.0;
Vec2::new(a * p.x + c * p.y + e, b * p.x + d * p.y + f)
}
fn vec(self, v: Vec2) -> Vec2 {
let [a, b, c, d, ..] = self.0;
Vec2::new(a * v.x + c * v.y, b * v.x + d * v.y)
}
/// Uniform scale (with any rotation or mirror) and its factor.
fn uniform(self) -> Option<f64> {
let (u, v) = (self.vec(Vec2::X), self.vec(Vec2::Y));
((u.len() - v.len()).abs() < 1e-9 * u.len().max(1e-12) && u.dot(v).abs() < 1e-9 * u.len2().max(1e-24)).then_some(u.len())
}
fn flips(self) -> bool {
let [a, b, c, d, ..] = self.0;
a * d - b * c < 0.0
}
}
fn numbers(s: &str) -> Vec<f64> {
// Numbers separated by commas/space, also "1-2" and "1.5.5" forms.
let mut out = Vec::new();
let b = s.as_bytes();
let mut i = 0;
while i < b.len() && out.len() < 1_000_000 {
while i < b.len() && !(b[i] == b'-' || b[i] == b'+' || b[i] == b'.' || b[i].is_ascii_digit()) {
i += 1;
}
let st = i;
let mut seen_dot = false;
let mut seen_e = false;
if i < b.len() && (b[i] == b'-' || b[i] == b'+') {
i += 1;
}
while i < b.len() {
let ch = b[i];
if ch.is_ascii_digit() {
i += 1;
} else if ch == b'.' && !seen_dot && !seen_e {
seen_dot = true;
i += 1;
} else if (ch == b'e' || ch == b'E') && !seen_e {
seen_e = true;
i += 1;
if i < b.len() && (b[i] == b'-' || b[i] == b'+') {
i += 1;
}
} else {
break;
}
}
if let Some(x) = s.get(st..i).and_then(|t| t.parse::<f64>().ok()).filter(|x| x.is_finite()) {
out.push(x);
} else if i == st {
i += 1;
}
}
out
}
fn parse_transform(s: &str) -> Tf {
let mut t = Tf::ID;
for part in s.split(')') {
let Some((name, args)) = part.split_once('(') else { continue };
let n = numbers(args);
let g = |i: usize, d: f64| n.get(i).copied().unwrap_or(d);
let m = match name.trim().trim_start_matches(',').trim() {
"matrix" if n.len() >= 6 => Tf([n[0], n[1], n[2], n[3], n[4], n[5]]),
"translate" => Tf([1.0, 0.0, 0.0, 1.0, g(0, 0.0), g(1, 0.0)]),
"scale" => Tf([g(0, 1.0), 0.0, 0.0, g(1, g(0, 1.0)), 0.0, 0.0]),
"rotate" => {
let (s, c) = g(0, 0.0).to_radians().sin_cos();
let r = Tf([c, s, -s, c, 0.0, 0.0]);
let (cx, cy) = (g(1, 0.0), g(2, 0.0));
Tf([1.0, 0.0, 0.0, 1.0, cx, cy]).mul(r).mul(Tf([1.0, 0.0, 0.0, 1.0, -cx, -cy]))
}
"skewX" => Tf([1.0, 0.0, g(0, 0.0).to_radians().tan(), 1.0, 0.0, 0.0]),
"skewY" => Tf([1.0, g(0, 0.0).to_radians().tan(), 0.0, 1.0, 0.0, 0.0]),
_ => Tf::ID,
};
t = t.mul(m);
}
t
}
fn attrs(e: &BytesStart) -> Vec<(String, String)> {
e.attributes()
.flatten()
.map(|a| {
let k = String::from_utf8_lossy(a.key.local_name().as_ref()).to_string();
let v = a
.normalized_value(quick_xml::XmlVersion::Implicit1_0)
.map(|v| v.to_string())
.unwrap_or_else(|_| String::from_utf8_lossy(&a.value).to_string());
(k, v)
})
.collect()
}
fn attr<'a>(a: &'a [(String, String)], k: &str) -> Option<&'a str> {
a.iter().find(|(n, _)| n == k).map(|(_, v)| v.as_str())
}
fn num_attr(a: &[(String, String)], k: &str) -> f64 {
attr(a, k).map(numbers).and_then(|v| v.first().copied()).unwrap_or(0.0)
}
/// Length with a unit, in millimetres (None without a unit or for %).
fn length_mm(s: &str) -> Option<f64> {
let v = numbers(s).first().copied()?;
let u = s.trim().trim_start_matches(|c: char| c.is_ascii_digit() || c == '.' || c == '-' || c == '+' || c == 'e' || c == 'E');
Some(match u.trim() {
"mm" => v,
"cm" => v * 10.0,
"in" => v * 25.4,
"pt" => v * 25.4 / 72.0,
"pc" => v * 25.4 / 6.0,
"px" | "" => v * PX_MM,
_ => return None,
})
}
struct Out {
g: Vec<Geom2>,
}
impl Out {
fn push(&mut self, g: Geom2) -> Result<()> {
if self.g.len() >= MAX_ENTITIES {
return Err(IoError::Invalid("too many SVG elements".into()));
}
self.g.push(g);
Ok(())
}
fn line(&mut self, t: Tf, a: Vec2, b: Vec2) -> Result<()> {
let (a, b) = (t.apply(a), t.apply(b));
if a.dist(b) > 1e-12 { self.push(Geom2::Line(a, b)) } else { Ok(()) }
}
fn cubic(&mut self, t: Tf, p: [Vec2; 4]) -> Result<()> {
self.push(Geom2::Spline { pts: p.iter().map(|q| t.apply(*q)).collect(), control: true, degree: 3 })
}
fn quad(&mut self, t: Tf, a: Vec2, c: Vec2, b: Vec2) -> Result<()> {
let (a, c, b) = (t.apply(a), t.apply(c), t.apply(b));
if (b - a).cross(c - a).abs() < 1e-12 { self.push(Geom2::Line(a, b)) } else { self.push(Geom2::Conic { a, apex: c, b, rho: 0.5 }) }
}
/// Ellipse `c + rx·cos t·u + ry·sin t·v` (u at angle `phi`) from `t0` sweeping `dt`.
fn elliptic(&mut self, t: Tf, c: Vec2, rx: f64, ry: f64, phi: f64, t0: f64, dt: f64) -> Result<()> {
let u = Vec2::from_angle(phi);
let v = u.perp();
let at = |a: f64| c + u * (rx * a.cos()) + v * (ry * a.sin());
let circle = t.uniform().filter(|_| (rx - ry).abs() < 1e-9 * rx.max(ry));
if let Some(k) = circle {
let (p0, p1) = (t.apply(at(t0)), t.apply(at(t0 + dt)));
let cc = t.apply(c);
let ccw = (dt > 0.0) != t.flips();
if dt.abs() >= std::f64::consts::TAU - 1e-9 {
return self.push(Geom2::Circle(cc, rx * k));
}
return self.push(if ccw { Geom2::Arc { c: cc, a: p0, b: p1 } } else { Geom2::Arc { c: cc, a: p1, b: p0 } });
}
if dt.abs() >= std::f64::consts::TAU - 1e-9 {
// Full ellipse: centre, major end, minor radius after the transform (affine images
// of ellipses are ellipses; sample to find the axes).
let pts: Vec<Vec2> = (0..720).map(|i| t.apply(at(i as f64 / 720.0 * std::f64::consts::TAU))).collect();
let cc = t.apply(c);
let (mut far, mut near) = (cc, f64::INFINITY);
for q in &pts {
if q.dist(cc) > far.dist(cc) {
far = *q;
}
near = near.min(q.dist(cc));
}
return self.push(Geom2::Ellipse { c: cc, major: far, minor: near });
}
// Elliptic arc: cubic Béziers of at most 90 degrees each.
let n = ((dt.abs() / std::f64::consts::FRAC_PI_2).ceil() as usize).max(1);
let h = dt / n as f64;
let k = 4.0 / 3.0 * (h / 4.0).tan();
let d = |a: f64| u * (-rx * a.sin()) + v * (ry * a.cos());
for i in 0..n {
let (a0, a1) = (t0 + h * i as f64, t0 + h * (i + 1) as f64);
self.cubic(t, [at(a0), at(a0) + d(a0) * k, at(a1) - d(a1) * k, at(a1)])?;
}
Ok(())
}
}
/// SVG endpoint arc → centre form (SVG 1.1 implementation notes F.6.5).
#[allow(clippy::too_many_arguments)]
fn arc_to(out: &mut Out, t: Tf, p0: Vec2, mut rx: f64, mut ry: f64, phi_deg: f64, large: bool, sweep: bool, p1: Vec2) -> Result<()> {
if p0.dist(p1) < 1e-12 {
return Ok(());
}
rx = rx.abs();
ry = ry.abs();
if rx < 1e-12 || ry < 1e-12 {
return out.line(t, p0, p1);
}
let phi = phi_deg.to_radians();
let (s, c) = phi.sin_cos();
let d = (p0 - p1) * 0.5;
let x1 = Vec2::new(c * d.x + s * d.y, -s * d.x + c * d.y);
let lam = (x1.x / rx).powi(2) + (x1.y / ry).powi(2);
if lam > 1.0 {
rx *= lam.sqrt();
ry *= lam.sqrt();
}
let num = (rx * rx * ry * ry - rx * rx * x1.y * x1.y - ry * ry * x1.x * x1.x).max(0.0);
let den = rx * rx * x1.y * x1.y + ry * ry * x1.x * x1.x;
let mut co = if den > 0.0 { (num / den).sqrt() } else { 0.0 };
if large == sweep {
co = -co;
}
let cx1 = Vec2::new(co * rx * x1.y / ry, -co * ry * x1.x / rx);
let mid = (p0 + p1) * 0.5;
let cc = Vec2::new(c * cx1.x - s * cx1.y, s * cx1.x + c * cx1.y) + mid;
let ang = |u: Vec2, v: Vec2| u.cross(v).atan2(u.dot(v));
let u = Vec2::new((x1.x - cx1.x) / rx, (x1.y - cx1.y) / ry);
let v = Vec2::new((-x1.x - cx1.x) / rx, (-x1.y - cx1.y) / ry);
let t0 = ang(Vec2::X, u);
let mut dt = ang(u, v);
if !sweep && dt > 0.0 {
dt -= std::f64::consts::TAU;
} else if sweep && dt < 0.0 {
dt += std::f64::consts::TAU;
}
out.elliptic(t, cc, rx, ry, phi, t0, dt)
}
fn path(out: &mut Out, t: Tf, d: &str) -> Result<()> {
// Tokenise into commands and their numbers.
let mut cmds: Vec<(char, Vec<f64>)> = Vec::new();
let mut cur: Option<(char, String)> = None;
for ch in d.chars() {
if ch.is_ascii_alphabetic() && ch != 'e' && ch != 'E' {
if let Some((c, s)) = cur.take() {
cmds.push((c, numbers(&s)));
}
cur = Some((ch, String::new()));
} else if let Some((_, s)) = cur.as_mut() {
s.push(ch);
}
}
if let Some((c, s)) = cur.take() {
cmds.push((c, numbers(&s)));
}
let (mut p, mut start) = (Vec2::ZERO, Vec2::ZERO);
let mut last_c: Option<Vec2> = None; // last cubic control (for S)
let mut last_q: Option<Vec2> = None; // last quadratic control (for T)
for (c, n) in cmds {
let rel = c.is_ascii_lowercase();
let base = |p: Vec2| if rel { p } else { Vec2::ZERO };
let arity = match c.to_ascii_uppercase() {
'M' | 'L' | 'T' => 2,
'H' | 'V' => 1,
'C' => 6,
'S' | 'Q' => 4,
'A' => 7,
_ => 0,
};
if c.eq_ignore_ascii_case(&'Z') {
out.line(t, p, start)?;
p = start;
last_c = None;
last_q = None;
continue;
}
if arity == 0 {
continue;
}
for (k, a) in n.chunks(arity).enumerate() {
if a.len() < arity {
break;
}
let o = base(p);
let v = |i: usize| Vec2::new(a[i], a[i + 1]) + o;
match c.to_ascii_uppercase() {
'M' => {
let q = v(0);
if k == 0 {
p = q;
start = q;
} else {
out.line(t, p, q)?;
p = q;
}
last_c = None;
last_q = None;
}
'L' => {
let q = v(0);
out.line(t, p, q)?;
p = q;
last_c = None;
last_q = None;
}
'H' => {
let q = Vec2::new(a[0] + if rel { p.x } else { 0.0 }, p.y);
out.line(t, p, q)?;
p = q;
last_c = None;
last_q = None;
}
'V' => {
let q = Vec2::new(p.x, a[0] + if rel { p.y } else { 0.0 });
out.line(t, p, q)?;
p = q;
last_c = None;
last_q = None;
}
'C' => {
let (c1, c2, q) = (v(0), v(2), v(4));
out.cubic(t, [p, c1, c2, q])?;
last_c = Some(c2);
last_q = None;
p = q;
}
'S' => {
let c1 = last_c.map(|lc| p * 2.0 - lc).unwrap_or(p);
let (c2, q) = (v(0), v(2));
out.cubic(t, [p, c1, c2, q])?;
last_c = Some(c2);
last_q = None;
p = q;
}
'Q' => {
let (c1, q) = (v(0), v(2));
out.quad(t, p, c1, q)?;
last_q = Some(c1);
last_c = None;
p = q;
}
'T' => {
let c1 = last_q.map(|lq| p * 2.0 - lq).unwrap_or(p);
let q = v(0);
out.quad(t, p, c1, q)?;
last_q = Some(c1);
last_c = None;
p = q;
}
'A' => {
let q = Vec2::new(a[5], a[6]) + o;
arc_to(out, t, p, a[0], a[1], a[2], a[3] != 0.0, a[4] != 0.0, q)?;
last_c = None;
last_q = None;
p = q;
}
_ => {}
}
}
}
Ok(())
}
fn points_list(s: &str) -> Vec<Vec2> {
numbers(s).chunks(2).filter(|c| c.len() == 2).map(|c| Vec2::new(c[0], c[1])).collect()
}
/// Read the geometry of an SVG document (millimetres, y up). `scale` multiplies the result.
pub fn read_svg(text: &str) -> Result<Vec<Geom2>> {
if text.len() > MAX_DRAWING_BYTES {
return Err(IoError::Invalid("the SVG file is too large".into()));
}
let mut rd = Reader::from_reader(text.as_bytes());
rd.config_mut().trim_text(true);
let mut buf = Vec::new();
let mut stack: Vec<Tf> = Vec::new();
let mut out = Out { g: Vec::new() };
let mut root: Option<Tf> = None;
let mut pending_text: Option<(Tf, Vec2, f64)> = None;
loop {
let ev = rd.read_event_into(&mut buf).map_err(|e| IoError::Invalid(format!("SVG: {e}")))?;
let (e, empty) = match &ev {
Event::Start(e) => (Some(e.clone()), false),
Event::Empty(e) => (Some(e.clone()), true),
Event::End(_) => {
stack.pop();
buf.clear();
continue;
}
Event::Text(tx) => {
if let Some((tf, at, h)) = pending_text.take() {
let s = String::from_utf8_lossy(tx.as_ref()).trim().to_string();
if !s.is_empty() {
let k = tf.uniform().unwrap_or(1.0);
let dir = tf.vec(Vec2::X);
out.push(Geom2::Text { text: s, at: tf.apply(at), height: h * 0.7 * k, angle: dir.angle() })?;
}
}
buf.clear();
continue;
}
Event::Eof => break,
_ => (None, false),
};
let Some(e) = e else {
buf.clear();
continue;
};
let a = attrs(&e);
let parent = stack.last().copied().or(root).unwrap_or(Tf::ID);
let name = String::from_utf8_lossy(e.local_name().as_ref()).to_string();
let mut tf = match attr(&a, "transform") {
Some(s) => parent.mul(parse_transform(s)),
None => parent,
};
if name == "svg" && root.is_none() {
// Root: user units to millimetres, y flipped.
let vb = attr(&a, "viewBox").map(numbers).filter(|v| v.len() == 4);
let (sx, sy, ox, oy) = match (vb, attr(&a, "width").and_then(length_mm), attr(&a, "height").and_then(length_mm)) {
(Some(v), Some(w), Some(h)) if v[2] > 0.0 && v[3] > 0.0 => (w / v[2], h / v[3], v[0], v[1]),
(Some(v), _, _) => (PX_MM, PX_MM, v[0], v[1]),
_ => (PX_MM, PX_MM, 0.0, 0.0),
};
let r = Tf([sx, 0.0, 0.0, -sy, -ox * sx, oy * sy]);
root = Some(r);
tf = r;
}
match name.as_str() {
"path" => path(&mut out, tf, attr(&a, "d").unwrap_or(""))?,
"line" => out.line(tf, Vec2::new(num_attr(&a, "x1"), num_attr(&a, "y1")), Vec2::new(num_attr(&a, "x2"), num_attr(&a, "y2")))?,
"rect" => {
let (x, y, w, h) = (num_attr(&a, "x"), num_attr(&a, "y"), num_attr(&a, "width"), num_attr(&a, "height"));
if w > 0.0 && h > 0.0 {
let c = [Vec2::new(x, y), Vec2::new(x + w, y), Vec2::new(x + w, y + h), Vec2::new(x, y + h)];
for i in 0..4 {
out.line(tf, c[i], c[(i + 1) % 4])?;
}
}
}
"circle" => {
let r = num_attr(&a, "r");
if r > 0.0 {
out.elliptic(tf, Vec2::new(num_attr(&a, "cx"), num_attr(&a, "cy")), r, r, 0.0, 0.0, std::f64::consts::TAU)?;
}
}
"ellipse" => {
let (rx, ry) = (num_attr(&a, "rx"), num_attr(&a, "ry"));
if rx > 0.0 && ry > 0.0 {
out.elliptic(tf, Vec2::new(num_attr(&a, "cx"), num_attr(&a, "cy")), rx, ry, 0.0, 0.0, std::f64::consts::TAU)?;
}
}
"polyline" | "polygon" => {
let pts = points_list(attr(&a, "points").unwrap_or(""));
for w in pts.windows(2) {
out.line(tf, w[0], w[1])?;
}
if name == "polygon"
&& let (Some(f), Some(l)) = (pts.first(), pts.last())
{
out.line(tf, *l, *f)?;
}
}
"text" => {
let size = attr(&a, "font-size").map(numbers).and_then(|v| v.first().copied()).unwrap_or(16.0);
pending_text = Some((tf, Vec2::new(num_attr(&a, "x"), num_attr(&a, "y")), size));
}
_ => {}
}
if !empty {
stack.push(tf);
if stack.len() > MAX_DEPTH {
return Err(IoError::Invalid("SVG nested too deeply".into()));
}
}
buf.clear();
}
Ok(out.g)
}
#[cfg(test)]
mod tests {
use super::*;
/// The parser recurses over groups and reads numbers out of a document the user did not write,
/// so none of these may panic: `catch_unwind` turns one into a failed test, the way
/// `hostile_files_never_panic` does for STEP (solidcraft#469).
#[test]
fn hostile_svg_never_panics() {
let good = r#"<svg xmlns="http://www.w3.org/2000/svg" width="100mm" height="50mm" viewBox="0 0 100 50">
<g transform="translate(10 5)"><rect x="1" y="2" width="3" height="4"/><path d="M0 0 L5 5 Z"/></g>
</svg>"#;
let mut cases: Vec<String> = vec![
String::new(),
"<svg".into(),
"<svg><".into(),
"<svg><path d=".into(),
"<svg><path d='M 1 1 L'/></svg>".into(),
"<svg><path d='M nan nan L inf inf'/></svg>".into(),
"<svg><path d='M 1e400 1e400 L 1 1'/></svg>".into(),
"<svg><rect width='-1' height='-1'/></svg>".into(),
"<svg><use href='#a'/><g id='a'><use href='#a'/></g></svg>".into(),
format!("<svg>{}{}</svg>", "<g>".repeat(300), "</g>".repeat(300)),
format!("<svg>{}</svg>", "<g>".repeat(300)),
"<svg><![CDATA[<g>]]></svg>".into(),
"<?xml version='1.0'?><!DOCTYPE svg [<!ENTITY x SYSTEM 'file:///etc/passwd'>]><svg>&x;</svg>".into(),
format!("<svg><path d='{}'/></svg>", "L 1 1 ".repeat(20_000)),
];
for cut in (0..good.len()).step_by(13) {
cases.push(good.get(..cut).unwrap_or("").to_string());
}
for (from, to) in [("10mm", "-10mm"), ("0 0 100 50", "0 0 0 0"), ("<g ", "<x "), ("rect", "rectx")] {
cases.push(good.replacen(from, to, 3));
}
for c in &cases {
let r = std::panic::catch_unwind(|| read_svg(c));
assert!(r.is_ok(), "panicked on {:?}", c.get(..c.len().min(200)));
}
}
#[test]
fn shapes_paths_and_units() {
let svg = r#"<svg xmlns="http://www.w3.org/2000/svg" width="100mm" height="50mm" viewBox="0 0 100 50">
<rect x="10" y="10" width="20" height="10"/>
<circle cx="50" cy="25" r="5"/>
<g transform="translate(70 0)"><path d="M0 0 C 10 0 10 10 20 10 Q 25 20 30 10 A 5 5 0 0 1 40 10 Z"/></g>
<ellipse cx="80" cy="40" rx="6" ry="3"/>
</svg>"#;
let g = read_svg(svg).unwrap();
// rect 4 lines, circle, cubic, quad, arc, closing line, ellipse
assert_eq!(g.len(), 4 + 1 + 4 + 1, "{g:?}");
// y flipped: the circle centre is at (50, -25) in mm.
assert!(g.iter().any(|x| matches!(x, Geom2::Circle(c, r) if c.dist(Vec2::new(50.0, -25.0)) < 1e-9 && (r - 5.0).abs() < 1e-9)));
assert!(g.iter().any(|x| matches!(x, Geom2::Spline { control: true, .. })));
assert!(g.iter().any(|x| matches!(x, Geom2::Conic { .. })));
assert!(g.iter().any(|x| matches!(x, Geom2::Arc { .. })));
assert!(g.iter().any(|x| matches!(x, Geom2::Ellipse { minor, .. } if (minor - 3.0).abs() < 1e-3)));
assert!(read_svg("<svg><path d='M 1e400 0 L nan 3'/></svg>").is_ok());
assert!(read_svg("<svg").is_err() || read_svg("<svg").is_ok());
// Plain pixels.
let g = read_svg(r#"<svg><line x1="0" y1="0" x2="96" y2="0"/></svg>"#).unwrap();
assert!(matches!(g[0], Geom2::Line(a, b) if (a.dist(b) - 25.4).abs() < 1e-9));
}
}
View Git Blame Copy Permalink