chore: removed ohttp handling from directory

Author: Harshdev098

Cargo-minimal.lock

@@ -2633,7 +2633,6 @@ name = "payjoin-directory"
 version = "0.0.3"
 dependencies = [
  "anyhow",
- "bhttp",
  "bitcoin 0.32.8",
  "bitcoin-ohttp",
  "clap",
@@ -2693,7 +2692,6 @@ dependencies = [
  "anyhow",
  "axum",
  "axum-server",
- "bhttp",
  "bitcoin-ohttp",
  "clap",
  "config",

Cargo-recent.lock

@@ -2633,7 +2633,6 @@ name = "payjoin-directory"
 version = "0.0.3"
 dependencies = [
  "anyhow",
- "bhttp",
  "bitcoin 0.32.8",
  "bitcoin-ohttp",
  "clap",
@@ -2693,7 +2692,6 @@ dependencies = [
  "anyhow",
  "axum",
  "axum-server",
- "bhttp",
  "bitcoin-ohttp",
  "clap",
  "config",

ohttp-relay/Cargo.toml

@@ -20,6 +20,7 @@ ws-bootstrap = ["futures", "rustls", "tokio-tungstenite"]
 _test-util = []
 
 [dependencies]
+bhttp = { version = "0.6.1", features = ["http"] }
 byteorder = "1.5.0"
 bytes = "1.10.1"
 futures = { version = "0.3.31", optional = true }
@@ -33,6 +34,7 @@ hyper-rustls = { version = "0.27.7", default-features = false, features = [
   "ring",
 ] }
 hyper-util = { version = "0.1.16", features = ["client-legacy", "service"] }
+ohttp = { package = "bitcoin-ohttp", version = "0.6" }
 rustls = { version = "0.23.31", optional = true, default-features = false, features = [
   "ring",
 ] }
@@ -47,8 +49,6 @@ tokio-util = { version = "0.7.16", features = ["net", "codec"] }
 tower = "0.5"
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
-ohttp = { package = "bitcoin-ohttp", version = "0.6" }
-bhttp = { version = "0.6.1", features = ["http"] }
 
 [dev-dependencies]
 mockito = "1.7.0"

ohttp-relay/src/gateway_helpers.rs

@@ -2,9 +2,9 @@ use std::io::Cursor;
 
 pub const CHACHA20_POLY1305_NONCE_LEN: usize = 32;
 pub const POLY1305_TAG_SIZE: usize = 16;
-pub const ENCAPSULATED_MESSAGE_BYTES: usize = 65536;
-pub const BHTTP_REQ_BYTES: usize =
-    ENCAPSULATED_MESSAGE_BYTES - (CHACHA20_POLY1305_NONCE_LEN + POLY1305_TAG_SIZE);
+pub const OHTTP_OVERHEAD: usize = CHACHA20_POLY1305_NONCE_LEN + POLY1305_TAG_SIZE;
+pub const ENCAPSULATED_MESSAGE_BYTES: usize = 8192;
+pub const BHTTP_REQ_BYTES: usize = ENCAPSULATED_MESSAGE_BYTES - OHTTP_OVERHEAD;
 
 #[derive(Debug)]
 pub enum GatewayError {
@@ -25,7 +25,6 @@ impl std::fmt::Display for GatewayError {
 
 impl std::error::Error for GatewayError {}
 
-/// Represents the decapsulated HTTP request extracted from OHTTP
 pub struct DecapsulatedRequest {
     pub method: String,
     pub uri: String,
@@ -90,18 +89,27 @@ pub fn encapsulate_ohttp_response(
         GatewayError::InternalServerError(format!("BHTTP serialization failed: {}", e))
     })?;
 
+    if bhttp_bytes.len() > BHTTP_REQ_BYTES {
+        return Err(GatewayError::InternalServerError(format!(
+            "BHTTP response too large: {} > {}",
+            bhttp_bytes.len(),
+            BHTTP_REQ_BYTES
+        )));
+    }
+
     bhttp_bytes.resize(BHTTP_REQ_BYTES, 0);
 
     let ohttp_res = res_ctx.encapsulate(&bhttp_bytes).map_err(|e| {
         GatewayError::InternalServerError(format!("OHTTP encapsulation failed: {}", e))
     })?;
 
-    assert!(
-        ohttp_res.len() == ENCAPSULATED_MESSAGE_BYTES,
-        "Unexpected OHTTP response size: {} != {}",
-        ohttp_res.len(),
-        ENCAPSULATED_MESSAGE_BYTES
-    );
+    if ohttp_res.len() != ENCAPSULATED_MESSAGE_BYTES {
+        return Err(GatewayError::InternalServerError(format!(
+            "Unexpected OHTTP response size: {} != {}",
+            ohttp_res.len(),
+            ENCAPSULATED_MESSAGE_BYTES
+        )));
+    }
 
     Ok(ohttp_res)
 }

ohttp-relay/src/lib.rs

@@ -38,10 +38,7 @@ pub mod sentinel;
 pub use sentinel::SentinelTag;
 pub mod gateway_helpers;
 
-pub use gateway_helpers::{
-    decapsulate_ohttp_request, encapsulate_ohttp_response, BHTTP_REQ_BYTES,
-    ENCAPSULATED_MESSAGE_BYTES,
-};
+pub use gateway_helpers::{decapsulate_ohttp_request, encapsulate_ohttp_response};
 
 use crate::error::{BoxError, Error};
 

payjoin-directory/Cargo.toml

@@ -20,7 +20,6 @@ acme = ["tokio-rustls-acme"]
 
 [dependencies]
 anyhow = "1.0.99"
-bhttp = { version = "0.6.1", features = ["http"] }
 bitcoin = { version = "0.32.7", features = ["base64", "rand-std"] }
 clap = { version = "4.5.45", features = ["derive", "env"] }
 config = "0.15.14"