diff --git a/src/config_manager.rs b/src/config_manager.rs index b4f6a8d..685fae9 100644 --- a/src/config_manager.rs +++ b/src/config_manager.rs @@ -178,7 +178,6 @@ fn read_file_to_config(path: &str) -> Result { if conf.config_version != 1 { return Err(ConfigError::UnsupportedVersionError); } - conf.validate()?; Ok(conf) } diff --git a/src/validation/mod.rs b/src/validation/mod.rs index 7560e0a..f711c4a 100644 --- a/src/validation/mod.rs +++ b/src/validation/mod.rs @@ -3,16 +3,14 @@ use { regex::Regex, }; -const REGEX_NAME: &str = r"^[a-zA-Z0-9._/-]*$"; - pub fn validate_name(value: &str, _: &Config) -> garde::Result { if value.len() > 32 { return Err(garde::Error::new("name is longer than 32")); } - static RE: Lazy = Lazy::new(|| Regex::new(REGEX_NAME).unwrap()); + static RE: Lazy = Lazy::new(|| Regex::new(r"/^[0-9A-Za-z_-]*$/g").unwrap()); if !RE.is_match(value) { - return Err(garde::Error::new("name must only contain a-zA-Z0-9._/-")); + return Err(garde::Error::new("name must only contain 0-9A-Za-z_-")); } Ok(()) }