vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

dashboard: tighten is_plain_ident to match hive-priv validate_name_chars (argus review)

Browse source
This commit is contained in:
damocles 2026-06-16 11:02:07 +02:00 • committed by mara
commit 1d259e84f2
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hive-c0re/src/dashboard/matrix_accounts.rs
View file

@ -116,12 +116,15 @@ struct MatrixLoginResult {
user_id: String, user_id: String,
} }
/// Plain-identifier check (ascii alnum + `-`/`_`), matching what hive-priv /// Plain-identifier check matching hive-priv's `validate_name_chars`
/// re-applies root-side to the agent + account before building the path. /// exactly (lowercase ascii + digits + hyphens) — the root-side guard
/// re-applies the same rule before building the token path. Keeping the
/// dashboard check identical means a name that passes here can't then be
/// rejected at the priv boundary with a confusing "write token failed".
fn is_plain_ident(s: &str) -> bool { fn is_plain_ident(s: &str) -> bool {
!s.is_empty() !s.is_empty()
&& s.chars() && s.chars()
.all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_') .all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == '-')
} }
/// Provision (or refresh) the token for an agent's extra matrix account. /// Provision (or refresh) the token for an agent's extra matrix account.
@ -301,10 +304,16 @@ mod tests {
} }
#[test] #[test]
fn is_plain_ident_rejects_path_chars() { fn is_plain_ident_matches_validate_name_chars() {
// Accepts exactly what hive-priv's validate_name_chars does:
// lowercase ascii + digits + hyphens.
assert!(is_plain_ident("catgirl")); assert!(is_plain_ident("catgirl"));
assert!(is_plain_ident("acct-1_x")); assert!(is_plain_ident("acct-1"));
assert!(!is_plain_ident("")); assert!(!is_plain_ident(""));
// Rejected: uppercase + underscore (would pass a looser check
// then fail at the priv boundary), and path chars.
assert!(!is_plain_ident("MyAccount"));
assert!(!is_plain_ident("my_account"));
assert!(!is_plain_ident("../escape")); assert!(!is_plain_ident("../escape"));
assert!(!is_plain_ident("a/b")); assert!(!is_plain_ident("a/b"));
assert!(!is_plain_ident("a.b")); assert!(!is_plain_ident("a.b"));