diff --git a/src/config.rs b/src/config.rs index ba1626d..80bea06 100644 --- a/src/config.rs +++ b/src/config.rs @@ -4,7 +4,7 @@ use serde::Deserialize; use std::clone::Clone; use std::net::SocketAddr; use std::time::Duration; -use validator::Validate; +use validator::{Validate, ValidationError}; use validator_derive::Validate; lazy_static! { @@ -71,7 +71,7 @@ pub struct CameraConfig { #[derive(Debug, Deserialize, Validate, Clone)] pub struct UserConfig { - #[validate(required)] + #[validate(required, custom = "validate_username")] #[serde(alias = "username")] pub name: Option, @@ -111,3 +111,11 @@ fn default_permitted_users() -> Vec { fn default_users() -> Vec { vec![] } + +fn validate_username(name: &str) -> Result<(), ValidationError> { + let reserved_names = vec!("anyone", "anonymous"); + if reserved_names.contains(&name) { + return Err(ValidationError::new("This is a reserved username")); + } + Ok(()) +} diff --git a/src/main.rs b/src/main.rs index c26c4b0..3f5151b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -153,14 +153,7 @@ fn set_up_tls(config: &Config, rtsp: &RtspServer) { fn set_up_users(users: &Vec, rtsp: &RtspServer) { // Setting up users let mut credentials = vec![]; - let reserved_names = vec!(String::from("anyone"), String::from("anonymous")); for user in users { - if let Some(name) = &user.name { - if reserved_names.contains(name) { - warn!("{} is a reserved username, skipping this user", name); - continue; - } - } let name = &user.name; let pass = &user.pass; let user_pass = match (name, pass) {