update max request size

Signed-off-by: Jess Frazelle <[email protected]>
oxidecomputer · Dec 4, 2020 · 530cda7 · 530cda7
1 parent b91b920
commit 530cda7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 1 deletion.
diff --git a/dropshot/examples/basic.rs b/dropshot/examples/basic.rs
@@ -32,6 +32,7 @@ async fn main() -> Result<(), String> {
      */
     let config_dropshot = ConfigDropshot {
         bind_address: "127.0.0.1:0".parse().unwrap(),
+        request_body_max_bytes: Default::default(),
     };
 
     /*

diff --git a/dropshot/examples/pagination-basic.rs b/dropshot/examples/pagination-basic.rs
@@ -143,6 +143,7 @@ async fn main() -> Result<(), String> {
     let ctx = Arc::new(tree);
     let config_dropshot = ConfigDropshot {
         bind_address: SocketAddr::from((Ipv4Addr::LOCALHOST, port)),
+        request_body_max_bytes: Default::default(),
     };
     let config_logging = ConfigLogging::StderrTerminal {
         level: ConfigLoggingLevel::Debug,

diff --git a/dropshot/examples/pagination-multiple-resources.rs b/dropshot/examples/pagination-multiple-resources.rs
@@ -295,6 +295,7 @@ async fn main() -> Result<(), String> {
     let ctx = Arc::new(DataCollection::new());
     let config_dropshot = ConfigDropshot {
         bind_address: SocketAddr::from((Ipv4Addr::LOCALHOST, port)),
+        request_body_max_bytes: Default::default(),
     };
     let config_logging = ConfigLogging::StderrTerminal {
         level: ConfigLoggingLevel::Debug,

diff --git a/dropshot/examples/pagination-multiple-sorts.rs b/dropshot/examples/pagination-multiple-sorts.rs
@@ -316,6 +316,7 @@ async fn main() -> Result<(), String> {
     let ctx = Arc::new(ProjectCollection::new());
     let config_dropshot = ConfigDropshot {
         bind_address: SocketAddr::from((Ipv4Addr::LOCALHOST, port)),
+        request_body_max_bytes: Default::default(),
     };
     let config_logging = ConfigLogging::StderrTerminal {
         level: ConfigLoggingLevel::Debug,

diff --git a/dropshot/src/config.rs b/dropshot/src/config.rs
@@ -45,4 +45,13 @@ use std::net::SocketAddr;
 pub struct ConfigDropshot {
     /** IP address and TCP port to which to bind for accepting connections */
     pub bind_address: SocketAddr,
+    /** maximum allowed size of a request body, defaults to 1024 */
+    pub request_body_max_bytes: RequestBodyMaxBytes,
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub struct RequestBodyMaxBytes(pub usize);
+
+impl Default for RequestBodyMaxBytes {
+    fn default() -> Self { RequestBodyMaxBytes(1024) }
 }
diff --git a/dropshot/src/server.rs b/dropshot/src/server.rs
@@ -133,7 +133,7 @@ impl HttpServer {
             private,
             config: ServerConfig {
                 /* We start aggressively to ensure test coverage. */
-                request_body_max_bytes: 1024,
+                request_body_max_bytes: config.request_body_max_bytes.0,
                 page_max_nitems: NonZeroUsize::new(10000).unwrap(),
                 page_default_nitems: NonZeroUsize::new(100).unwrap(),
             },

diff --git a/dropshot/tests/common/mod.rs b/dropshot/tests/common/mod.rs
@@ -24,6 +24,7 @@ pub fn test_setup(test_name: &str, api: ApiDescription) -> TestContext {
      */
     let config_dropshot = ConfigDropshot {
         bind_address: "127.0.0.1:0".parse().unwrap(),
+        request_body_max_bytes: Default::default(),
     };
 
     let config_logging = ConfigLogging::File {