fixup! Add configurable request body size with 1GB hard limit

Addresses the following:
- read bind address correctly,
- add appropriate unwrap documentation,
- drop ref to mrbs because usize impls clone,
- clone large object, and
- assert_eq(Byte, Vec<u8>): because Bytes impls PartialEq
  with Vec<u8>, we can compare them directly.

Author: enigbe

rust/impls/src/postgres_store.rs

@@ -829,7 +829,7 @@ mod tests {
 
 		// Construct entry that's for a field that's the maximum size of a non-"large_object" object
 		let large_value = vec![0u8; MAXIMUM_SUPPORTED_VALUE_SIZE - PROTOCOL_OVERHEAD_MARGIN];
-		let kv = KeyValue { key: "k1".into(), version: 0, value: Bytes::from(large_value) };
+		let kv = KeyValue { key: "k1".into(), version: 0, value: Bytes::from(large_value.clone()) };
 
 		{
 			let store =
@@ -868,7 +868,7 @@ mod tests {
 				resp_kv.value.len(),
 				MAXIMUM_SUPPORTED_VALUE_SIZE - PROTOCOL_OVERHEAD_MARGIN
 			);
-			assert!(resp_kv.value.iter().all(|&b| b == 0));
+			assert_eq!(resp_kv.value, large_value);
 
 			store
 				.delete(

rust/server/src/main.rs

@@ -42,8 +42,8 @@ fn main() {
 			eprintln!("Failed to load configuration: {}", e);
 			std::process::exit(-1);
 		});
-	let vss_service_config = match &config.max_request_body_size {
-		Some(size) => match VssServiceConfig::new(*size) {
+	let vss_service_config = match config.max_request_body_size {
+		Some(size) => match VssServiceConfig::new(size) {
 			Ok(config) => config,
 			Err(e) => {
 				eprintln!("Configuration validation error: {}", e);

rust/server/src/util/config.rs

@@ -106,20 +106,23 @@ pub(crate) fn load_configuration(config_file_path: Option<&str>) -> Result<Confi
 		None => (None, None),
 	};
 
-	let bind_address_env = read_env(BIND_ADDR_VAR)?
-		.map(|addr| {
-			addr.parse().map_err(|e| {
-				format!("Unable to parse the bind address environment variable: {}", e)
-			})
-		})
-		.transpose()?;
+	let bind_address_env = read_env(BIND_ADDR_VAR)?;
 	let bind_address = read_config(
 		bind_address_env,
 		bind_address_config,
 		"VSS server bind address",
 		BIND_ADDR_VAR,
 	)?;
 
+	let max_request_body_size_env = read_env(MAX_REQUEST_BODY_SIZE_VAR)?
+		.map(|mrbs| {
+			mrbs.parse::<usize>().map_err(|e| {
+				format!("Unable to parse the maximum request body size environment variable: {}", e)
+			})
+		})
+		.transpose()?;
+	let max_request_body_size = max_request_body_size_env.or(max_request_body_size_config);
+
 	let log_level_env: Option<LevelFilter> = read_env(LOG_LEVEL_VAR)?
 		.map(|level_str| {
 			level_str
@@ -148,15 +151,6 @@ pub(crate) fn load_configuration(config_file_path: Option<&str>) -> Result<Confi
 	let log_file_config: Option<PathBuf> = log_config.and_then(|config| config.file);
 	let log_file = log_file_env.or(log_file_config).unwrap_or(PathBuf::from("vss.log"));
 
-	let max_request_body_size_env = read_env(MAX_REQUEST_BODY_SIZE_VAR)?
-		.map(|mrbs| {
-			mrbs.parse::<usize>().map_err(|e| {
-				format!("Unable to parse the maximum request body size environment variable: {}", e)
-			})
-		})
-		.transpose()?;
-	let max_request_body_size = max_request_body_size_env.or(max_request_body_size_config);
-
 	let rsa_pem_env = read_env(JWT_RSA_PEM_VAR)?;
 	let rsa_pem = rsa_pem_env.or(jwt_auth_config.and_then(|config| config.rsa_pem));
 

rust/server/src/vss_service.rs

@@ -221,6 +221,7 @@ async fn handle_request<
 			return Ok(Response::builder()
 				.status(StatusCode::PAYLOAD_TOO_LARGE)
 				.body(Full::new(Bytes::from("Request body too large")))
+				// unwrap safety: body only errors when previous chained calls failed.
 				.unwrap());
 		},
 	};