fedserv/echo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

operserv: OPER ADD rejects unknown privilege names instead of silently dropping them

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-17 13:53:53 +00:00
parent ef34c04c8d
commit ee95225eaf
No known key found for this signature in database
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/operserv/src/oper.rs
View file

@ -27,14 +27,22 @@ fn add(me: &str, from: &Sender, account: Option<&str>, privs: Option<&str>, dur:
ctx.notice(me, from.uid, format!("\x02{account}\x02 isn't registered."));
return;
};
// Keep only recognised privilege names.
let names: Vec<String> = privs
.split(',')
.map(|p| p.trim().to_ascii_lowercase())
.filter(|p| matches!(p.as_str(), "auspex" | "suspend" | "admin"))
.collect();
// Parse the privilege names, rejecting the whole grant on a typo rather than
// silently dropping it (which would grant less than the oper intended).
let mut names = Vec::new();
let mut unknown = Vec::new();
for p in privs.split(',').map(str::trim).filter(|p| !p.is_empty()) {
match Priv::from_name(p) {
Some(pr) => names.push(pr.name().to_string()),
None => unknown.push(p.to_string()),
}
}
if !unknown.is_empty() {
ctx.notice(me, from.uid, format!("Unknown privilege(s): \x02{}\x02 (valid: {}).", unknown.join(", "), Priv::valid_names()));
return;
}
if names.is_empty() {
ctx.notice(me, from.uid, "No valid privileges given (auspex, suspend, admin).");
ctx.notice(me, from.uid, format!("No privileges given (valid: {}).", Priv::valid_names()));
return;
}
let expires = dur.and_then(|d| d.strip_prefix('+')).and_then(parse_duration).map(|secs| now() + secs);