From ae3b7029a971e94658c46952ed87c3c14b3dd666 Mon Sep 17 00:00:00 2001 From: Trinity Pointard Date: Thu, 18 Mar 2021 03:12:27 +0100 Subject: [PATCH] add support for using domain name in configuration --- src/util/config.rs | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/util/config.rs b/src/util/config.rs index cd65e009..fe6ab979 100644 --- a/src/util/config.rs +++ b/src/util/config.rs @@ -1,8 +1,9 @@ +use std::fmt; use std::io::Read; use std::net::SocketAddr; use std::path::PathBuf; -use serde::Deserialize; +use serde::{de, Deserialize}; use crate::error::Error; @@ -11,8 +12,10 @@ pub struct Config { pub metadata_dir: PathBuf, pub data_dir: PathBuf, + #[serde(deserialize_with = "deserialize_addr")] pub rpc_bind_addr: SocketAddr, + #[serde(deserialize_with = "deserialize_vec_addr")] pub bootstrap_peers: Vec, pub consul_host: Option, pub consul_service_name: Option, @@ -48,12 +51,14 @@ pub struct TlsConfig { #[derive(Deserialize, Debug, Clone)] pub struct ApiConfig { + #[serde(deserialize_with = "deserialize_addr")] pub api_bind_addr: SocketAddr, pub s3_region: String, } #[derive(Deserialize, Debug, Clone)] pub struct WebConfig { + #[serde(deserialize_with = "deserialize_addr")] pub bind_addr: SocketAddr, pub root_domain: String, pub index: String, @@ -82,3 +87,49 @@ pub fn read_config(config_file: PathBuf) -> Result { Ok(toml::from_str(&config)?) } + +fn deserialize_addr<'de, D>(deserializer: D) -> Result +where + D: de::Deserializer<'de>, +{ + struct AddrVisitor; + + impl<'de> de::Visitor<'de> for AddrVisitor { + type Value = SocketAddr; + + fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { + formatter.write_str("a string representing a socket address") + } + + fn visit_str(self, s: &str) -> Result + where + E: de::Error, + { + use std::net::ToSocketAddrs; + s.to_socket_addrs() + .map_err(|_| de::Error::custom("could not resolve to a socket address"))? + .next() + .ok_or(de::Error::custom("could not resolve to a socket address")) + } + } + + deserializer.deserialize_any(AddrVisitor) +} + +fn deserialize_vec_addr<'de, D>(deserializer: D) -> Result, D::Error> +where + D: de::Deserializer<'de>, +{ + use std::net::ToSocketAddrs; + + let mut res = vec![]; + for s in >::deserialize(deserializer)? { + res.push( + s.to_socket_addrs() + .map_err(|_| de::Error::custom("could not resolve to a socket address"))? + .next() + .ok_or(de::Error::custom("could not resolve to a socket address"))?, + ); + } + Ok(res) +}