This commit is contained in:
parent
c646ccc0ec
commit
961dc870da
6 changed files with 90 additions and 1 deletions
|
|
@ -283,6 +283,7 @@ impl Engine {
|
|||
|
||||
// Load the services-operator table (casefolded account -> privileges).
|
||||
pub fn set_opers(&mut self, opers: HashMap<String, Privs>) {
|
||||
self.network.set_config_opers(opers.keys().cloned().collect());
|
||||
self.opers = opers;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@ pub struct Network {
|
|||
// Network-wide help index (service nick, blurb, per-command topics), built by
|
||||
// the engine at startup from every service so HelpServ can front it.
|
||||
pub help_catalog: Vec<(String, &'static str, &'static [HelpEntry])>,
|
||||
// Account names of the declarative config operators, mirrored from the engine
|
||||
// so services can enumerate staff (MemoServ STAFF). Runtime OPER grants live
|
||||
// in the store; a caller unions the two.
|
||||
config_opers: Vec<String>,
|
||||
}
|
||||
|
||||
// ChanFix scoring caps and rates.
|
||||
|
|
@ -106,6 +110,12 @@ impl Network {
|
|||
self.users.insert(uid.clone(), User { uid, nick, host, ip });
|
||||
}
|
||||
|
||||
// Mirror the engine's declarative config operators, so services can enumerate
|
||||
// staff. Called whenever the config oper set changes.
|
||||
pub fn set_config_opers(&mut self, accounts: Vec<String>) {
|
||||
self.config_opers = accounts;
|
||||
}
|
||||
|
||||
// Live sessions from `ip`.
|
||||
pub fn session_count(&self, ip: &str) -> u32 {
|
||||
self.sessions.get(ip).copied().unwrap_or(0)
|
||||
|
|
@ -368,6 +378,9 @@ impl Network {
|
|||
// The module-facing network view. Reads forward to Network's own accessors,
|
||||
// with the seen record projected into a plain view.
|
||||
impl NetView for Network {
|
||||
fn oper_accounts(&self) -> Vec<String> {
|
||||
self.config_opers.clone()
|
||||
}
|
||||
fn uid_by_nick(&self, nick: &str) -> Option<&str> {
|
||||
Network::uid_by_nick(self, nick)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -837,6 +837,38 @@
|
|||
assert_eq!(e.db.unread_memos("bob"), 1);
|
||||
}
|
||||
|
||||
// MemoServ STAFF memos every operator (config opers here), and only the
|
||||
// operators — a plain account gets nothing.
|
||||
#[test]
|
||||
fn memoserv_staff_memos_operators() {
|
||||
use echo_memoserv::MemoServ;
|
||||
use echo_nickserv::NickServ;
|
||||
let path = std::env::temp_dir().join("echo-msstaff.jsonl");
|
||||
let _ = std::fs::remove_file(&path);
|
||||
let mut db = Db::open(&path, "42S");
|
||||
db.scram_iterations = 4096;
|
||||
db.register("boss", "pw", None).unwrap();
|
||||
db.register("mod", "pw", None).unwrap();
|
||||
db.register("alice", "pw", None).unwrap();
|
||||
let mut e = Engine::new(
|
||||
vec![
|
||||
Box::new(NickServ { uid: "42SAAAAAA".into(), guest_nick: "Guest".into(), guest_seq: 0 }),
|
||||
Box::new(MemoServ { uid: "42SAAAAAE".into() }),
|
||||
],
|
||||
db,
|
||||
);
|
||||
let mut opers = std::collections::HashMap::new();
|
||||
opers.insert("boss".to_string(), Privs::default().with(echo_api::Priv::Admin));
|
||||
opers.insert("mod".to_string(), Privs::default().with(echo_api::Priv::Admin));
|
||||
e.set_opers(opers);
|
||||
e.handle(NetEvent::UserConnect { uid: "000AAAAAB".into(), nick: "boss".into(), host: "h".into(), ip: "0.0.0.0".into() });
|
||||
e.handle(NetEvent::Privmsg { from: "000AAAAAB".into(), to: "42SAAAAAA".into(), text: "IDENTIFY pw".into() });
|
||||
let out = e.handle(NetEvent::Privmsg { from: "000AAAAAB".into(), to: "42SAAAAAE".into(), text: "STAFF heads up team".into() });
|
||||
assert!(out.iter().any(|a| matches!(a, NetAction::Notice { text, .. } if text.contains("2"))), "memoed 2 opers: {out:?}");
|
||||
assert_eq!(e.db.unread_memos("mod"), 1, "the other operator got it");
|
||||
assert_eq!(e.db.unread_memos("alice"), 0, "a non-operator did not");
|
||||
}
|
||||
|
||||
// NickServ SASET lets an operator edit another account's settings, and is
|
||||
// refused to non-operators.
|
||||
#[test]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue