pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 19:11:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not filter word www in is_node_name_valid check (#14575)

Browse Source
This commit is contained in:
Aten Jin
2023-07-14 18:07:07 +08:00
committed by GitHub
parent 6a29a70a92
commit d908e9bebe
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/cli/src/commands/run_cmd.rs
+7 -1
View File
@@ -404,7 +404,7 @@ pub fn is_node_name_valid(_name: &str) -> std::result::Result<(), &str> {
return Err("Node name should not contain invalid chars such as '.' and '@'") return Err("Node name should not contain invalid chars such as '.' and '@'")
} }
let invalid_patterns = r"(https?:\\/+)?(www)+"; let invalid_patterns = r"^https?:\/\/";
let re = Regex::new(invalid_patterns).unwrap(); let re = Regex::new(invalid_patterns).unwrap();
if re.is_match(&name) { if re.is_match(&name) {
return Err("Node name should not contain urls") return Err("Node name should not contain urls")
@@ -490,6 +490,10 @@ mod tests {
#[test] #[test]
fn tests_node_name_good() { fn tests_node_name_good() {
assert!(is_node_name_valid("short name").is_ok()); assert!(is_node_name_valid("short name").is_ok());
assert!(is_node_name_valid("www").is_ok());
assert!(is_node_name_valid("aawww").is_ok());
assert!(is_node_name_valid("wwwaa").is_ok());
assert!(is_node_name_valid("www aa").is_ok());
} }
#[test] #[test]
@@ -502,6 +506,8 @@ mod tests {
assert!(is_node_name_valid("http://visit.me").is_err()); assert!(is_node_name_valid("http://visit.me").is_err());
assert!(is_node_name_valid("https://visit.me").is_err()); assert!(is_node_name_valid("https://visit.me").is_err());
assert!(is_node_name_valid("www.visit.me").is_err()); assert!(is_node_name_valid("www.visit.me").is_err());
assert!(is_node_name_valid("www.visit").is_err());
assert!(is_node_name_valid("visit.www").is_err());
assert!(is_node_name_valid("email@domain").is_err()); assert!(is_node_name_valid("email@domain").is_err());
} }
} }