jjkiers/layer4-proxy
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 3 Activity

Move ProxyToUpstream parsing to TryFrom trait

Browse Source 
This seems cleaner to me than parsing it externally.

Signed-off-by: Jacob Kiers <code@kiers.eu>
This commit is contained in:
Jacob Kiers 2023-10-04 23:08:07 +02:00
parent 23296c6436
commit 8404f38182
1 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/config.rs
View File

@ -56,7 +56,6 @@ impl Clone for Addr {
#[derive(Debug, Clone, Deserialize, Default)] #[derive(Debug, Clone, Deserialize, Default)]
pub struct ProxyToUpstream { pub struct ProxyToUpstream {
pub name: String,
pub addr: String, pub addr: String,
pub protocol: String, pub protocol: String,
#[serde(skip_deserializing)] #[serde(skip_deserializing)]
@ -70,46 +69,10 @@ impl ProxyToUpstream {
} }
} }
#[derive(Debug)] impl TryFrom<&str> for ProxyToUpstream {
pub enum ConfigError { type Error = ConfigError;
IO(IOError),
Yaml(serde_yaml::Error),
Custom(String),
}
impl Config { fn try_from(upstream: &str) -> Result<Self, Self::Error> {
pub fn new(path: &str) -> Result<Config, ConfigError> {
let base = (load_config(path))?;
Ok(Config { base })
}
}
fn load_config(path: &str) -> Result<ParsedConfig, ConfigError> {
let mut contents = String::new();
let mut file = (File::open(path))?;
(file.read_to_string(&mut contents))?;
let base: BaseConfig = serde_yaml::from_str(&contents)?;
if base.version != 1 {
return Err(ConfigError::Custom(
"Unsupported config version".to_string(),
));
}
let log_level = base.log.clone().unwrap_or_else(|| "info".to_string());
if !log_level.eq("disable") {
std::env::set_var("FOURTH_LOG", log_level.clone());
pretty_env_logger::init_custom_env("FOURTH_LOG");
debug!("Set log level to {}", log_level);
}
debug!("Config version {}", base.version);
let mut parsed_upstream: HashMap<String, Upstream> = HashMap::new();
for (name, upstream) in base.upstream.iter() {
let upstream_url = match Url::parse(upstream) { let upstream_url = match Url::parse(upstream) {
Ok(url) => url, Ok(url) => url,
Err(_) => { Err(_) => {
@ -151,21 +114,61 @@ fn load_config(path: &str) -> Result<ParsedConfig, ConfigError> {
} }
let addr = UpstreamAddress::new(format!("{}:{}", upstream_host, upstream_port)); let addr = UpstreamAddress::new(format!("{}:{}", upstream_host, upstream_port));
parsed_upstream.insert( Ok(ProxyToUpstream {
name.to_string(), addr: format!("{}:{}", upstream_host, upstream_port),
Upstream::Proxy(ProxyToUpstream { protocol: upstream_url.scheme().to_string(),
name: name.to_string(), addresses: Addr(Mutex::new(addr)),
addr: format!("{}:{}", upstream_host, upstream_port), })
protocol: upstream_url.scheme().to_string(), }
addresses: Addr(Mutex::new(addr)), }
}),
); #[derive(Debug)]
pub enum ConfigError {
IO(IOError),
Yaml(serde_yaml::Error),
Custom(String),
}
impl Config {
pub fn new(path: &str) -> Result<Config, ConfigError> {
let base = load_config(path)?;
Ok(Config { base })
}
}
fn load_config(path: &str) -> Result<ParsedConfig, ConfigError> {
let mut contents = String::new();
let mut file = File::open(path)?;
file.read_to_string(&mut contents)?;
let base: BaseConfig = serde_yaml::from_str(&contents)?;
if base.version != 1 {
return Err(ConfigError::Custom(
"Unsupported config version".to_string(),
));
} }
parsed_upstream.insert("ban".to_string(), Upstream::Ban); let log_level = base.log.clone().unwrap_or_else(|| "info".to_string());
if !log_level.eq("disable") {
std::env::set_var("FOURTH_LOG", log_level.clone());
pretty_env_logger::init_custom_env("FOURTH_LOG");
debug!("Set log level to {}", log_level);
}
debug!("Config version {}", base.version);
let mut parsed_upstream: HashMap<String, Upstream> = HashMap::new();
parsed_upstream.insert("ban".to_string(), Upstream::Ban);
parsed_upstream.insert("echo".to_string(), Upstream::Echo); parsed_upstream.insert("echo".to_string(), Upstream::Echo);
for (name, upstream) in base.upstream.iter() {
let ups = ProxyToUpstream::try_from(upstream.as_str())?;
parsed_upstream.insert(name.to_string(), Upstream::Proxy(ups));
}
let parsed = ParsedConfig { let parsed = ParsedConfig {
version: base.version, version: base.version,
log: base.log, log: base.log,