matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix: Do not check via regex

Browse source 
We do not need to check via regex here, because the previous checks are
already more restrictive than the regex itself.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-08-25 12:15:41 +02:00
parent f4fa8b71dd
commit f4c27710d8
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/entry/libimagentrytag/src/tag.rs
View file

@ -19,7 +19,6 @@
use std::result::Result; use std::result::Result;
use regex::Regex;
use failure::Error; use failure::Error;
pub type Tag = String; pub type Tag = String;
@ -37,9 +36,8 @@ pub fn is_tag_str(s: &String) -> Result<(), Error> {
let is_lower = |s: &String| s.chars().all(|c| c.is_lowercase()); let is_lower = |s: &String| s.chars().all(|c| c.is_lowercase());
let no_whitespace = |s: &String| s.chars().all(|c| !c.is_whitespace()); let no_whitespace = |s: &String| s.chars().all(|c| !c.is_whitespace());
let is_alphanum = |s: &String| s.chars().all(|c| c.is_alphanumeric()); let is_alphanum = |s: &String| s.chars().all(|c| c.is_alphanumeric());
let matches_regex = |s: &String| Regex::new("^[a-zA-Z]([a-zA-Z0-9_-]*)$").unwrap().captures(s).is_some();
if is_lower.and(no_whitespace).and(is_alphanum).and(matches_regex).filter(s) { if is_lower.and(no_whitespace).and(is_alphanum).filter(s) {
Ok(()) Ok(())
} else { } else {
Err(format_err!("The string '{}' is not a valid tag", s)) Err(format_err!("The string '{}' is not a valid tag", s))