feat[upload-relay]: allow configuration of max_body_size_limit

Author: wbbradley

crates/walrus-e2e-tests/tests/test_client.rs

@@ -2612,12 +2612,14 @@ async fn test_store_with_upload_relay_no_tip() {
     let upload_relay_sui_client = get_client_with_config(walrus_client_config, &registry)
         .await
         .expect("create upload relay sui client");
+    const BLOB_SIZE: usize = 40000;
     let upload_relay_handle: UploadRelayHandle = walrus_upload_relay::start_upload_relay(
         upload_relay_sui_client,
         WalrusUploadRelayConfig {
             tip_config: TipConfig::NoTip,
             tx_freshness_threshold: Duration::from_mins(5),
             tx_max_future_threshold: Duration::from_secs(10),
+            max_body_size_limit: BLOB_SIZE,
         },
         server_address,
         registry,
@@ -2640,9 +2642,13 @@ async fn test_store_with_upload_relay_no_tip() {
     )
     .await
     .expect("upload relay client creation should succeed");
-    match basic_store_and_read(&cluster_client, 1, 40000, Some(upload_relay_client), || {
-        Ok(())
-    })
+    match basic_store_and_read(
+        &cluster_client,
+        1,
+        BLOB_SIZE,
+        Some(upload_relay_client),
+        || Ok(()),
+    )
     .await
     {
         Ok(_) => {}
@@ -2725,6 +2731,7 @@ async fn test_store_with_upload_relay_with_tip() {
 
     const TIP_BASE: u64 = 1000;
     const TIP_MULTIPLIER: u64 = 100;
+    const BLOB_SIZE: usize = 40000;
 
     let registry = Registry::default();
 
@@ -2743,6 +2750,7 @@ async fn test_store_with_upload_relay_with_tip() {
             },
             tx_freshness_threshold: Duration::from_mins(5),
             tx_max_future_threshold: Duration::from_secs(10),
+            max_body_size_limit: BLOB_SIZE,
         },
         server_address,
         registry,
@@ -2792,7 +2800,6 @@ async fn test_store_with_upload_relay_with_tip() {
         .expect("get balance")
         .total_balance;
 
-    const BLOB_SIZE: usize = 40000;
     match basic_store_and_read(
         &cluster_client,
         1,

crates/walrus-upload-relay/src/controller.rs

@@ -86,6 +86,9 @@ pub struct WalrusUploadRelayConfig {
     ///
     /// This is to account for clock skew between the Walrus upload relay and the full nodes.
     pub tx_max_future_threshold: Duration,
+    /// The maximum body size limit for incoming requests, in bytes. Defaults to 1 GiB.
+    #[serde(default = "defaults::default_max_body_size_limit")]
+    pub max_body_size_limit: usize,
 }
 
 /// The subset of query parameters of the Walrus Upload Relay, necessary to check the tip.
@@ -388,7 +391,7 @@ async fn run_server(
         ))
         .route(TIP_CONFIG_ROUTE, get(send_tip_config))
         .route(BLOB_UPLOAD_RELAY_ROUTE, post(blob_upload_relay_handler))
-        .layer(DefaultBodyLimit::max(1024 * 1024 * 1024))
+        .layer(DefaultBodyLimit::max(relay_config.max_body_size_limit))
         .with_state(Arc::new(Controller::new(
             client,
             n_shards,
@@ -598,6 +601,13 @@ pub async fn get_client_with_config(
     )?)
 }
 
+mod defaults {
+    /// The default maximum body size limit for incoming requests, in bytes.
+    pub fn default_max_body_size_limit() -> usize {
+        1024 * 1024 * 1024 // 1 GiB
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::time::Duration;
@@ -607,7 +617,7 @@ mod tests {
     use utoipa_redoc::Redoc;
     use walrus_sdk::upload_relay::tip_config::{TipConfig, TipKind};
 
-    use super::{WalrusUploadRelayApiDoc, WalrusUploadRelayConfig};
+    use super::{WalrusUploadRelayApiDoc, WalrusUploadRelayConfig, defaults};
 
     const EXAMPLE_CONFIG_PATH: &str = "walrus_upload_relay_config_example.yaml";
 
@@ -620,6 +630,7 @@ mod tests {
             },
             tx_freshness_threshold: Duration::from_hours(10),
             tx_max_future_threshold: Duration::from_secs(30),
+            max_body_size_limit: defaults::default_max_body_size_limit(),
         };
 
         walrus_test_utils::overwrite_file_and_fail_if_not_equal(

crates/walrus-upload-relay/walrus_upload_relay_config_example.yaml

@@ -5,3 +5,4 @@ tx_freshness_threshold_secs: 36000
 tx_max_future_threshold:
   secs: 30
   nanos: 0
+max_body_size_limit: 1073741824