fixup! Net: add a simple HTTP client implementation.

Author: bavshin-f5

src/net/http.rs

@@ -3,10 +3,11 @@ use core::future;
 use core::ptr::NonNull;
 use std::io;
 
+use bytes::Bytes;
 use http::uri::Scheme;
 use http::{Request, Response};
 use http_body::Body;
-use hyper::body;
+use http_body_util::BodyExt;
 use nginx_sys::{ngx_log_t, ngx_resolver_t, NGX_LOG_WARN};
 use ngx::allocator::Box;
 use ngx::async_::spawn;
@@ -17,6 +18,10 @@ use super::peer_conn::PeerConnection;
 use super::resolver::Resolver;
 use crate::conf::ssl::NgxSsl;
 
+// The largest response we can reasonably expect is a certificate chain, which should not exceed
+// a few kilobytes.
+const NGX_ACME_MAX_BODY_SIZE: usize = 64 * 1024;
+
 const NGINX_VER: &str = match nginx_sys::NGINX_VER.to_str() {
     Ok(x) => x.trim_ascii(),
     _ => unreachable!(),
@@ -32,10 +37,9 @@ const NGX_ACME_USER_AGENT: &str = constcat::concat!(
 
 #[allow(async_fn_in_trait)]
 pub trait HttpClient {
-    type Body: http_body::Body<Error: StdError + Send + Sync> + 'static;
     type Error: StdError + Send + Sync + 'static;
 
-    async fn request<B>(&self, req: Request<B>) -> Result<Response<Self::Body>, Self::Error>
+    async fn request<B>(&self, req: Request<B>) -> Result<Response<Bytes>, Self::Error>
     where
         B: Body + Send + 'static,
         <B as Body>::Data: Send,
@@ -51,6 +55,8 @@ pub struct NgxHttpClient<'a> {
 
 #[derive(Debug, Error)]
 pub enum HttpClientError {
+    #[error("response body read error: {0}")]
+    Body(std::boxed::Box<dyn StdError + Send + Sync>),
     #[error("request error: {0}")]
     Http(#[from] hyper::Error),
     #[error("name resolution error: {0}")]
@@ -88,10 +94,9 @@ impl<'a> NgxHttpClient<'a> {
 }
 
 impl HttpClient for NgxHttpClient<'_> {
-    type Body = hyper::body::Incoming;
     type Error = HttpClientError;
 
-    async fn request<B>(&self, mut req: Request<B>) -> Result<Response<body::Incoming>, Self::Error>
+    async fn request<B>(&self, mut req: Request<B>) -> Result<Response<Bytes>, Self::Error>
     where
         B: Body + Send + 'static,
         <B as Body>::Data: Send,
@@ -160,6 +165,14 @@ impl HttpClient for NgxHttpClient<'_> {
         .detach();
 
         let resp = sender.send_request(req).await?;
-        Ok(resp)
+        let (parts, body) = resp.into_parts();
+
+        let body = http_body_util::Limited::new(body, NGX_ACME_MAX_BODY_SIZE)
+            .collect()
+            .await
+            .map_err(HttpClientError::Body)?
+            .to_bytes();
+
+        Ok(Response::from_parts(parts, body))
     }
 }