chanserv: PEACE never blocks acting on yourself (self-deop)
All checks were successful
CI / check (push) Successful in 3m58s
All checks were successful
CI / check (push) Successful in 3m58s
!deop with no target deops the caller, but peace_blocks compared the target's access rank to the caller's — equal for self — so PEACE refused it with 'you can't act against someone with equal or higher access.' Exempt the self case (target uid == caller uid) in peace_blocks: acting on yourself isn't acting against anyone, so you can always drop your own status. Covers DEOP/DEVOICE and the kick/ban paths too.
This commit is contained in:
parent
1f6a11dba2
commit
2e92f75a90
2 changed files with 34 additions and 0 deletions
|
|
@ -360,6 +360,11 @@ fn peace_blocks(me: &str, from: &Sender, chan: &str, target_uid: &str, ctx: &mut
|
||||||
if !info.peace {
|
if !info.peace {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
// Acting on yourself (e.g. DEOP with no target) isn't acting "against" anyone,
|
||||||
|
// so PEACE never applies — you can always drop your own status.
|
||||||
|
if target_uid == from.uid {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if info.access_rank(net.account_of(target_uid)) >= info.access_rank(from.account) {
|
if info.access_rank(net.account_of(target_uid)) >= info.access_rank(from.account) {
|
||||||
ctx.notice(me, from.uid, "\x02PEACE\x02 is set: you can't act against someone with equal or higher access.");
|
ctx.notice(me, from.uid, "\x02PEACE\x02 is set: you can't act against someone with equal or higher access.");
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
|
|
@ -1070,6 +1070,35 @@
|
||||||
assert!(out.iter().any(|a| matches!(a, NetAction::Notice { text, .. } if text.contains("isn't registered"))), "unknown channel refused: {out:?}");
|
assert!(out.iter().any(|a| matches!(a, NetAction::Notice { text, .. } if text.contains("isn't registered"))), "unknown channel refused: {out:?}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DEOP with no target deops yourself; PEACE (no acting against equal-or-higher
|
||||||
|
// access) must NOT block that — you can always drop your own status.
|
||||||
|
#[test]
|
||||||
|
fn chanserv_deop_self_allowed_under_peace() {
|
||||||
|
use echo_chanserv::ChanServ;
|
||||||
|
use echo_nickserv::NickServ;
|
||||||
|
let path = std::env::temp_dir().join("echo-csdeopself.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 mut e = Engine::new(
|
||||||
|
vec![
|
||||||
|
Box::new(NickServ { uid: "42SAAAAAA".into(), guest_nick: "Guest".into(), guest_seq: 0 }),
|
||||||
|
Box::new(ChanServ { uid: "42SAAAAAB".into() }),
|
||||||
|
],
|
||||||
|
db,
|
||||||
|
);
|
||||||
|
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::Join { uid: "000AAAAAB".into(), channel: "#c".into(), op: true });
|
||||||
|
let cs = |e: &mut Engine, text: &str| e.handle(NetEvent::Privmsg { from: "000AAAAAB".into(), to: "42SAAAAAB".into(), text: text.into() });
|
||||||
|
cs(&mut e, "SET #c PEACE ON");
|
||||||
|
let out = cs(&mut e, "DEOP #c"); // no target = self
|
||||||
|
assert!(out.iter().any(|a| matches!(a, NetAction::ChannelMode { modes, .. } if modes == "-o 000AAAAAB")), "self-deop applies -o: {out:?}");
|
||||||
|
assert!(!out.iter().any(|a| matches!(a, NetAction::Notice { text, .. } if text.contains("PEACE"))), "self-deop must not be PEACE-blocked: {out:?}");
|
||||||
|
}
|
||||||
|
|
||||||
// NickServ LIST is auspex-gated and glob-matches; UPDATE refreshes a session.
|
// NickServ LIST is auspex-gated and glob-matches; UPDATE refreshes a session.
|
||||||
#[test]
|
#[test]
|
||||||
fn nickserv_list_and_update() {
|
fn nickserv_list_and_update() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue