filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Spam filter improvements (closes #947)

Browse Source
This commit is contained in:
mdecimus
2025-01-02 15:43:00 +01:00
parent 23ac87fccd
commit 3a2df77eb4
24 changed files with 813 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/common/src/config/spamfilter.rs
View File

@@ -155,6 +155,8 @@ pub enum Location {
HeaderTo,
HeaderCc,
HeaderBcc,
HeaderMid,
HeaderDnt,
Ehlo,
BodyText,
BodyHtml,
@@ -271,16 +273,16 @@ impl DnsBlConfig {
DnsBlConfig {
max_ip_checks: config
.property_or_default("spam-filter.dnsbl.max-check.ip", "20")
.property_or_default("spam-filter.dnsbl.max-check.ip", "50")
.unwrap_or(20),
max_domain_checks: config
.property_or_default("spam-filter.dnsbl.max-check.domain", "20")
.property_or_default("spam-filter.dnsbl.max-check.domain", "50")
.unwrap_or(20),
max_email_checks: config
.property_or_default("spam-filter.dnsbl.max-check.email", "20")
.property_or_default("spam-filter.dnsbl.max-check.email", "50")
.unwrap_or(20),
max_url_checks: config
.property_or_default("spam-filter.dnsbl.max-check.url", "20")
.property_or_default("spam-filter.dnsbl.max-check.url", "50")
.unwrap_or(20),
servers,
}
@@ -634,6 +636,8 @@ impl Location {
Location::HeaderTo => "to",
Location::HeaderCc => "cc",
Location::HeaderBcc => "bcc",
Location::HeaderMid => "message_id",
Location::HeaderDnt => "dnt",
Location::Ehlo => "ehlo",
Location::BodyText => "body_text",
Location::BodyHtml => "body_html",
@@ -691,6 +695,8 @@ pub const V_SPAM_BODY_RAW: u32 = 134;
pub const V_SPAM_SUBJECT: u32 = 135;
pub const V_SPAM_SUBJECT_THREAD: u32 = 136;
pub const V_SPAM_LOCATION: u32 = 137;
pub const V_WORDS_SUBJECT: u32 = 138;
pub const V_WORDS_BODY: u32 = 139;
pub const V_RCPT_EMAIL: u32 = 0;
pub const V_RCPT_NAME: u32 = 1;
@@ -759,9 +765,11 @@ impl Element {
("body", V_SPAM_BODY_TEXT),
("body.text", V_SPAM_BODY_TEXT),
("body.html", V_SPAM_BODY_HTML),
("body.words", V_WORDS_BODY),
("body.raw", V_SPAM_BODY_RAW),
("subject", V_SPAM_SUBJECT),
("subject.thread", V_SPAM_SUBJECT_THREAD),
("subject.words", V_WORDS_SUBJECT),
("location", V_SPAM_LOCATION),
]);

2
crates/common/src/manager/mod.rs
View File

@@ -22,7 +22,7 @@ pub mod restore;
pub mod webadmin;
const DEFAULT_SPAMFILTER_URL: &str =
"https://raw.githubusercontent.com/stalwartlabs/spam-filter/refs/heads/main/spam-filter.toml";
"https://github.com/stalwartlabs/spam-filter/releases/latest/download/spam-filter.toml";
const DEFAULT_WEBADMIN_URL: &str =
"https://github.com/stalwartlabs/webadmin/releases/latest/download/webadmin.zip";
pub const WEBADMIN_KEY: &[u8] = "STALWART_WEBADMIN".as_bytes();