fixup! fixup! feat: add request body size configuration

- exit process instead of return
- make maximum request body size (mrbs) config optional
- remove heap allocation of mrbs
- improve error message if mrbs exceeds maximum

Author: enigbe

rust/server/src/main.rs

@@ -39,13 +39,13 @@ fn main() {
 		});
 	let vss_service_config = match &config.maximum_request_body_size {
 		Some(size) => match VssServiceConfig::new(*size) {
-			Ok(config) => Arc::new(config),
+			Ok(config) => config,
 			Err(e) => {
 				eprintln!("Configuration validation error: {}", e);
-				return;
+				std::process::exit(-1);
 			},
 		},
-		None => Arc::new(VssServiceConfig::default()),
+		None => VssServiceConfig::default(),
 	};
 
 	let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
@@ -142,7 +142,7 @@ fn main() {
 					match res {
 						Ok((stream, _)) => {
 							let io_stream = TokioIo::new(stream);
-							let vss_service = VssService::new(Arc::clone(&store), Arc::clone(&authorizer), Arc::clone(&vss_service_config));
+							let vss_service = VssService::new(Arc::clone(&store), Arc::clone(&authorizer), vss_service_config.clone());
 							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/util/config.rs

@@ -119,7 +119,8 @@ pub(crate) fn load_configuration(config_file_path: Option<&str>) -> Result<Confi
 		max_request_body_size_config,
 		"VSS server maximum request body size",
 		MAX_REQUEST_BODY_SIZE,
-	)?;
+	)
+	.ok();
 
 	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));
@@ -179,7 +180,7 @@ pub(crate) fn load_configuration(config_file_path: Option<&str>) -> Result<Confi
 
 	Ok(Configuration {
 		bind_address,
-		maximum_request_body_size: Some(maximum_request_body_size),
+		maximum_request_body_size,
 		rsa_pem,
 		postgresql_prefix,
 		default_db,

rust/server/src/vss_service.rs

@@ -29,7 +29,7 @@ impl VssServiceConfig {
 	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 {} exceeds maximum {}",
 				maximum_request_body_size, MAXIMUM_REQUEST_BODY_SIZE
 			));
 		}
@@ -48,12 +48,12 @@ impl Default for VssServiceConfig {
 pub struct VssService {
 	store: Arc<dyn KvStore>,
 	authorizer: Arc<dyn Authorizer>,
-	config: Arc<VssServiceConfig>,
+	config: VssServiceConfig,
 }
 
 impl VssService {
 	pub(crate) fn new(
-		store: Arc<dyn KvStore>, authorizer: Arc<dyn Authorizer>, config: Arc<VssServiceConfig>,
+		store: Arc<dyn KvStore>, authorizer: Arc<dyn Authorizer>, config: VssServiceConfig,
 	) -> Self {
 		Self { store, authorizer, config }
 	}

rust/server/vss-server-config.toml

@@ -1,6 +1,8 @@
 [server_config]
 bind_address = "127.0.0.1:8080" # Optional in TOML, can be overridden by env var `VSS_BIND_ADDRESS`
-maximum_request_body_size = 1073741824    # Optional in TOML:  maximum request body size in bytes capped at 1 GB, can be overriden by env var 'VSS_MAX_REQUEST_BODY_SIZE'
+# Maximum request body size in bytes. Can be set here or be overridden by env var 'VSS_MAX_REQUEST_BODY_SIZE'
+# Defaults to 1 GB if unset.
+# maximum_request_body_size = 1073741824                                     
 
 # Uncomment the table below to verify JWT tokens in the HTTP Authorization header against the given RSA public key,
 # can be overridden by env var `VSS_JWT_RSA_PEM`