feat: implement ohttp gateway middleware

Harshdev098 · Harshdev098 · commit 500b7b36230f · 2026-02-01T20:29:57.000+05:30
Signed-off-by: Harsh Dev Pathak &lt;hiddenHaze@proton.me&gt;
diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock
@@ -1824,9 +1824,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2651,8 +2651,12 @@ dependencies = [
  "anyhow",
  "axum",
  "axum-server",
+ "bhttp",
+ "bitcoin-ohttp",
  "clap",
  "config",
+ "http-body-util",
+ "hyper",
  "ohttp-relay",
  "payjoin-directory",
  "payjoin-test-utils",
diff --git a/Cargo-recent.lock b/Cargo-recent.lock
@@ -1824,9 +1824,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2651,8 +2651,12 @@ dependencies = [
  "anyhow",
  "axum",
  "axum-server",
+ "bhttp",
+ "bitcoin-ohttp",
  "clap",
  "config",
+ "http-body-util",
+ "hyper",
  "ohttp-relay",
  "payjoin-directory",
  "payjoin-test-utils",
diff --git a/payjoin-directory/src/lib.rs b/payjoin-directory/src/lib.rs
@@ -68,7 +68,7 @@ fn init_tls_acceptor(cert_key: (Vec<u8>, Vec<u8>)) -> Result<tokio_rustls::TlsAc
 #[derive(Clone)]
 pub struct Service<D: Db> {
     db: D,
-    ohttp: ohttp::Server,
+    pub ohttp: ohttp::Server,
     metrics: Metrics,
     sentinel_tag: SentinelTag,
 }
diff --git a/payjoin-service/Cargo.toml b/payjoin-service/Cargo.toml
@@ -37,6 +37,10 @@ tokio-listener = { version = "0.5", features = ["axum08", "serde"] }
 tower = "0.5"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+http-body-util = "0.1"
+hyper = "1.8.1"
+ohttp = { package = "bitcoin-ohttp", version = "0.6" }
+bhttp = { version = "0.6.1", features = ["http"] }
 
 [dev-dependencies]
 payjoin-test-utils = { version = "0.0.1" }
diff --git a/payjoin-service/src/lib.rs b/payjoin-service/src/lib.rs
@@ -8,6 +8,13 @@ use rand::Rng;
 use tokio_listener::{Listener, SystemOptions, UserOptions};
 use tower::Service;
 use tracing::info;
+pub mod ohttp;
+
+use http_body_util::combinators::BoxBody;
+use hyper::body::Bytes;
+use hyper::{Request, StatusCode};
+use ohttp::{OhttpGatewayConfig, OhttpGatewayLayer};
+use tower::{ServiceBuilder, ServiceExt};
 
 pub mod cli;
 pub mod config;
@@ -16,6 +23,7 @@ pub mod config;
 struct Services {
     directory: payjoin_directory::Service<payjoin_directory::FilesDb>,
     relay: ohttp_relay::Service,
+    sentinel_tag: SentinelTag,
 }
 
 pub async fn serve(config: Config) -> anyhow::Result<()> {
@@ -24,6 +32,7 @@ pub async fn serve(config: Config) -> anyhow::Result<()> {
     let services = Services {
         directory: init_directory(&config, sentinel_tag).await?,
         relay: ohttp_relay::Service::new(sentinel_tag).await,
+        sentinel_tag,
     };
     let app = Router::new().fallback(route_request).with_state(services);
 
@@ -56,6 +65,7 @@ pub async fn serve_manual_tls(
     let services = Services {
         directory: init_directory(&config, sentinel_tag).await?,
         relay: ohttp_relay::Service::new_with_roots(root_store, sentinel_tag).await,
+        sentinel_tag,
     };
     let app = Router::new().fallback(route_request).with_state(services);
 
@@ -119,22 +129,68 @@ fn init_ohttp_config(
     }
 }
 
-async fn route_request(
-    State(mut services): State<Services>,
-    req: axum::extract::Request,
-) -> Response {
+async fn route_request(State(services): State<Services>, req: axum::extract::Request) -> Response {
     if is_relay_request(&req) {
-        match services.relay.call(req).await {
+        let mut relay = services.relay.clone();
+        match relay.call(req).await {
             Ok(res) => res.into_response(),
-            Err(e) => (axum::http::StatusCode::BAD_GATEWAY, e.to_string()).into_response(),
+            Err(e) => (StatusCode::BAD_GATEWAY, e.to_string()).into_response(),
         }
     } else {
-        // The directory service handles all other requests (including 404)
-        match services.directory.call(req).await {
-            Ok(res) => res.into_response(),
-            Err(e) =>
-                (axum::http::StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
+        handle_directory_request(services, req).await
+    }
+}
+
+async fn handle_directory_request(services: Services, req: axum::extract::Request) -> Response {
+    let ohttp_server = services.directory.ohttp.clone();
+
+    let ohttp_config = OhttpGatewayConfig::new(ohttp_server, services.sentinel_tag);
+
+    let (parts, body) = req.into_parts();
+
+    use http_body_util::BodyExt as _;
+
+    let body_bytes = body
+        .collect()
+        .await
+        .map_err(|_| "Failed to collect body")
+        .expect("Failed to collect body")
+        .to_bytes();
+
+    let boxed_body = BoxBody::new(http_body_util::Full::new(body_bytes));
+
+    let hyper_req = Request::from_parts(parts, boxed_body);
+
+    let directory_service = tower::service_fn({
+        let directory = services.directory.clone();
+        move |req: Request<BoxBody<Bytes, hyper::Error>>| {
+            let mut dir = directory.clone();
+            async move {
+                dir.call(req).await.map_err(|e| {
+                    Box::new(std::io::Error::other(e.to_string()))
+                        as Box<dyn std::error::Error + Send + Sync>
+                })
+            }
         }
+    });
+
+    let mut service_with_ohttp = ServiceBuilder::new()
+        .layer(OhttpGatewayLayer::new(ohttp_config))
+        .service(directory_service)
+        .boxed_clone();
+
+    match service_with_ohttp.ready().await {
+        Ok(ready_service) => match ready_service.call(hyper_req).await {
+            Ok(response) => {
+                let (parts, body) = response.into_parts();
+                let axum_body = axum::body::Body::new(body);
+                Response::from_parts(parts, axum_body).into_response()
+            }
+            Err(e) =>
+                (StatusCode::INTERNAL_SERVER_ERROR, format!("Service error: {}", e)).into_response(),
+        },
+        Err(e) =>
+            (StatusCode::INTERNAL_SERVER_ERROR, format!("Service not ready: {}", e)).into_response(),
     }
 }
 
diff --git a/payjoin-service/src/ohttp/middleware.rs b/payjoin-service/src/ohttp/middleware.rs
diff --git a/payjoin-service/src/ohttp/mod.rs b/payjoin-service/src/ohttp/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ fn init_tls_acceptor(cert_key: (Vec<u8>, Vec<u8>)) -> Result<tokio_rustls::TlsAc`
`68`	`68`	`#[derive(Clone)]`
`69`	`69`	`pub struct Service<D: Db> {`
`70`	`70`	`db: D,`
`71`		`- ohttp: ohttp::Server,`
	`71`	`+ pub ohttp: ohttp::Server,`
`72`	`72`	`metrics: Metrics,`
`73`	`73`	`sentinel_tag: SentinelTag,`
`74`	`74`	`}`