summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErnest <ernestwisniewski2@gmail.com>2020-06-20 11:33:23 +0200
committerErnest <ernestwisniewski2@gmail.com>2020-06-20 11:33:23 +0200
commit4247df429591a83fb84bfab6f7850502e64858d8 (patch)
treec70bd6221b69b56e807c7e1ef456817c37661e58
parent7cb7c1f0f9a77c3019200edffa5381f8a4d76e55 (diff)
Community name validation
-rw-r--r--server/src/api/community.rs5
-rw-r--r--server/src/lib.rs18
2 files changed, 21 insertions, 2 deletions
diff --git a/server/src/api/community.rs b/server/src/api/community.rs
index df03546c..2a517bb8 100644
--- a/server/src/api/community.rs
+++ b/server/src/api/community.rs
@@ -1,4 +1,5 @@
use super::*;
+use crate::is_valid_community_name;
#[derive(Serialize, Deserialize)]
pub struct GetCommunity {
@@ -220,6 +221,10 @@ impl Perform for Oper<CreateCommunity> {
}
}
+ if !is_valid_community_name(&data.name) {
+ return Err(APIError::err("invalid_community_name").into());
+ }
+
let user_id = claims.id;
let conn = pool.get()?;
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 23d6a87a..e3ce5d71 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -273,11 +273,15 @@ pub fn is_valid_username(name: &str) -> bool {
VALID_USERNAME_REGEX.is_match(name)
}
+pub fn is_valid_community_name(name: &str) -> bool {
+ VALID_COMMUNITY_NAME_REGEX.is_match(name)
+}
+
#[cfg(test)]
mod tests {
use crate::{
- extract_usernames, is_email_regex, is_image_content_type, is_valid_username, remove_slurs,
- slur_check, slurs_vec_to_str,
+ extract_usernames, is_email_regex, is_image_content_type, is_valid_community_name,
+ is_valid_username, remove_slurs, slur_check, slurs_vec_to_str,
};
#[test]
@@ -305,6 +309,15 @@ mod tests {
}
#[test]
+ fn test_valid_community_name() {
+ assert!(is_valid_community_name("example"));
+ assert!(is_valid_community_name("example_community"));
+ assert!(!is_valid_community_name("Example"));
+ assert!(!is_valid_community_name("Ex"));
+ assert!(!is_valid_community_name(""));
+ }
+
+ #[test]
fn test_slur_filter() {
let test =
"coons test dindu ladyboy tranny retardeds. Capitalized Niggerz. This is a bunch of other safe text.";
@@ -366,4 +379,5 @@ lazy_static! {
static ref SLUR_REGEX: Regex = RegexBuilder::new(r"(fag(g|got|tard)?|maricos?|cock\s?sucker(s|ing)?|nig(\b|g?(a|er)?(s|z)?)\b|dindu(s?)|mudslime?s?|kikes?|mongoloids?|towel\s*heads?|\bspi(c|k)s?\b|\bchinks?|niglets?|beaners?|\bnips?\b|\bcoons?\b|jungle\s*bunn(y|ies?)|jigg?aboo?s?|\bpakis?\b|rag\s*heads?|gooks?|cunts?|bitch(es|ing|y)?|puss(y|ies?)|twats?|feminazis?|whor(es?|ing)|\bslut(s|t?y)?|\btrann?(y|ies?)|ladyboy(s?)|\b(b|re|r)tard(ed)?s?)").case_insensitive(true).build().unwrap();
static ref USERNAME_MATCHES_REGEX: Regex = Regex::new(r"/u/[a-zA-Z][0-9a-zA-Z_]*").unwrap();
static ref VALID_USERNAME_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9_]{3,20}$").unwrap();
+ static ref VALID_COMMUNITY_NAME_REGEX: Regex = Regex::new(r"^[a-z0-9_]{3,20}$").unwrap();
}