diff --git a/easytier/src/common/config.rs b/easytier/src/common/config.rs index d8bfdcf1..223649f7 100644 --- a/easytier/src/common/config.rs +++ b/easytier/src/common/config.rs @@ -13,6 +13,8 @@ use serde::{Deserialize, Serialize}; use strum::{Display, EnumString, VariantArray}; use tokio::io::AsyncReadExt as _; +use super::env_parser; +use crate::utils::dns::sanitize; use crate::{ common::stun::StunInfoCollector, proto::{ @@ -22,8 +24,6 @@ use crate::{ tunnel::generate_digest_from_str, }; -use super::env_parser; - pub type Flags = crate::proto::common::FlagsInConfig; pub fn gen_default_flags() -> Flags { @@ -575,13 +575,8 @@ impl ConfigLoader for TomlConfigLoader { .lock() .unwrap() .hostname - .clone() - .map(|h| { - h.chars() - .filter(|c| !c.is_control()) - .take(32) - .collect::() - }) + .as_ref() + .map(sanitize) .filter(|h| !h.is_empty()); self.set_hostname(hostname.clone());