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

filter: pluggable pattern engine (glob|regex) selected by filter_engine config; regex/glob backends behind a Matcher trait

Browse source
This commit is contained in:
Jean Chevronnet 2026-08-22 17:36:46 +00:00
parent 73817eddde
commit 4357a59c7a
No known key found for this signature in database
GPG key ID: 439666D63A9477E4
5 changed files with 143 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/rpc/spamfilter.rs
View file

@ -19,6 +19,7 @@ pub fn handle(s: &mut Server, action: &str, params: &str) -> Result<String, RpcE
.map(|r| {
obj(&[
("pattern", qstr(&r.pattern)),
("engine", qstr(&r.engine)),
("reason", qstr(&r.reason)),
("action", qstr(&r.action)),
("duration", r.duration.to_string()),
@ -36,16 +37,17 @@ pub fn handle(s: &mut Server, action: &str, params: &str) -> Result<String, RpcE
let action = json::get_str(params, "action").unwrap_or_else(|| "block".into());
let reason = json::get_str(params, "reason").unwrap_or_else(|| "Set via RPC".into());
let duration = json::get_num::<u64>(params, "duration").unwrap_or(0);
// engine: an explicit param, else the configured default, else glob.
let engine = json::get_str(params, "engine")
.or_else(|| s.conf("filter_engine").map(str::to_string))
.unwrap_or_else(|| "glob".to_string());
let filter = SpamFilter::new(pattern, engine, action, duration, reason)
.map_err(|e| RpcError::invalid_params(&e))?;
let set = s.ext.get_or_insert_with::<Filters>(Filters::default);
if set.0.iter().any(|f| f.pattern == pattern) {
if set.0.iter().any(|f| f.pattern == filter.pattern) {
return Err(RpcError::not_found("filter already exists"));
}
set.0.push(SpamFilter {
pattern,
action,
duration,
reason,
});
set.0.push(filter);
Ok(obj(&[("result", "true".into())]))
}
"del" => {