update max request size

dropshot/examples/basic.rs

@@ -30,9 +30,7 @@ async fn main() -> Result<(), String> {
      * request port 0, which allows the operating system to pick any available
      * port.
      */
-    let config_dropshot = ConfigDropshot {
-        bind_address: "127.0.0.1:0".parse().unwrap(),
-    };
+    let config_dropshot: ConfigDropshot = Default::default();
 
     /*
      * For simplicity, we'll configure an "info"-level logger that writes to

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: 1024,
     };
     let config_logging = ConfigLogging::StderrTerminal {
         level: ConfigLoggingLevel::Debug,

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: 1024,
     };
     let config_logging = ConfigLogging::StderrTerminal {
         level: ConfigLoggingLevel::Debug,

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: 1024,
     };
     let config_logging = ConfigLogging::StderrTerminal {
         level: ConfigLoggingLevel::Debug,

dropshot/src/config.rs

@@ -30,6 +30,7 @@ use std::net::SocketAddr;
  *         r##"
  *             [http_api_server]
  *             bind_address = "127.0.0.1:12345"
+ *             request_body_max_bytes = 1024
  *
  *             ## ... (other app-specific config)
  *         "##
@@ -45,4 +46,15 @@ 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: usize,
+}
+
+impl Default for ConfigDropshot {
+    fn default() -> Self {
+        ConfigDropshot {
+            bind_address: "127.0.0.1:0".parse().unwrap(),
+            request_body_max_bytes: 1024,
+        }
+    }
 }

dropshot/src/lib.rs

@@ -69,6 +69,7 @@
  *         HttpServer::new(
  *             &ConfigDropshot {
  *                 bind_address: "127.0.0.1:0".parse().unwrap(),
+ *                 request_body_max_bytes: 1024,
  *             },
  *             api,
  *             Arc::new(()),

dropshot/src/router.rs

@@ -118,10 +118,12 @@ impl PathSegment {
         if segment.starts_with('{') || segment.ends_with('}') {
             assert!(
                 segment.starts_with('{'),
+                "{}",
                 "HTTP URI path segment variable missing leading \"{\""
             );
             assert!(
                 segment.ends_with('}'),
+                "{}",
                 "HTTP URI path segment variable missing trailing \"}\""
             );
             assert!(

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,
                 page_max_nitems: NonZeroUsize::new(10000).unwrap(),
                 page_default_nitems: NonZeroUsize::new(100).unwrap(),
             },

dropshot/tests/common/mod.rs

@@ -22,9 +22,7 @@ pub fn test_setup(test_name: &str, api: ApiDescription) -> TestContext {
      * multiple concurrent tests, so any fixed port could result in spurious
      * failures due to port conflicts.
      */
-    let config_dropshot = ConfigDropshot {
-        bind_address: "127.0.0.1:0".parse().unwrap(),
-    };
+    let config_dropshot: ConfigDropshot = Default::default();
 
     let config_logging = ConfigLogging::File {
         level: ConfigLoggingLevel::Debug,

dropshot/tests/fail/bad_endpoint1.stderr

@@ -4,13 +4,13 @@ error: incompatible function signature; expected async fn (Arc<RequestContext>(,
 11 | async fn bad_endpoint() -> Result<HttpResponseOk<()>, HttpError> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0277]: the trait bound `fn() -> impl std::future::Future {<impl std::convert::From<bad_endpoint> for dropshot::ApiEndpoint>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _>` is not satisfied
+error[E0277]: the trait bound `fn() -> impl Future {<impl From<bad_endpoint> for ApiEndpoint>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _>` is not satisfied
   --> $DIR/bad_endpoint1.rs:11:10
    |
 11 | async fn bad_endpoint() -> Result<HttpResponseOk<()>, HttpError> {
-   |          ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _>` is not implemented for `fn() -> impl std::future::Future {<impl std::convert::From<bad_endpoint> for dropshot::ApiEndpoint>::from::bad_endpoint}`
+   |          ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _>` is not implemented for `fn() -> impl Future {<impl From<bad_endpoint> for ApiEndpoint>::from::bad_endpoint}`
    |
   ::: $WORKSPACE/dropshot/src/api_description.rs
    |
    |         HandlerType: HttpHandlerFunc<FuncParams, ResponseType>,
-   |                      ----------------------------------------- required by this bound in `dropshot::ApiEndpoint::new`
+   |                      ----------------------------------------- required by this bound in `ApiEndpoint::new`

dropshot/tests/fail/bad_endpoint3.stderr

@@ -1,25 +1,25 @@
-error[E0277]: the trait bound `std::string::String: dropshot::Extractor` is not satisfied
+error[E0277]: the trait bound `String: Extractor` is not satisfied
   --> $DIR/bad_endpoint3.rs:15:12
    |
 9  | / #[endpoint {
 10 | |     method = GET,
 11 | |     path = "/test",
 12 | | }]
-   | |__- required by this bound in `_::{{closure}}#0::need_extractor`
+   | |__- required by this bound in `need_extractor`
 ...
 15 |       param: String,
    |              ^^^^^^
    |              |
-   |              the trait `dropshot::Extractor` is not implemented for `std::string::String`
+   |              the trait `Extractor` is not implemented for `String`
    |              required by a bound in this
 
-error[E0277]: the trait bound `fn(std::sync::Arc<dropshot::RequestContext>, std::string::String) -> impl std::future::Future {<impl std::convert::From<bad_endpoint> for dropshot::ApiEndpoint>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _>` is not satisfied
+error[E0277]: the trait bound `fn(Arc<RequestContext>, String) -> impl Future {<impl From<bad_endpoint> for ApiEndpoint>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _>` is not satisfied
   --> $DIR/bad_endpoint3.rs:13:10
    |
 13 | async fn bad_endpoint(
-   |          ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _>` is not implemented for `fn(std::sync::Arc<dropshot::RequestContext>, std::string::String) -> impl std::future::Future {<impl std::convert::From<bad_endpoint> for dropshot::ApiEndpoint>::from::bad_endpoint}`
+   |          ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _>` is not implemented for `fn(Arc<RequestContext>, String) -> impl Future {<impl From<bad_endpoint> for ApiEndpoint>::from::bad_endpoint}`
    |
   ::: $WORKSPACE/dropshot/src/api_description.rs
    |
    |         HandlerType: HttpHandlerFunc<FuncParams, ResponseType>,
-   |                      ----------------------------------------- required by this bound in `dropshot::ApiEndpoint::new`
+   |                      ----------------------------------------- required by this bound in `ApiEndpoint::new`

dropshot/tests/fail/bad_endpoint6.stderr

@@ -32,18 +32,18 @@ error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied
 20 | | }]
    | |__^ the trait `serde::ser::Serialize` is not implemented for `Ret`
    |
-   = note: required by `dropshot::HttpResponseOk`
+   = note: required by `HttpResponseOk`
 
-error[E0277]: the trait bound `fn(std::sync::Arc<dropshot::RequestContext>) -> impl std::future::Future {<impl std::convert::From<bad_endpoint> for dropshot::ApiEndpoint>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _>` is not satisfied
+error[E0277]: the trait bound `fn(Arc<RequestContext>) -> impl Future {<impl From<bad_endpoint> for ApiEndpoint>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _>` is not satisfied
   --> $DIR/bad_endpoint6.rs:17:1
    |
 17 | / #[endpoint {
 18 | |     method = GET,
 19 | |     path = "/test",
 20 | | }]
-   | |__^ the trait `dropshot::handler::HttpHandlerFunc<_, _>` is not implemented for `fn(std::sync::Arc<dropshot::RequestContext>) -> impl std::future::Future {<impl std::convert::From<bad_endpoint> for dropshot::ApiEndpoint>::from::bad_endpoint}`
+   | |__^ the trait `dropshot::handler::HttpHandlerFunc<_, _>` is not implemented for `fn(Arc<RequestContext>) -> impl Future {<impl From<bad_endpoint> for ApiEndpoint>::from::bad_endpoint}`
    |
   ::: $WORKSPACE/dropshot/src/api_description.rs
    |
    |           HandlerType: HttpHandlerFunc<FuncParams, ResponseType>,
-   |                        ----------------------------------------- required by this bound in `dropshot::ApiEndpoint::new`
+   |                        ----------------------------------------- required by this bound in `ApiEndpoint::new`

dropshot/tests/fail/bad_endpoint7.stderr

@@ -8,7 +8,7 @@ error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied
 27 | |     }))
    | |_____^ the trait `serde::ser::Serialize` is not implemented for `Ret`
    |
-   = note: required by `dropshot::HttpResponseOk`
+   = note: required by `HttpResponseOk`
 
 error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied
     --> $DIR/bad_endpoint7.rs:24:8
@@ -23,7 +23,7 @@ error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied
     ::: $WORKSPACE/dropshot/src/handler.rs
      |
      |   pub struct HttpResponseOk<T: JsonSchema + Serialize + Send + Sync + 'static>(
-     |                                             --------- required by this bound in `dropshot::HttpResponseOk`
+     |                                             --------- required by this bound in `HttpResponseOk`
 
 error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied
     --> $DIR/bad_endpoint7.rs:24:5
@@ -37,7 +37,7 @@ error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied
     ::: $WORKSPACE/dropshot/src/handler.rs
      |
      |   pub struct HttpResponseOk<T: JsonSchema + Serialize + Send + Sync + 'static>(
-     |                                             --------- required by this bound in `dropshot::HttpResponseOk`
+     |                                             --------- required by this bound in `HttpResponseOk`
 
 error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied
     --> $DIR/bad_endpoint7.rs:23:45
@@ -54,15 +54,15 @@ error[E0277]: the trait bound `Ret: serde::ser::Serialize` is not satisfied
     ::: $WORKSPACE/dropshot/src/handler.rs
      |
      |   pub struct HttpResponseOk<T: JsonSchema + Serialize + Send + Sync + 'static>(
-     |                                             --------- required by this bound in `dropshot::HttpResponseOk`
+     |                                             --------- required by this bound in `HttpResponseOk`
 
-error[E0277]: the trait bound `fn(std::sync::Arc<dropshot::RequestContext>) -> impl std::future::Future {<impl std::convert::From<bad_endpoint> for dropshot::ApiEndpoint>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _>` is not satisfied
+error[E0277]: the trait bound `fn(Arc<RequestContext>) -> impl Future {<impl From<bad_endpoint> for ApiEndpoint>::from::bad_endpoint}: dropshot::handler::HttpHandlerFunc<_, _>` is not satisfied
   --> $DIR/bad_endpoint7.rs:21:10
    |
 21 | async fn bad_endpoint(
-   |          ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _>` is not implemented for `fn(std::sync::Arc<dropshot::RequestContext>) -> impl std::future::Future {<impl std::convert::From<bad_endpoint> for dropshot::ApiEndpoint>::from::bad_endpoint}`
+   |          ^^^^^^^^^^^^ the trait `dropshot::handler::HttpHandlerFunc<_, _>` is not implemented for `fn(Arc<RequestContext>) -> impl Future {<impl From<bad_endpoint> for ApiEndpoint>::from::bad_endpoint}`
    |
   ::: $WORKSPACE/dropshot/src/api_description.rs
    |
    |         HandlerType: HttpHandlerFunc<FuncParams, ResponseType>,
-   |                      ----------------------------------------- required by this bound in `dropshot::ApiEndpoint::new`
+   |                      ----------------------------------------- required by this bound in `ApiEndpoint::new`

dropshot/tests/test_config.rs

@@ -112,8 +112,10 @@ async fn test_config_bind_address() {
      * don't want to depend on too much from the ApiServer here -- but we
      * should have successfully made the request.)
      */
-    let config_text =
-        format!("bind_address = \"{}:{}\"\n", bind_ip_str, bind_port);
+    let config_text = format!(
+        "bind_address = \"{}:{}\"\nrequest_body_max_bytes = 1024",
+        bind_ip_str, bind_port
+    );
     let config =
         read_config::<ConfigDropshot>("bind_address", &config_text).unwrap();
     let mut server = make_server(&config, &log);
@@ -138,8 +140,11 @@ async fn test_config_bind_address() {
      * Start a server on another TCP port and make sure we can reach that
      * one (and NOT the one we just shut down).
      */
-    let config_text =
-        format!("bind_address = \"{}:{}\"\n", bind_ip_str, bind_port + 1,);
+    let config_text = format!(
+        "bind_address = \"{}:{}\"\nrequest_body_max_bytes = 1024",
+        bind_ip_str,
+        bind_port + 1,
+    );
     let config =
         read_config::<ConfigDropshot>("bind_address", &config_text).unwrap();
     let mut server = make_server(&config, &log);