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

Spam filter config adjustments

Browse Source
This commit is contained in:
mdecimus
2024-12-31 12:29:49 +01:00
parent 30cf967623
commit 8eda2251d8
19 changed files with 302 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tests/src/smtp/inbound/asn.rs
View File

@@ -8,10 +8,7 @@
mod tests {
use std::time::{Duration, Instant};
use common::{
config::network::{AsnGeoLookupConfig, AsnGeoLookupResource},
Core, Server,
};
use common::{config::network::AsnGeoLookupConfig, Core, Server};
#[tokio::test]
#[ignore]
@@ -55,31 +52,28 @@ mod tests {
expires: Duration::from_secs(86400),
timeout: Duration::from_secs(100),
max_size: 100 * 1024 * 1024,
resources: vec![
AsnGeoLookupResource::Asn {
//url: "file:///Users/me/code/playground/asn-ipv4.csv".to_string(),
url: "https://cdn.jsdelivr.net/npm/@ip-location-db/asn/asn-ipv4.csv".to_string(),
headers: Default::default(),
},
AsnGeoLookupResource::Asn {
//url: "file:///Users/me/code/playground/asn-ipv6.csv".to_string(),
url: "https://cdn.jsdelivr.net/npm/@ip-location-db/asn/asn-ipv6.csv".to_string(),
headers: Default::default(),
},
AsnGeoLookupResource::Geo {
//url: "file:///Users/me/code/playground/geolite2-geo-whois-asn-country-ipv4.csv"
// .to_string(),
url: "https://cdn.jsdelivr.net/npm/@ip-location-db/geolite2-geo-whois-asn-country/geolite2-geo-whois-asn-country-ipv4.csv"
.to_string(),
headers: Default::default(),
},
AsnGeoLookupResource::Geo {
//url: "file:///Users/me/code/playground/geolite2-geo-whois-asn-country-ipv6.csv"
// .to_string(),
url: "https://cdn.jsdelivr.net/npm/@ip-location-db/geolite2-geo-whois-asn-country/geolite2-geo-whois-asn-country-ipv4.csv"
.to_string(),
headers: Default::default(),
},
headers: Default::default(),
asn_resources: vec![
//url: "file:///Users/me/code/playground/asn-ipv4.csv".to_string(),
//url: "file:///Users/me/code/playground/asn-ipv6.csv".to_string(),
"https://cdn.jsdelivr.net/npm/@ip-location-db/asn/asn-ipv4.csv".to_string(),
"https://cdn.jsdelivr.net/npm/@ip-location-db/asn/asn-ipv6.csv".to_string(),
],
geo_resources: vec![
//url: "file:///Users/me/code/playground/geolite2-geo-whois-asn-country-ipv4.csv"
// .to_string(),
//url: "file:///Users/me/code/playground/geolite2-geo-whois-asn-country-ipv6.csv"
// .to_string(),
concat!(
"https://cdn.jsdelivr.net/npm/@ip-location-db/geolite2-geo-whois-",
"asn-country/geolite2-geo-whois-asn-country-ipv4.csv"
)
.to_string(),
concat!(
"https://cdn.jsdelivr.net/npm/@ip-location-db/geolite2-geo-whois-",
"asn-country/geolite2-geo-whois-asn-country-ipv6.csv"
)
.to_string(),
],
};
let server = Server {

10
tests/src/smtp/mod.rs
View File

@@ -14,6 +14,7 @@ use common::{
config::{
server::{Listeners, ServerProtocol},
smtp::resolver::Tlsa,
spamfilter::IpResolver,
},
ipc::{QueueEvent, ReportingEvent},
manager::boot::{build_ipc, IpcReceivers},
@@ -315,7 +316,14 @@ impl DnsCache for Server {
fn dnsbl_add(&self, name: &str, value: Vec<Ipv4Addr>, valid_until: std::time::Instant) {
self.inner.cache.dns_rbl.insert_with_expiry(
name.to_string(),
Some(Arc::new(value)),
Some(Arc::new(IpResolver::new(
value
.iter()
.copied()
.next()
.unwrap_or(Ipv4Addr::BROADCAST)
.into(),
))),
valid_until,
);
}