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 ceceddbdd795f3105f3cab7202480099f91a67c4..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,
@@ -184,6 +185,7 @@ async fn handle(
     let wreq = WebRequest {
       initial,
       initial_remaining,
+      length_hint,
       body,
       warnings: mem::take(&mut warnings),
       reply_to
@@ -254,17 +256,17 @@ 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 {
 
-          // xxx size limit
-
-          let whole_request = body.try_fold(
-            initial.into_vec(),
-            |mut w, by| async move { w.extend_from_slice(&by); Ok(w) },
+          let whole_request = read_limited_bytes(
+            usize::MAX /* xxx */,
+            initial,
+            length_hint,
+            &mut body
           ).await.context("read request body")?;
 
           dbg!(whole_request.len());