Refuse to include \s in the JSON output of a TXT record

[dnssec-prover] / wasmpack / src / lib.rs

diff --git a/wasmpack/src/lib.rs b/wasmpack/src/lib.rs
index 976df500eee2d96ede250f89877d9a1fd84c5c83..57fe0a03a89b9b4a7c6b1ba3f0829ccefff2fe65 100644 (file)
--- a/wasmpack/src/lib.rs
+++ b/wasmpack/src/lib.rs
@@ -2,12 +2,75 @@
 
 use dnssec_prover::ser::parse_rr_stream;
 use dnssec_prover::validation::{verify_rr_stream, ValidationError};
+use dnssec_prover::query::{ProofBuilder, QueryBuf};
 
 use wasm_bindgen::prelude::wasm_bindgen;
 
+extern crate alloc;
+use alloc::collections::VecDeque;
+
+use core::fmt::Write;
+
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
+#[wasm_bindgen]
+pub struct WASMProofBuilder(ProofBuilder, VecDeque<QueryBuf>);
+
+#[wasm_bindgen]
+/// Builds a proof builder which can generate a proof for records of the given `ty`pe at the given
+/// `name`.
+///
+/// After calling this [`get_next_query`] should be called to fetch the initial query.
+pub fn init_proof_builder(mut name: String, ty: u16) -> Option<WASMProofBuilder> {
+       if !name.ends_with('.') { name.push('.'); }
+       if let Ok(qname) = name.try_into() {
+               let (builder, initial_query) = ProofBuilder::new(&qname, ty);
+               let mut queries = VecDeque::with_capacity(4);
+               queries.push_back(initial_query);
+               Some(WASMProofBuilder(builder, queries))
+       } else {
+               None
+       }
+}
+
+#[wasm_bindgen]
+/// Processes a response to a query previously fetched from [`get_next_query`].
+///
+/// After calling this, [`get_next_query`] should be called until pending queries are exhausted and
+/// no more pending queries exist, at which point [`get_unverified_proof`] should be called.
+pub fn process_query_response(proof_builder: &mut WASMProofBuilder, response: Vec<u8>) {
+       if response.len() < u16::MAX as usize {
+               let mut answer = QueryBuf::new_zeroed(response.len() as u16);
+               answer.copy_from_slice(&response);
+               if let Ok(queries) = proof_builder.0.process_response(&answer) {
+                       for query in queries {
+                               proof_builder.1.push_back(query);
+                       }
+               }
+       }
+}
+
+
+#[wasm_bindgen]
+/// Gets the next query (if any) that should be sent to the resolver for the given proof builder.
+///
+/// Once the resolver responds [`process_query_response`] should be called with the response.
+pub fn get_next_query(proof_builder: &mut WASMProofBuilder) -> Option<Vec<u8>> {
+       if let Some(query) = proof_builder.1.pop_front() {
+               Some(query.into_vec())
+       } else {
+               None
+       }
+}
+
+#[wasm_bindgen]
+/// Gets the final, unverified, proof once all queries fetched via [`get_next_query`] have
+/// completed and their responses passed to [`process_query_response`].
+pub fn get_unverified_proof(proof_builder: WASMProofBuilder) -> Option<Vec<u8>> {
+       proof_builder.0.finish_proof().ok().map(|(proof, _ttl)| proof)
+}
+
 #[wasm_bindgen]
 /// Verifies an RFC 9102-formatted proof and returns the [`VerifiedRRStream`] in JSON form.
 pub fn verify_byte_stream(stream: Vec<u8>) -> String {
@@ -21,10 +84,13 @@ fn do_verify_byte_stream(stream: Vec<u8>) -> Result<String, ValidationError> {
        let rrs = parse_rr_stream(&stream).map_err(|()| ValidationError::Invalid)?;
        let verified_rrs = verify_rr_stream(&rrs)?;
        let mut resp = String::new();
-       resp += &format!("{{\"valid_from\": {}, \"expires\": {}, \"max_cache_ttl\": {}, \"verified_rrs\": [",
-               verified_rrs.valid_from, verified_rrs.expires, verified_rrs.max_cache_ttl);
+       write!(&mut resp, "{}",
+               format_args!("{{\"valid_from\": {}, \"expires\": {}, \"max_cache_ttl\": {}, \"verified_rrs\": [",
+               verified_rrs.valid_from, verified_rrs.expires, verified_rrs.max_cache_ttl)
+       ).expect("Write to a String shouldn't fail");
        for (idx, rr) in verified_rrs.verified_rrs.iter().enumerate() {
-               resp += &format!("{}\"{:?}\"", if idx != 0 { ", " } else { "" }, rr);
+               write!(&mut resp, "{}{}", if idx != 0 { ", " } else { "" }, rr.json())
+                       .expect("Write to a String shouldn't fail");
        }
        resp += "]}";
        Ok(resp)