fedserv/echo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chanserv: SOP protect tier over AOP (+ao), founder owner (+qo); resolve op access by capability not mode string
All checks were successful
CI / check (push) Successful in 3m59s
Details

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-17 15:43:16 +00:00
parent c8106035df
commit 2f6fd41465
No known key found for this signature in database
7 changed files with 139 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/engine/db/mod.rs
View file

@ -601,11 +601,11 @@ impl KickerSettings {
}
impl ChannelInfo {
/// The status mode to give `account` on join, if any: +o for the founder and
/// access-list ops, +v for voices.
/// The status mode to give `account` on join, if any: +qo for the founder,
/// +ao/+o for access-list ops, +v for voices.
pub fn join_mode(&self, account: &str) -> Option<&'static str> {
if self.founder.eq_ignore_ascii_case(account) {
return Some("+o");
return echo_api::level_caps("founder").auto;
}
self.access
.iter()
@ -613,6 +613,18 @@ impl ChannelInfo {
.and_then(|a| echo_api::level_caps(&a.level).auto)
}
/// Whether `account` holds op-level (moderation) access — the founder, or an
/// access entry whose level resolves to op. A capability check, so it stays
/// right for SOP, whose join mode is "+ao" rather than literally "+o".
pub fn is_op(&self, account: &str) -> bool {
self.founder.eq_ignore_ascii_case(account)
|| self
.access
.iter()
.find(|a| a.account.eq_ignore_ascii_case(account))
.is_some_and(|a| echo_api::level_caps(&a.level).op)
}
/// The matching auto-kick entry for `hostmask` (nick!user@host), if any.
pub fn akick_match(&self, hostmask: &str) -> Option<&ChanAkick> {
self.akick.iter().find(|k| glob_match(&k.mask, hostmask))