OperServ: IGNORE — silence a user across all services
IGNORE ADD [+expiry] <mask> [reason] / DEL <mask> / LIST. While a user matches, the dispatch choke-point drops their service commands silently. A mask with an @ matches nick!*@host (ident isn't tracked); a bare mask matches the nick; matching is case-insensitive with lazy expiry. Admin- only, and an operator is never ignored (so staff can't lock themselves out). Node-local and in-memory, like the auth and request throttles — a fast transient moderation tool, not persisted or federated.
This commit is contained in:
parent
c5d93f29c1
commit
ab5dc2e931
5 changed files with 217 additions and 3 deletions
|
|
@ -30,7 +30,7 @@ use super::scram::{self, Hash};
|
|||
// fedserv-api SDK crate; re-exported so the engine keeps naming them locally and
|
||||
// modules importing `crate::engine::db::{ChanError, ...}` are unaffected.
|
||||
pub use fedserv_api::{
|
||||
AccountView, AjoinView, AkillView, BotView, MemoView, SuspensionView, ChanAccessView, ChanAkickView, ChanError, ChanSetting, ChannelView, CertError, CodeKind, Kicker, RegError, Store, TriggerView, VhostView,
|
||||
AccountView, AjoinView, AkillView, BotView, IgnoreView, MemoView, SuspensionView, ChanAccessView, ChanAkickView, ChanError, ChanSetting, ChannelView, CertError, CodeKind, Kicker, RegError, Store, TriggerView, VhostView,
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
|
|
@ -315,6 +315,16 @@ fn gline_kind() -> String {
|
|||
"G".to_string()
|
||||
}
|
||||
|
||||
// A services ignore: services silently drop commands from a matching user. Node-
|
||||
// local and in-memory (like the auth throttle) — a fast, transient moderation
|
||||
// tool, not persisted or federated.
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Ignore {
|
||||
pub mask: String,
|
||||
pub reason: String,
|
||||
pub expires: Option<u64>,
|
||||
}
|
||||
|
||||
// A memo left for an account (MemoServ).
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Memo {
|
||||
|
|
@ -881,6 +891,8 @@ pub struct Db {
|
|||
host_cfg: HostConfig,
|
||||
// Network bans (OperServ AKILL), in insertion order.
|
||||
akills: Vec<Akill>,
|
||||
// Services ignores (OperServ IGNORE), node-local and in-memory.
|
||||
ignores: Vec<Ignore>,
|
||||
}
|
||||
|
||||
// Network-wide HostServ configuration, rebuilt from the event log.
|
||||
|
|
@ -936,7 +948,7 @@ impl Db {
|
|||
apply(&mut accounts, &mut channels, &mut grouped, &mut bots, &mut host_cfg, &mut akills, event);
|
||||
}
|
||||
tracing::info!(accounts = accounts.len(), channels = channels.len(), "account store loaded");
|
||||
Self { accounts, channels, grouped, log, scram_iterations: scram::DEFAULT_ITERATIONS, email_enabled: false, email_brand: "Network Services".to_string(), email_accent: "#4f46e5".to_string(), email_logo: String::new(), codes: HashMap::new(), auth_fails: HashMap::new(), vhost_req_times: HashMap::new(), bots, host_cfg, akills }
|
||||
Self { accounts, channels, grouped, log, scram_iterations: scram::DEFAULT_ITERATIONS, email_enabled: false, email_brand: "Network Services".to_string(), email_accent: "#4f46e5".to_string(), email_logo: String::new(), codes: HashMap::new(), auth_fails: HashMap::new(), vhost_req_times: HashMap::new(), bots, host_cfg, akills, ignores: Vec::new() }
|
||||
}
|
||||
|
||||
/// Fold an entry authored by another node into the store — the services-side
|
||||
|
|
@ -1794,6 +1806,48 @@ impl Db {
|
|||
.collect()
|
||||
}
|
||||
|
||||
/// Add a services ignore, replacing any existing entry for the same mask.
|
||||
pub fn ignore_add(&mut self, mask: &str, reason: &str, expires: Option<u64>) {
|
||||
self.ignores.retain(|i| !i.mask.eq_ignore_ascii_case(mask));
|
||||
self.ignores.push(Ignore { mask: mask.to_string(), reason: reason.to_string(), expires });
|
||||
}
|
||||
|
||||
/// Remove a services ignore. Returns whether a live one was removed.
|
||||
pub fn ignore_del(&mut self, mask: &str) -> bool {
|
||||
let now = now();
|
||||
let existed = self.ignores.iter().any(|i| i.mask.eq_ignore_ascii_case(mask) && i.expires.is_none_or(|e| e > now));
|
||||
self.ignores.retain(|i| !i.mask.eq_ignore_ascii_case(mask));
|
||||
existed
|
||||
}
|
||||
|
||||
/// The live services ignores (expired hidden lazily), oldest first.
|
||||
pub fn ignores(&self) -> Vec<IgnoreView> {
|
||||
let now = now();
|
||||
self.ignores
|
||||
.iter()
|
||||
.filter(|i| i.expires.is_none_or(|e| e > now))
|
||||
.map(|i| IgnoreView { mask: i.mask.clone(), reason: i.reason.clone(), expires: i.expires })
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Whether a user is currently ignored by services. A mask with an `@` is
|
||||
/// matched against `nick!*@host` (we don't track ident); a bare mask against
|
||||
/// the nick. Expired entries are swept as they're encountered.
|
||||
pub fn is_ignored(&mut self, nick: &str, host: &str) -> bool {
|
||||
let now = now();
|
||||
self.ignores.retain(|i| i.expires.is_none_or(|e| e > now));
|
||||
let full = format!("{}!*@{}", nick.to_ascii_lowercase(), host.to_ascii_lowercase());
|
||||
let nick_lc = nick.to_ascii_lowercase();
|
||||
self.ignores.iter().any(|i| {
|
||||
let m = i.mask.to_ascii_lowercase();
|
||||
if m.contains('@') {
|
||||
glob_match(&m, &full)
|
||||
} else {
|
||||
glob_match(&m, &nick_lc)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// The account's suspension record, if any (shown in INFO even once expired).
|
||||
pub fn suspension(&self, account: &str) -> Option<SuspensionView> {
|
||||
self.accounts
|
||||
|
|
@ -2952,6 +3006,15 @@ impl Store for Db {
|
|||
fn akills(&self) -> Vec<AkillView> {
|
||||
Db::akills(self)
|
||||
}
|
||||
fn ignore_add(&mut self, mask: &str, reason: &str, expires: Option<u64>) {
|
||||
Db::ignore_add(self, mask, reason, expires)
|
||||
}
|
||||
fn ignore_del(&mut self, mask: &str) -> bool {
|
||||
Db::ignore_del(self, mask)
|
||||
}
|
||||
fn ignores(&self) -> Vec<IgnoreView> {
|
||||
Db::ignores(self)
|
||||
}
|
||||
fn register_channel(&mut self, name: &str, founder: &str) -> Result<(), ChanError> {
|
||||
Db::register_channel(self, name, founder)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1131,6 +1131,14 @@ impl Engine {
|
|||
self.bump("botserv.messages");
|
||||
}
|
||||
} else {
|
||||
// A services ignore silences a user's commands entirely — but an oper
|
||||
// can never be ignored (else they could lock themselves out).
|
||||
if !privs.any() {
|
||||
let host = self.network.host_of(from).unwrap_or("").to_string();
|
||||
if self.db.is_ignored(&nick, &host) {
|
||||
return Vec::new();
|
||||
}
|
||||
}
|
||||
let mut matched: Option<String> = None;
|
||||
{
|
||||
let Self { services, network, db, .. } = self;
|
||||
|
|
@ -4006,6 +4014,54 @@ mod tests {
|
|||
}
|
||||
}
|
||||
|
||||
// OperServ IGNORE: an admin silences a user, whose service commands are then
|
||||
// dropped; DEL restores them; opers are never silenced.
|
||||
#[test]
|
||||
fn operserv_ignore_silences_and_restores() {
|
||||
use fedserv_operserv::OperServ;
|
||||
let path = std::env::temp_dir().join("fedserv-osignore.jsonl");
|
||||
let _ = std::fs::remove_file(&path);
|
||||
let mut db = Db::open(&path, "42S");
|
||||
db.scram_iterations = 4096;
|
||||
db.register("staff", "password1", None).unwrap();
|
||||
let mut e = Engine::new(
|
||||
vec![
|
||||
Box::new(NickServ { uid: "42SAAAAAA".into(), guest_nick: "Guest".into(), guest_seq: 0 }),
|
||||
Box::new(OperServ { uid: "42SAAAAAH".into() }),
|
||||
],
|
||||
db,
|
||||
);
|
||||
e.set_sid("42S".into());
|
||||
let mut opers = std::collections::HashMap::new();
|
||||
opers.insert("staff".to_string(), Privs::default().with(fedserv_api::Priv::Admin));
|
||||
e.set_opers(opers);
|
||||
let os = |e: &mut Engine, uid: &str, t: &str| e.handle(NetEvent::Privmsg { from: uid.into(), to: "42SAAAAAH".into(), text: t.into() });
|
||||
let ns = |e: &mut Engine, uid: &str, t: &str| e.handle(NetEvent::Privmsg { from: uid.into(), to: "42SAAAAAA".into(), text: t.into() });
|
||||
|
||||
e.handle(NetEvent::UserConnect { uid: "000AAAAAS".into(), nick: "staff".into(), host: "h".into() });
|
||||
e.handle(NetEvent::Privmsg { from: "000AAAAAS".into(), to: "42SAAAAAA".into(), text: "IDENTIFY password1".into() });
|
||||
e.handle(NetEvent::UserConnect { uid: "000AAAAAM".into(), nick: "menace".into(), host: "bad.host".into() });
|
||||
|
||||
// Before the ignore, a NickServ command gets a reply.
|
||||
assert!(!ns(&mut e, "000AAAAAM", "INFO").is_empty(), "responds before ignore");
|
||||
|
||||
// Ignore by host mask, then the same command yields nothing at all.
|
||||
os(&mut e, "000AAAAAS", "IGNORE ADD *!*@bad.host flooding");
|
||||
assert!(ns(&mut e, "000AAAAAM", "INFO").is_empty(), "ignored user's command is dropped");
|
||||
assert!(os(&mut e, "000AAAAAM", "HELP").is_empty(), "ignored across every service");
|
||||
|
||||
// The operator is never silenced by an ignore against them.
|
||||
os(&mut e, "000AAAAAS", "IGNORE ADD *!*@h staffignore");
|
||||
assert!(!ns(&mut e, "000AAAAAS", "INFO").is_empty(), "an oper can't be ignored");
|
||||
|
||||
// DEL restores the menace.
|
||||
os(&mut e, "000AAAAAS", "IGNORE DEL *!*@bad.host");
|
||||
assert!(!ns(&mut e, "000AAAAAM", "INFO").is_empty(), "responds again after DEL");
|
||||
|
||||
// A non-admin (no longer ignored) can't manage the list — it's refused.
|
||||
assert!(os(&mut e, "000AAAAAM", "IGNORE LIST").iter().any(|a| matches!(a, NetAction::Notice { text, .. } if text.contains("Access denied"))), "non-admin refused");
|
||||
}
|
||||
|
||||
// NOEXPIRE is oper-only.
|
||||
#[test]
|
||||
fn noexpire_command_is_oper_gated() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue