Add SIGNKICK LEVEL mode: sign only kicks by users without op access
All checks were successful
CI / check (push) Successful in 5m19s
All checks were successful
CI / check (push) Successful in 5m19s
This commit is contained in:
parent
ae90388fbf
commit
140b19ee04
9 changed files with 72 additions and 8 deletions
|
|
@ -271,6 +271,7 @@ impl Db {
|
|||
let mut settings = c.settings;
|
||||
match setting {
|
||||
ChanSetting::SignKick => settings.signkick = on,
|
||||
ChanSetting::SignKickLevel => settings.signkick_level = on,
|
||||
ChanSetting::Private => settings.private = on,
|
||||
ChanSetting::Peace => settings.peace = on,
|
||||
ChanSetting::SecureOps => settings.secureops = on,
|
||||
|
|
|
|||
|
|
@ -419,6 +419,10 @@ pub struct ChanSettings {
|
|||
// Append "(requested by <nick>)" to ChanServ KICK reasons.
|
||||
#[serde(default)]
|
||||
pub signkick: bool,
|
||||
// With signkick on: sign only kicks by users WITHOUT op-level access (trusted
|
||||
// ops' kicks stay unsigned). Ignored when signkick is off.
|
||||
#[serde(default)]
|
||||
pub signkick_level: bool,
|
||||
// Hide the channel from ChanServ LIST.
|
||||
#[serde(default)]
|
||||
pub private: bool,
|
||||
|
|
|
|||
|
|
@ -650,6 +650,7 @@ fn channel_view(c: &ChannelInfo) -> ChannelView {
|
|||
url: c.url.clone(),
|
||||
email: c.email.clone(),
|
||||
signkick: c.settings.signkick,
|
||||
signkick_level: c.settings.signkick_level,
|
||||
private: c.settings.private,
|
||||
peace: c.settings.peace,
|
||||
secureops: c.settings.secureops,
|
||||
|
|
|
|||
|
|
@ -5312,6 +5312,38 @@
|
|||
assert!(!out.iter().any(|a| matches!(a, NetAction::ChannelMode { modes, .. } if modes.starts_with("-v"))), "founder keeps voice: {out:?}");
|
||||
}
|
||||
|
||||
// SIGNKICK ON signs every CS KICK; LEVEL exempts kickers with op access.
|
||||
#[test]
|
||||
fn signkick_level_exempts_ops() {
|
||||
use echo_chanserv::ChanServ;
|
||||
let path = std::env::temp_dir().join("echo-signkick-level.jsonl");
|
||||
let _ = std::fs::remove_file(&path);
|
||||
let mut db = Db::open(&path, "42S");
|
||||
db.scram_iterations = 4096;
|
||||
db.register("alice", "sesame", None).unwrap();
|
||||
db.register_channel("#c", "alice").unwrap();
|
||||
let ns = NickServ { uid: "42SAAAAAA".into(), guest_nick: "Guest".into(), guest_seq: 0 };
|
||||
let cs = ChanServ { uid: "42SAAAAAB".into() };
|
||||
let mut e = Engine::new(vec![Box::new(ns), Box::new(cs)], db);
|
||||
let to_cs = |e: &mut Engine, from: &str, text: &str| {
|
||||
e.handle(NetEvent::Privmsg { from: from.into(), to: "42SAAAAAB".into(), text: text.into() })
|
||||
};
|
||||
e.handle(NetEvent::UserConnect { uid: "000AAAAAB".into(), nick: "alice".into(), host: "h".into(), ip: "0.0.0.0".into() });
|
||||
e.handle(NetEvent::Privmsg { from: "000AAAAAB".into(), to: "42SAAAAAA".into(), text: "IDENTIFY sesame".into() });
|
||||
e.handle(NetEvent::UserConnect { uid: "000AAAAAE".into(), nick: "eve".into(), host: "h".into(), ip: "0.0.0.0".into() });
|
||||
e.handle(NetEvent::Join { uid: "000AAAAAE".into(), channel: "#c".into(), op: false });
|
||||
|
||||
to_cs(&mut e, "000AAAAAB", "SET #c SIGNKICK ON");
|
||||
let out = to_cs(&mut e, "000AAAAAB", "KICK #c eve");
|
||||
assert!(out.iter().any(|a| matches!(a, NetAction::Kick { reason, .. } if reason.contains("requested by alice"))), "signed on ON: {out:?}");
|
||||
|
||||
e.handle(NetEvent::Join { uid: "000AAAAAE".into(), channel: "#c".into(), op: false });
|
||||
to_cs(&mut e, "000AAAAAB", "SET #c SIGNKICK LEVEL");
|
||||
let out = to_cs(&mut e, "000AAAAAB", "KICK #c eve");
|
||||
assert!(out.iter().any(|a| matches!(a, NetAction::Kick { .. })), "kick still happens: {out:?}");
|
||||
assert!(!out.iter().any(|a| matches!(a, NetAction::Kick { reason, .. } if reason.contains("requested by"))), "op founder exempt on LEVEL: {out:?}");
|
||||
}
|
||||
|
||||
// ChanServ SET: description and founder transfer, founder-gated.
|
||||
#[test]
|
||||
fn chanserv_set() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue