using valdator to check for reserved names

This commit is contained in:
QuantumEntangledAndy committed 2020-07-13 10:11:58 +07:00
1 parent 4b53e426cf
commit 143390d6f4
2 files changed
+10 -9

No files matched your search

+10 -2
View File
@@ -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<String>,
@@ -111,3 +111,11 @@ fn default_permitted_users() -> Vec<String> {
fn default_users() -> Vec<UserConfig> {
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(())
}
-7
View File
@@ -153,14 +153,7 @@ fn set_up_tls(config: &Config, rtsp: &RtspServer) {
fn set_up_users(users: &Vec<UserConfig>, 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) {