mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stricter name rules (#1094)

Browse source
This commit is contained in:
Firstyear 2022-10-06 11:38:43 +10:00 committed by GitHub
parent 88eb33e1d4
commit 47ef3697c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
kanidmd/lib/src/value.rs
View file

@ -10,6 +10,7 @@ use std::str::FromStr;
use std::time::Duration; use std::time::Duration;
use compact_jwt::JwsSigner; use compact_jwt::JwsSigner;
use hashbrown::HashSet;
use kanidm_proto::v1::Filter as ProtoFilter; use kanidm_proto::v1::Filter as ProtoFilter;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -29,15 +30,24 @@ lazy_static! {
#[allow(clippy::expect_used)] #[allow(clippy::expect_used)]
Regex::new("(?P<name>[^@]+)@(?P<realm>[^@]+)").expect("Invalid SPN regex found") Regex::new("(?P<name>[^@]+)@(?P<realm>[^@]+)").expect("Invalid SPN regex found")
}; };
pub static ref DISALLOWED_NAMES: HashSet<&'static str> = {
let mut m = HashSet::with_capacity(10);
m.insert("root");
m.insert("nobody");
m.insert("nogroup");
m.insert("wheel");
m.insert("sshd");
m.insert("shadow");
m.insert("systemd");
m.insert("mail");
m.insert("man");
m.insert("administrator");
m
};
pub static ref INAME_RE: Regex = { pub static ref INAME_RE: Regex = {
#[allow(clippy::expect_used)] #[allow(clippy::expect_used)]
Regex::new("^((\\.|_).*|.*(\\s|:|;|@|,|/|\\\\|=).*|\\d+|root|nobody|nogroup|wheel|sshd|shadow|systemd.*)$").expect("Invalid Iname regex found") Regex::new("^[a-z][a-z0-9-_\\.]+$").expect("Invalid Iname regex found")
// ^ ^ ^ ^ // Only lowercase+numbers, with limited chars.
// | | | \- must not be a reserved name.
// | | \- must not be only integers
// | \- must not contain whitespace, @, :, ;, ',', /, \, =
// \- must not start with _ or .
// Them's be the rules.
}; };
pub static ref NSUNIQUEID_RE: Regex = { pub static ref NSUNIQUEID_RE: Regex = {
#[allow(clippy::expect_used)] #[allow(clippy::expect_used)]
@ -1536,7 +1546,7 @@ impl Value {
// It is a uuid, disallow. // It is a uuid, disallow.
Ok(_) => false, Ok(_) => false,
// Not a uuid, check it against the re. // Not a uuid, check it against the re.
Err(_) => !INAME_RE.is_match(s), Err(_) => INAME_RE.is_match(s) && !DISALLOWED_NAMES.contains(s.as_str()),
} }
} }
/* /*
@ -1698,11 +1708,12 @@ mod tests {
let inv5 = Value::new_iname("no spaces I'm sorry :("); let inv5 = Value::new_iname("no spaces I'm sorry :(");
let inv6 = Value::new_iname("bad=equals"); let inv6 = Value::new_iname("bad=equals");
let inv7 = Value::new_iname("bad,comma"); let inv7 = Value::new_iname("bad,comma");
let inv8 = Value::new_iname("123_456");
let inv9 = Value::new_iname("🍿");
let val1 = Value::new_iname("William"); let val1 = Value::new_iname("William");
let val2 = Value::new_iname("this_is_okay"); let val2 = Value::new_iname("this_is_okay");
let val3 = Value::new_iname("123_456"); let val3 = Value::new_iname("a123_456");
let val4 = Value::new_iname("🍿");
assert!(!inv1.validate()); assert!(!inv1.validate());
assert!(!inv2.validate()); assert!(!inv2.validate());
@ -1711,11 +1722,12 @@ mod tests {
assert!(!inv5.validate()); assert!(!inv5.validate());
assert!(!inv6.validate()); assert!(!inv6.validate());
assert!(!inv7.validate()); assert!(!inv7.validate());
assert!(!inv8.validate());
assert!(!inv9.validate());
assert!(val1.validate()); assert!(val1.validate());
assert!(val2.validate()); assert!(val2.validate());
assert!(val3.validate()); assert!(val3.validate());
assert!(val4.validate());
} }
#[test] #[test]

4
kanidmd/lib/src/valueset/iname.rs
View file

@ -2,7 +2,7 @@ use std::collections::BTreeSet;
use crate::prelude::*; use crate::prelude::*;
use crate::schema::SchemaAttribute; use crate::schema::SchemaAttribute;
use crate::value::INAME_RE; use crate::value::{DISALLOWED_NAMES, INAME_RE};
use crate::valueset::{DbValueSetV2, ValueSet}; use crate::valueset::{DbValueSetV2, ValueSet};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -102,7 +102,7 @@ impl ValueSetT for ValueSetIname {
// It is a uuid, disallow. // It is a uuid, disallow.
Ok(_) => false, Ok(_) => false,
// Not a uuid, check it against the re. // Not a uuid, check it against the re.
Err(_) => !INAME_RE.is_match(s), Err(_) => INAME_RE.is_match(s) && !DISALLOWED_NAMES.contains(s.as_str()),
} }
}) })
} }