server: use Content-Length length hint in reading body, redo

[hippotat.git] / src / bin / server.rs

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 0c6cfb63f23056e25abe186345b3da75e72f8025..e7daf489c53f929bb0d9f3c60b02d7410204136a 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -30,6 +30,7 @@ struct WebRequest {
   // end delimiter for the metadata not yet located, but in here somewhere
   initial: Box<[u8]>,
   initial_remaining: usize,
+  length_hint: usize,
   body: hyper::body::Body,
   reply_to: tokio::sync::oneshot::Sender<WebResponse>,
   warnings: Warnings,
@@ -61,12 +62,17 @@ async fn handle(
 
   match async {
 
+    let get_header = |hn: &str| {
+      let mut values = req.headers().get_all(hn).iter();
+      let v = values.next().ok_or_else(|| anyhow!("missing {}", hn))?;
+      if values.next().is_some() { throw!(anyhow!("multiple {}!", hn)); }
+      let v = v.to_str().context(anyhow!("interpret {} as UTF-8", hn))?;
+      Ok::<_,AE>(v)
+    };
+
     let mkboundary = |b: &'_ _| format!("\n--{}", b).into_bytes();
     let boundary = match (||{
-      let mut ctypes = req.headers().get_all("Content-Type").iter();
-      let t = ctypes.next().ok_or_else(|| anyhow!("missing Content-Type"))?;
-      if ctypes.next().is_some() { throw!(anyhow!("several Content-Type")) }
-      let t = t.to_str().context("interpret Content-Type as utf-8")?;
+      let t = get_header("Content-Type")?;
       let t: mime::Mime = t.parse().context("parse Content-Type")?;
       if t.type_() != "multipart" { throw!(anyhow!("not multipart/")) }
       let b = mime::BOUNDARY;
@@ -84,8 +90,18 @@ async fn handle(
       },
     };
 
+    let length_hint: usize = (||{
+      let clength = get_header("Content-Length")?;
+      let clength = clength.parse().context("parse Content-Length")?;
+      Ok::<_,AE>(clength)
+    })().unwrap_or_else(
+      |e| { let _ = warnings.add(&e.wrap_err("parsing Content-Length")); 0 }
+    );
+
     let mut body = req.into_body();
-    let initial = match read_limited_bytes(METADATA_MAX_LEN, &mut body).await {
+    let initial = match read_limited_bytes(
+      METADATA_MAX_LEN, default(), length_hint, &mut body
+    ).await {
       Ok(all) => all,
       Err(ReadLimitedError::Truncated { sofar,.. }) => sofar,
       Err(ReadLimitedError::Hyper(e)) => throw!(e),
@@ -169,6 +185,7 @@ async fn handle(
     let wreq = WebRequest {
       initial,
       initial_remaining,
+      length_hint,
       body,
       warnings: mem::take(&mut warnings),
       reply_to
@@ -239,21 +256,21 @@ async fn run_client(_ic: Arc<InstanceConfig>,
       req = web.recv() =>
       {
         let WebRequest {
-          initial, initial_remaining, body,
+          initial, initial_remaining, length_hint, mut body,
           reply_to, warnings,
         } = req.ok_or_else(|| anyhow!("webservers all shut down!"))?;
 
         match async {
-          let whole_request =
-            StreamExt::chain(
-              stream::once(Ok(
-                &initial[initial_remaining..]
-              )),
-              body.map_ok(
-                |by| &*by
-              ),
-            )
-            .try_collect().await.context("read request body")?;
+
+          let whole_request = read_limited_bytes(
+            usize::MAX /* xxx */,
+            initial,
+            length_hint,
+            &mut body
+          ).await.context("read request body")?;
+
+          dbg!(whole_request.len());
+
 /*          
 
           multipart::ComponentIterator::resume_mid_component(