fixup! feat: add request body size configuration

abort startup if request size > maximum

Author: enigbe

rust/server/src/main.rs

@@ -37,6 +37,16 @@ fn main() {
 			eprintln!("Failed to load configuration: {}", e);
 			std::process::exit(-1);
 		});
+	let vss_service_config = match &config.maximum_request_body_size {
+		Some(size) => match VssServiceConfig::new(*size) {
+			Ok(config) => Arc::new(config),
+			Err(e) => {
+				eprintln!("Configuration validation error: {}", e);
+				return;
+			},
+		},
+		None => Arc::new(VssServiceConfig::default()),
+	};
 
 	let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
 		Ok(runtime) => Arc::new(runtime),
@@ -132,10 +142,7 @@ fn main() {
 					match res {
 						Ok((stream, _)) => {
 							let io_stream = TokioIo::new(stream);
-							let vss_service_config = if let Some(req_body_size) = &config.maximum_request_body_size {
-								VssServiceConfig::new(*req_body_size)
-							} else {VssServiceConfig::default()};
-							let vss_service = VssService::new(Arc::clone(&store), Arc::clone(&authorizer), vss_service_config);
+							let vss_service = VssService::new(Arc::clone(&store), Arc::clone(&authorizer), Arc::clone(&vss_service_config));
 							runtime.spawn(async move {
 								if let Err(err) = http1::Builder::new().serve_connection(io_stream, vss_service).await {
 									eprintln!("Failed to serve connection: {}", err);

rust/server/src/vss_service.rs

@@ -26,8 +26,15 @@ pub(crate) struct VssServiceConfig {
 }
 
 impl VssServiceConfig {
-	pub fn new(maximum_request_body_size: usize) -> Self {
-		Self { maximum_request_body_size: maximum_request_body_size.min(MAXIMUM_REQUEST_BODY_SIZE) }
+	pub fn new(maximum_request_body_size: usize) -> Result<Self, String> {
+		if maximum_request_body_size > MAXIMUM_REQUEST_BODY_SIZE {
+			return Err(format!(
+				"Request body size {} exceeds maximum {}",
+				maximum_request_body_size, MAXIMUM_REQUEST_BODY_SIZE
+			));
+		}
+
+		Ok(Self { maximum_request_body_size })
 	}
 }
 
@@ -41,12 +48,12 @@ impl Default for VssServiceConfig {
 pub struct VssService {
 	store: Arc<dyn KvStore>,
 	authorizer: Arc<dyn Authorizer>,
-	config: VssServiceConfig,
+	config: Arc<VssServiceConfig>,
 }
 
 impl VssService {
 	pub(crate) fn new(
-		store: Arc<dyn KvStore>, authorizer: Arc<dyn Authorizer>, config: VssServiceConfig,
+		store: Arc<dyn KvStore>, authorizer: Arc<dyn Authorizer>, config: Arc<VssServiceConfig>,
 	) -> Self {
 		Self { store, authorizer, config }
 	}