fix(anatomy): V1-2.2 review findings, PIs and HTML refused, bounds
Security audit (PASS, 2 MEDIUM, 2 LOW) and verifier (ECARTS 6) on
741c25c: processing instructions and HTML fetchers refused, active
content under a long title classified, linear review groups, full
fixpoint check, bounded preview drawings, missing cap fixtures and
property checks, record wordings.
This commit is contained in:
1 parent
741c25c464
commit
8294d5471c
15 files changed
+448
-72
No files matched your search
@@ -42,6 +42,8 @@ fn the_hostile_corpus_answers_as_the_contract_table() {
|
||||
("script.svg", Rejected, active),
|
||||
("style-element.svg", Rejected, active),
|
||||
("url-unicode-space.svg", Rejected, active),
|
||||
// A processing instruction survives in the bytes the tree never reads.
|
||||
("comments-pi-cdata.svg", Rejected, active),
|
||||
// Hard rejections of the reader.
|
||||
("bom.svg", Rejected, Some("malformed")),
|
||||
("cdata-desync.svg", Rejected, Some("too_deep")),
|
||||
@@ -71,7 +73,6 @@ fn the_hostile_corpus_answers_as_the_contract_table() {
|
||||
("xlink-other-prefix.svg", Cleanable, None),
|
||||
("xlink-prefix-rebound.svg", Cleanable, None),
|
||||
// Nothing removed (comments, stray text and clamped values are no removal).
|
||||
("comments-pi-cdata.svg", Clean, None),
|
||||
("dangling-references.svg", Clean, None),
|
||||
("duplicate-ids.svg", Clean, None),
|
||||
("osteo-halo-id.svg", Clean, None),
|
||||
@@ -134,6 +135,92 @@ fn active_names_are_listed_and_ordinary_removals_are_not() {
|
||||
assert_eq!(read_svg(&text).unwrap_err().reason(), "too_complex");
|
||||
}
|
||||
|
||||
/// The security audit's probes (V1-2.2): content the classification must refuse, never clean.
|
||||
#[test]
|
||||
fn hidden_or_html_content_is_refused_not_cleaned() {
|
||||
let long = "A".repeat(4097);
|
||||
let svg = |body: &str| {
|
||||
format!(
|
||||
"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:h=\"http://www.w3.org/1999/xhtml\">{body}</svg>"
|
||||
)
|
||||
};
|
||||
let cases = [
|
||||
"<?xml-stylesheet type=\"text/xsl\" href=\"https://attacker.example/x.xsl\"?>".to_owned()
|
||||
+ &svg("<path d=\"M0 0h1\"/>"),
|
||||
svg("<?xml-stylesheet href=\"x.css\"?><path d=\"M0 0h1\"/>"),
|
||||
svg(&format!("<title>{long}<script>alert(1)</script></title>")),
|
||||
svg(&format!("<title onload=\"x()\">{long}</title>")),
|
||||
svg(&format!(
|
||||
"<desc>{long}<foreignObject><iframe src=\"https://e/\"/></foreignObject></desc>"
|
||||
)),
|
||||
svg("<h:img src=\"https://e/x.png\"/>"),
|
||||
svg("<h:meta http-equiv=\"refresh\" content=\"0;url=https://e\"/>"),
|
||||
svg("<h:input type=\"image\" src=\"https://e\"/>"),
|
||||
svg("<h:source srcset=\"https://e/a.png\"/>"),
|
||||
svg("<h:frame src=\"https://e\"/>"),
|
||||
svg("<h:form action=\"https://e\"/>"),
|
||||
svg("<h:div>x</h:div>"),
|
||||
svg("<g><x:thing xmlns:x=\"urn:x\" src=\"https://e\"/></g>"),
|
||||
];
|
||||
for case in cases {
|
||||
let cleaning = clean_svg(case.as_bytes());
|
||||
assert_eq!(
|
||||
outcome(&cleaning),
|
||||
(Rejected, Some("svg_active_content")),
|
||||
"{case}"
|
||||
);
|
||||
assert!(!cleaning.active.is_empty(), "{case}");
|
||||
}
|
||||
// A long title alone is still cleaned; editor metadata stays cleanable.
|
||||
assert_eq!(
|
||||
outcome(&clean_svg(
|
||||
svg(&format!("<title>{long}</title>")).as_bytes()
|
||||
)),
|
||||
(Cleanable, None)
|
||||
);
|
||||
let inkscape = r#"<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview id="n"/><path d="M0 0h1"/></svg>"#;
|
||||
assert_eq!(outcome(&clean_svg(inkscape.as_bytes())), (Cleanable, None));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_verdict_refuses_a_stored_processing_instruction() {
|
||||
use faunosteo_core::domain::sheet::verdict::{
|
||||
DrawingResult, VerdictBinding, VerdictDrawing, VerdictInput, compute_verdict,
|
||||
};
|
||||
let bytes = b"<?xml-stylesheet href=\"https://e/x.xsl\"?><svg xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M0 0h1\"/></svg>";
|
||||
let asset = "11111111-2222-4333-8444-555555555555";
|
||||
let document = serde_json::json!({
|
||||
"schema_version": 2, "species_id": "canine", "name": { "fr": "C", "en": "C" },
|
||||
"description": {}, "scope_disclaimer": {}, "attribution": { "authors": [], "license": null, "notes": null },
|
||||
"vertebral_config": { "regions": [] }, "references": [], "categories": [],
|
||||
"views": [{ "id": "main", "kind": "main", "name": { "fr": "V", "en": "V" }, "svg_asset_id": asset, "view_box": null }],
|
||||
"annotations": [], "finding_zones": []
|
||||
})
|
||||
.to_string();
|
||||
let sha = sha256_hex(bytes);
|
||||
let verdict = compute_verdict(&VerdictInput {
|
||||
binding: VerdictBinding {
|
||||
sheet_id: "s".into(),
|
||||
version_id: "v".into(),
|
||||
revision: 1,
|
||||
review_id: "r".into(),
|
||||
},
|
||||
document: &document,
|
||||
base_document: None,
|
||||
drawings: vec![VerdictDrawing {
|
||||
asset_id: asset,
|
||||
sha256: &sha,
|
||||
byte_size: bytes.len() as u64,
|
||||
bytes: Some(bytes),
|
||||
}],
|
||||
});
|
||||
assert_eq!(verdict.drawings[0].result, DrawingResult::SvgRejected);
|
||||
assert_eq!(
|
||||
verdict.drawings[0].detail.as_deref(),
|
||||
Some("processing_instruction")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_plain_style_sheet_is_cleaned_and_named() {
|
||||
let styled = br#"<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4 4"><defs><style>.st0{fill:#fff}</style></defs><path class="st0" d="M0 0h1"/></svg>"#;
|
||||
|
||||
Reference in new issue
Block a user