fix group name verification

mozilla-iam · Mar 9, 2020 · 5a2bf5c · 5a2bf5c
1 parent d36dce3
commit 5a2bf5c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/ci/install_deps.sh b/ci/install_deps.sh
@@ -1,7 +1,7 @@
 export RUSTUP_HOME=/usr/local/rustup
 export CARGO_HOME=/usr/local/cargo
 export PATH=/usr/local/cargo/bin:$PATH
-export RUST_VERSION=1.40.0
+export RUST_VERSION=1.41.1
 
 set -eux
 

diff --git a/src/api/error.rs b/src/api/error.rs
@@ -11,11 +11,11 @@ use std::fmt::Display;
 
 #[derive(Fail, Debug)]
 pub enum ApiError {
-    #[fail(display = "A mulipart error occured.")]
+    #[fail(display = "A multipart error occurred.")]
     MultipartError,
     #[fail(display = "Bad API request.")]
     GenericBadRequest(failure::Error),
-    #[fail(display = "Group names must ony containe alphanumeric charactars, -, and _")]
+    #[fail(display = "Group names must ony contain lowercase alphanumeric characters, -, and _")]
     InvalidGroupName,
     #[fail(display = "Operation Error: {}", _0)]
     PacksError(PacksError),

diff --git a/src/rules/functions.rs b/src/rules/functions.rs
@@ -3,7 +3,6 @@ use crate::db::types::*;
 use crate::rules::error::RuleError;
 use crate::rules::RuleContext;
 use crate::utils::valid_group_name;
-use diesel::result::Error as DieselError;
 use dino_park_trust::GroupsTrust;
 use dino_park_trust::Trust;
 

diff --git a/src/utils.rs b/src/utils.rs
@@ -11,7 +11,7 @@ pub fn to_expiration_ts(days: i32) -> NaiveDateTime {
 pub fn valid_group_name(group_name: &str) -> bool {
     group_name
         .chars()
-        .all(|c| c.is_ascii_alphanumeric() && c.is_lowercase() || c == '-' || c == '_')
+        .all(|c| (c.is_ascii_lowercase() || c.is_ascii_digit()) || c == '-' || c == '_')
 }
 
 pub fn maybe_to_utc<S>(naive: &Option<NaiveDateTime>, serializer: S) -> Result<S::Ok, S::Error>
@@ -38,6 +38,13 @@ mod test {
     use failure::Error;
     use serde_json;
 
+    #[test]
+    fn test_group_names() {
+        assert!(valid_group_name("group-test-1"));
+        assert!(!valid_group_name("group-Test-1"));
+        assert!(!valid_group_name("group-Test.1"));
+    }
+
     #[test]
     fn test_to_utc() -> Result<(), Error> {
         #[derive(Serialize)]