Optionally configure bind address via env var

This allows users to configure VSS-Server entirely through environment
variables, without a configuration file. We hence remove the requirement
that a path to a configuration file always be passed as an argument.

Author: tankyleo

rust/server/src/main.rs

@@ -28,15 +28,12 @@ mod vss_service;
 
 fn main() {
 	let args: Vec<String> = std::env::args().collect();
-	if args.len() != 2 {
-		eprintln!("Usage: {} <config-file-path>", args[0]);
-		std::process::exit(1);
-	}
 
-	let config = util::config::load_configuration(&args[1]).unwrap_or_else(|e| {
-		eprintln!("Failed to load configuration: {}", e);
-		std::process::exit(-1);
-	});
+	let config =
+		util::config::load_configuration(args.get(1).map(|s| s.as_str())).unwrap_or_else(|e| {
+			eprintln!("Failed to load configuration: {}", e);
+			std::process::exit(-1);
+		});
 
 	let runtime = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
 		Ok(runtime) => Arc::new(runtime),

rust/server/src/util/config.rs

@@ -1,6 +1,7 @@
 use serde::Deserialize;
 use std::net::SocketAddr;
 
+const BIND_ADDR_VAR: &str = "VSS_BIND_ADDRESS";
 const JWT_RSA_PEM_VAR: &str = "VSS_JWT_RSA_PEM";
 const PSQL_USER_VAR: &str = "VSS_PSQL_USERNAME";
 const PSQL_PASS_VAR: &str = "VSS_PSQL_PASSWORD";
@@ -10,16 +11,16 @@ const PSQL_VSS_DB_VAR: &str = "VSS_PSQL_VSS_DB";
 const PSQL_TLS_VAR: &str = "VSS_PSQL_TLS";
 const PSQL_CERT_PEM_VAR: &str = "VSS_PSQL_CRT_PEM";
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Default)]
 struct Config {
-	server_config: ServerConfig,
+	server_config: Option<ServerConfig>,
 	jwt_auth_config: Option<JwtAuthConfig>,
 	postgresql_config: Option<PostgreSQLConfig>,
 }
 
 #[derive(Deserialize)]
 struct ServerConfig {
-	bind_address: SocketAddr,
+	bind_address: Option<SocketAddr>,
 }
 
 #[derive(Deserialize)]
@@ -51,12 +52,19 @@ pub(crate) struct Configuration {
 	pub(crate) tls_config: Option<Option<String>>,
 }
 
-pub(crate) fn load_configuration(config_file_path: &str) -> Result<Configuration, String> {
-	let config_file = std::fs::read_to_string(config_file_path)
-		.map_err(|e| format!("Failed to read configuration file: {}", e))?;
-	let Config { server_config: ServerConfig { bind_address }, jwt_auth_config, postgresql_config } =
+pub(crate) fn load_configuration(config_file_path: Option<&str>) -> Result<Configuration, String> {
+	let Config { server_config, jwt_auth_config, postgresql_config } = if config_file_path.is_some()
+		&& std::fs::exists(config_file_path.expect("config file path is some"))
+			.map_err(|e| format!("Failed to check presence of configuration file: {}", e))?
+	{
+		let config_file =
+			std::fs::read_to_string(config_file_path.expect("config file path is some"))
+				.map_err(|e| format!("Failed to read configuration file: {}", e))?;
 		toml::from_str(&config_file)
-			.map_err(|e| format!("Failed to parse configuration file: {}", e))?;
+			.map_err(|e| format!("Failed to parse configuration file: {}", e))?
+	} else {
+		Config::default() // All fields are set to `None`
+	};
 
 	macro_rules! read_env {
 		($env_var:expr) => {
@@ -82,6 +90,20 @@ pub(crate) fn load_configuration(config_file_path: &str) -> Result<Configuration
 		};
 	}
 
+	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 = read_config!(
+		bind_address_env,
+		server_config.and_then(|c| c.bind_address),
+		"VSS server bind address",
+		BIND_ADDR_VAR
+	);
+
 	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/vss-server-config.toml

@@ -1,5 +1,5 @@
 [server_config]
-bind_address = "127.0.0.1:8080"
+bind_address = "127.0.0.1:8080" # Optional in TOML, can be overridden by env var `VSS_BIND_ADDRESS`
 
 # 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`