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

operserv: NOTIFY allows broad masks (it only observes) so a #* watch can match all joins
All checks were successful
CI / check (push) Successful in 4m4s
Details

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-18 17:14:13 +00:00
parent 1d30c9cfe3
commit bbdb34aa77
No known key found for this signature in database
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/operserv/src/notify.rs
View file

@ -72,10 +72,9 @@ fn add(me: &str, from: &Sender, rest: &[&str], ctx: &mut ServiceCtx, db: &mut dy
ctx.notice(me, from.uid, "Mask must be a \x02#channel\x02, a \x02nick!user@host\x02 pattern, or a bare nick glob — and no spaces.");
return;
}
if too_wide(mask) {
ctx.notice(me, from.uid, "That mask is too wide — it would match almost everyone.");
return;
}
// No too-wide guard here: NOTIFY only observes, so a deliberately broad watch
// like "#*" (every channel) or "*" (every user) is a valid monitoring choice —
// scope it with flags and rely on `[log] notify_exclude` to keep relay noise out.
let reason = rest[3..].join(" ");
let setter = from.account.unwrap_or(from.nick);
match db.notify_add(mask, &flags, &reason, setter, expires) {
@ -146,13 +145,6 @@ fn valid_mask(mask: &str) -> bool {
!mask.is_empty() && !mask.contains(char::is_whitespace)
}
// A mask whose every meaningful character is a wildcard matches nearly everyone.
// `!`/`@` count as structure-only so `*!*@*` is caught alongside `*`.
fn too_wide(mask: &str) -> bool {
let body = mask.strip_prefix('#').or_else(|| mask.strip_prefix('&')).unwrap_or(mask);
body.is_empty() || body.chars().all(|c| matches!(c, '*' | '?' | '.' | '@' | '!'))
}
fn human_secs(secs: u64) -> String {
match secs {
0 => "moments".to_string(),