Add measurement header injection

Author: ameba23

Cargo.lock

@@ -11,9 +11,9 @@ repository = "https://github.com/flashbots/attested-tls-proxy"
 keywords = ["attested-TLS", "CVM", "TDX"]
 
 [dependencies]
-attested-tls = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-crate" }
-nested-tls = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-crate" }
-attestation = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-crate" }
+attested-tls = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-expose-cert-verifier" }
+nested-tls = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-expose-cert-verifier" }
+attestation = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-expose-cert-verifier" }
 tokio = { version = "1.50.0", features = ["full"] }
 tokio-rustls = { version = "0.26.4", default-features = false }
 x509-parser = { version = "0.18.0", features = ["verify"] }
@@ -47,7 +47,7 @@ pin-project-lite = "0.2.16"
 [dev-dependencies]
 tempfile = "3.23.0"
 tdx-quote = { version = "0.0.5", features = ["mock"] }
-attestation = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-crate", features = ["mock"] }
+attestation = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-expose-cert-verifier", features = ["mock"] }
 tokio = { version = "1.48.0", features = ["full"] }
 jsonrpsee = { version = "0.26.0", features = ["server"] }
 

Cargo.toml

@@ -1,6 +1,7 @@
 //! HTTP Version support and negotiation
 use hyper::Response;
 use hyper_util::rt::TokioIo;
+use bytes::Bytes;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
@@ -55,15 +56,18 @@ impl HttpVersion {
     }
 }
 
-type Http1Sender = hyper::client::conn::http1::SendRequest<hyper::body::Incoming>;
-type Http2Sender = hyper::client::conn::http2::SendRequest<hyper::body::Incoming>;
+type Http1Sender = hyper::client::conn::http1::SendRequest<http_body_util::Full<Bytes>>;
+type Http2Sender = hyper::client::conn::http2::SendRequest<http_body_util::Full<Bytes>>;
 
 type Http1Connection =
-    hyper::client::conn::http1::Connection<TokioIo<ProxyClientTlsStream>, hyper::body::Incoming>;
+    hyper::client::conn::http1::Connection<
+        TokioIo<ProxyClientTlsStream>,
+        http_body_util::Full<Bytes>,
+    >;
 
 type Http2Connection = hyper::client::conn::http2::Connection<
     TokioIo<ProxyClientTlsStream>,
-    hyper::body::Incoming,
+    http_body_util::Full<Bytes>,
     crate::TokioExecutor,
 >;
 
@@ -88,8 +92,9 @@ impl From<Http2Sender> for HttpSender {
 impl HttpSender {
     pub async fn send_request(
         &mut self,
-        request: http::Request<hyper::body::Incoming>,
+        request: http::Request<Bytes>,
     ) -> Result<Response<hyper::body::Incoming>, hyper::Error> {
+        let request = request.map(http_body_util::Full::new);
         match self {
             Self::Http1(sender) => sender.send_request(request).await,
             Self::Http2(sender) => sender.send_request(request).await,