fix(domain): refuse lone UTF-16 surrogates instead of replacing them (L1)
serde_json already refuses a lone surrogate escape; the U+FFFD pre-pass is gone and parse_json classifies the refusal (strict escape scan, on failure only) so callers name it: closed kind lone_surrogate from operation inputs, sheet.check, draft.restore and archive.import. Oracles untouched: the two L1 cases and the Zod verdict now assert that TypeScript kept the surrogate and Rust refuses the text.
This commit is contained in:
1 parent
36316cf67f
commit
20d03cf7fd
9 files changed
+275
-75
No files matched your search
@@ -10,7 +10,7 @@ use faunosteo_core::domain::archive::{
|
||||
Branding, PdfLabelSet, ReportArchiveEnvelope, SheetSnapshot, assert_snapshot,
|
||||
build_sheet_snapshot, read_archive_document,
|
||||
};
|
||||
use faunosteo_core::domain::js::parse_json;
|
||||
use faunosteo_core::domain::js::{JsonReadError, parse_json};
|
||||
use faunosteo_core::domain::report::v2::ReportV2;
|
||||
use faunosteo_core::domain::report::{
|
||||
ReadFailure, Report, ReportMigrationMap, read_report_document, rebase_report_on_sheet,
|
||||
@@ -21,9 +21,15 @@ use serde::Serialize;
|
||||
use serde_json::{Map, Value, json};
|
||||
|
||||
fn oracle(name: &str) -> (String, Value) {
|
||||
let text = common::repo_file(&format!("crates/core/tests/oracles/{name}"));
|
||||
let value = parse_json(&text).unwrap();
|
||||
(text, value)
|
||||
common::oracle_file(name)
|
||||
}
|
||||
|
||||
/// A case input as the core reads it; a lone surrogate refuses it whole (L1).
|
||||
fn read_input(text: &str) -> Result<Value, Value> {
|
||||
parse_json(text).map_err(|error| match error {
|
||||
JsonReadError::LoneSurrogate { .. } => json!({ "kind": "lone_surrogate" }),
|
||||
JsonReadError::Syntax(error) => panic!("unreadable oracle input: {error}"),
|
||||
})
|
||||
}
|
||||
|
||||
/// Object keys sorted at every level: equality whatever the declared field order.
|
||||
@@ -77,7 +83,7 @@ fn read_error(failure: &ReadFailure) -> Value {
|
||||
|
||||
/// What Rust returns for a case: `Ok(output)` or `Err(error)` in the oracle's shapes.
|
||||
fn run(context: &Context, case: &Value) -> Result<Value, Value> {
|
||||
let input = parse_json(case["input"].as_str().unwrap()).unwrap();
|
||||
let input = read_input(case["input"].as_str().unwrap())?;
|
||||
match case["fn"].as_str().unwrap() {
|
||||
"readReport" => read_report_document(&input, &context.map(case))
|
||||
.map(|o| serde_json::to_value(o).unwrap())
|
||||
@@ -143,7 +149,7 @@ fn cases(with_rules: bool) -> (Context, Vec<Value>) {
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.iter()
|
||||
.filter(|c| c.get("needsRules").is_some() == with_rules)
|
||||
.filter(|c| c.get("needsRules").is_some() == with_rules && c.get("l1").is_none())
|
||||
.cloned()
|
||||
.collect();
|
||||
(context, list)
|
||||
@@ -167,13 +173,15 @@ fn rust_does_what_the_typescript_did_with_the_integrity_rules() {
|
||||
assert!(failures.is_empty(), "{}", failures.join("\n"));
|
||||
}
|
||||
|
||||
/// Decision L1: where `JSON.parse` keeps a lone surrogate (the TypeScript output still
|
||||
/// carries the `\ud800` escape), Rust reads U+FFFD; nothing else differs.
|
||||
/// Decision L1 (owner, 2026-10-14): where `JSON.parse` kept a lone surrogate (the frozen
|
||||
/// TypeScript output still carries the `\\ud800` escape), Rust refuses the input whole with
|
||||
/// `lone_surrogate` instead of altering it; no output, no U+FFFD.
|
||||
#[test]
|
||||
fn lone_surrogates_are_the_one_declared_difference() {
|
||||
fn lone_surrogates_are_refused_never_replaced() {
|
||||
let (raw, value) = oracle("characterisation.json");
|
||||
let backslash = char::from(92);
|
||||
let lone_escape = format!("{backslash}ud800");
|
||||
let context = cases(false).0;
|
||||
let flagged: Vec<&Value> = value["cases"]
|
||||
.as_array()
|
||||
.unwrap()
|
||||
@@ -189,9 +197,11 @@ fn lone_surrogates_are_the_one_declared_difference() {
|
||||
output.contains(&lone_escape),
|
||||
"{name}: TS output keeps the lone surrogate"
|
||||
);
|
||||
let context = cases(false).0;
|
||||
let rust = pretty(&run(&context, case).unwrap());
|
||||
assert!(rust.contains('\u{FFFD}'), "{name}: Rust reads U+FFFD");
|
||||
assert_eq!(
|
||||
run(&context, case),
|
||||
Err(json!({ "kind": "lone_surrogate" })),
|
||||
"{name}: Rust refuses the text"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -215,7 +225,14 @@ fn the_contracts_accept_and_refuse_what_zod_does() {
|
||||
let (_, list) = oracle("verdicts.json");
|
||||
let list = list.as_array().unwrap();
|
||||
assert!(list.len() > 500, "{} verdicts", list.len());
|
||||
let failures: Vec<String> = list
|
||||
// L1: the one input Zod accepted with a lone surrogate is refused by the reader instead.
|
||||
let (lone, readable): (Vec<&Value>, Vec<&Value>) = list
|
||||
.iter()
|
||||
.partition(|v| read_input(v["input"].as_str().unwrap()).is_err());
|
||||
assert_eq!(lone.len(), 1);
|
||||
assert_eq!(lone[0]["name"], "lone surrogate in a comment");
|
||||
assert_eq!(lone[0]["accepted"], true);
|
||||
let failures: Vec<String> = readable
|
||||
.iter()
|
||||
.filter_map(|v| {
|
||||
let schema = v["schema"].as_str().unwrap();
|
||||
|
||||
Reference in new issue
Block a user