diff --git a/operserv/src/lib.rs b/operserv/src/lib.rs index 26f2b91..8e34fa8 100644 --- a/operserv/src/lib.rs +++ b/operserv/src/lib.rs @@ -19,6 +19,8 @@ mod mode; mod ignore; #[path = "stats.rs"] mod stats; +#[path = "svs.rs"] +mod svs; pub struct OperServ { pub uid: String, @@ -51,6 +53,8 @@ impl Service for OperServ { Some(cmd) if cmd.eq_ignore_ascii_case("MODE") => mode::handle(me, from, args, ctx, net), Some(cmd) if cmd.eq_ignore_ascii_case("IGNORE") => ignore::handle(me, from, args, ctx, db), Some(cmd) if cmd.eq_ignore_ascii_case("STATS") => stats::handle(me, from, db, ctx), + Some(cmd) if cmd.eq_ignore_ascii_case("SVSNICK") => svs::nick(me, from, args, ctx, net), + Some(cmd) if cmd.eq_ignore_ascii_case("SVSJOIN") => svs::join(me, from, args, ctx, net), Some(cmd) if cmd.eq_ignore_ascii_case("HELP") => help(me, from, ctx), None => help(me, from, ctx), Some(other) => ctx.notice(me, from.uid, format!("I don't know \x02{other}\x02. Try \x02HELP\x02.")), @@ -59,5 +63,5 @@ impl Service for OperServ { } fn help(me: &str, from: &Sender, ctx: &mut ServiceCtx) { - ctx.notice(me, from.uid, "OperServ holds network operator tools (Priv::Admin): \x02AKILL\x02 ADD|DEL|LIST (user@host bans), \x02SQLINE\x02 ADD|DEL|LIST (nick bans), \x02GLOBAL\x02 (announce to everyone), \x02KILL\x02 [reason] (disconnect a user), \x02KICK\x02 <#chan> [reason], \x02MODE\x02 <#chan> [params], \x02IGNORE\x02 ADD|DEL|LIST (silence a user from services), \x02STATS\x02 (enforcement overview)."); + ctx.notice(me, from.uid, "OperServ holds network operator tools (Priv::Admin): \x02AKILL\x02 ADD|DEL|LIST (user@host bans), \x02SQLINE\x02 ADD|DEL|LIST (nick bans), \x02GLOBAL\x02 (announce to everyone), \x02KILL\x02 [reason] (disconnect a user), \x02KICK\x02 <#chan> [reason], \x02MODE\x02 <#chan> [params], \x02IGNORE\x02 ADD|DEL|LIST (silence a user from services), \x02STATS\x02 (enforcement overview), \x02SVSNICK\x02 , \x02SVSJOIN\x02 <#chan> [key]."); } diff --git a/operserv/src/svs.rs b/operserv/src/svs.rs new file mode 100644 index 0000000..5c39e8e --- /dev/null +++ b/operserv/src/svs.rs @@ -0,0 +1,45 @@ +use fedserv_api::{NetView, Priv, Sender, ServiceCtx}; + +// SVSNICK : force a user to change nick. Admin-only. +pub fn nick(me: &str, from: &Sender, args: &[&str], ctx: &mut ServiceCtx, net: &dyn NetView) { + if !from.privs.has(Priv::Admin) { + ctx.notice(me, from.uid, "Access denied — SVSNICK needs the \x02admin\x02 privilege."); + return; + } + let (Some(&target), Some(&newnick)) = (args.get(1), args.get(2)) else { + ctx.notice(me, from.uid, "Syntax: SVSNICK "); + return; + }; + if newnick.is_empty() || newnick.starts_with('#') || newnick.contains(|c: char| c.is_whitespace() || c == ',') { + ctx.notice(me, from.uid, format!("\x02{newnick}\x02 isn't a valid nick.")); + return; + } + let Some(uid) = net.uid_by_nick(target).map(str::to_string) else { + ctx.notice(me, from.uid, format!("There's no \x02{target}\x02 online.")); + return; + }; + ctx.force_nick(&uid, newnick); + ctx.notice(me, from.uid, format!("\x02{target}\x02 has been renamed to \x02{newnick}\x02.")); +} + +// SVSJOIN <#channel> [key]: force a user into a channel. Admin-only. +pub fn join(me: &str, from: &Sender, args: &[&str], ctx: &mut ServiceCtx, net: &dyn NetView) { + if !from.privs.has(Priv::Admin) { + ctx.notice(me, from.uid, "Access denied — SVSJOIN needs the \x02admin\x02 privilege."); + return; + } + let (Some(&target), Some(&chan)) = (args.get(1), args.get(2)) else { + ctx.notice(me, from.uid, "Syntax: SVSJOIN <#channel> [key]"); + return; + }; + if !chan.starts_with('#') && !chan.starts_with('&') { + ctx.notice(me, from.uid, "SVSJOIN targets a channel."); + return; + } + let Some(uid) = net.uid_by_nick(target).map(str::to_string) else { + ctx.notice(me, from.uid, format!("There's no \x02{target}\x02 online.")); + return; + }; + ctx.force_join(&uid, chan, args.get(3).copied().unwrap_or("")); + ctx.notice(me, from.uid, format!("\x02{target}\x02 has been joined to \x02{chan}\x02.")); +} diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 26d5c89..55ed5cd 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -4016,6 +4016,44 @@ mod tests { } } + // OperServ SVSNICK / SVSJOIN: force a user's nick or channel join, admin-gated. + #[test] + fn operserv_svs_forces_nick_and_join() { + use fedserv_operserv::OperServ; + let path = std::env::temp_dir().join("fedserv-ossvs.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() }); + + 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: "000AAAAAT".into(), nick: "target".into(), host: "h".into() }); + + // SVSNICK forces the rename. + let out = os(&mut e, "000AAAAAS", "SVSNICK target Renamed"); + assert!(out.iter().any(|a| matches!(a, NetAction::ForceNick { uid, nick } if uid == "000AAAAAT" && nick == "Renamed")), "svsnick issued: {out:?}"); + // The ircd echoes the rename; once tracked, SVSJOIN resolves the new nick. + e.handle(NetEvent::NickChange { uid: "000AAAAAT".into(), nick: "Renamed".into() }); + let out = os(&mut e, "000AAAAAS", "SVSJOIN Renamed #room"); + assert!(out.iter().any(|a| matches!(a, NetAction::ForceJoin { uid, channel, .. } if uid == "000AAAAAT" && channel == "#room")), "svsjoin issued: {out:?}"); + + // An unknown target is reported, not forced. + assert!(os(&mut e, "000AAAAAS", "SVSNICK ghost x").iter().any(|a| matches!(a, NetAction::Notice { text, .. } if text.contains("no \x02ghost\x02"))), "unknown target"); + } + // OperServ IGNORE: an admin silences a user, whose service commands are then // dropped; DEL restores them; opers are never silenced. #[test]