stalwartlabs/mail-server
1
1
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2025-12-09 21:05:59 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed LDAP port, Spamhaus DNSBL return codes

Browse source
This commit is contained in:
mdecimus 2023-11-17 16:49:23 +01:00
parent bcc05340b2
commit ba902d9af7
5 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/config/directory/ldap.toml
View file

@ -4,7 +4,7 @@
[directory."default"] [directory."default"]
type = "ldap" type = "ldap"
address = "ldap://localhost:3893" address = "ldap://localhost:389"
base-dn = "dc=example,dc=org" base-dn = "dc=example,dc=org"
[directory."default".bind] [directory."default".bind]

4
resources/config/spamfilter/scripts/rbl.sieve
View file

@ -186,11 +186,11 @@ while "i < domains_len" {
# Query SpamHaus DBL # Query SpamHaus DBL
let "result" "rsplit_once(dns_query(domain + '.dbl.spamhaus.org', 'ipv4')[0], '.')"; let "result" "rsplit_once(dns_query(domain + '.dbl.spamhaus.org', 'ipv4')[0], '.')";
if eval "result[0] == '127.0.0'" { if eval "result[0] == '127.0.1'" {
let "result" "result[1]"; let "result" "result[1]";
if eval "result == 2" { if eval "result == 2" {
let "t.DBL_SPAM" ""; let "t.DBL_SPAM" "1";
} elsif eval "result == 4" { } elsif eval "result == 4" {
let "t.DBL_PHISH" "1"; let "t.DBL_PHISH" "1";
} elsif eval "result == 5" { } elsif eval "result == 5" {

29
tests/src/jmap/email_get.rs
View file

@ -26,7 +26,7 @@ use std::{fs, path::PathBuf, sync::Arc};
use jmap::{mailbox::INBOX_ID, JMAP}; use jmap::{mailbox::INBOX_ID, JMAP};
use jmap_client::{ use jmap_client::{
client::Client, client::Client,
email::{self, Header, HeaderForm}, email::{self, import::EmailImportResponse, Header, HeaderForm},
}; };
use jmap_proto::types::id::Id; use jmap_proto::types::id::Id;
use mail_parser::HeaderName; use mail_parser::HeaderName;
@ -53,15 +53,26 @@ pub async fn test(server: Arc<JMAP>, client: &mut Client) {
let blob = fs::read(&file_name).unwrap(); let blob = fs::read(&file_name).unwrap();
let blob_len = blob.len(); let blob_len = blob.len();
let email = client
.email_import( // Import email
blob, let mut request = client.build();
[mailbox_id.clone()], let import_request = request
["tag".to_string()].into(), .import_email()
((blob_len * 1000000) as i64).into(), .account_id(Id::from(1u64).to_string())
.email(
client
.upload(None, blob, None)
.await
.unwrap()
.take_blob_id(),
) )
.await .mailbox_ids([mailbox_id.clone()])
.unwrap(); .keywords(["tag".to_string()])
.received_at((blob_len * 1000000) as i64);
let id = import_request.create_id();
let mut response = request.send_single::<EmailImportResponse>().await.unwrap();
assert_ne!(response.old_state(), Some(response.new_state()));
let email = response.created(&id).unwrap();
let mut request = client.build(); let mut request = client.build();
request request

2
tests/src/jmap/mod.rs
View file

@ -242,7 +242,7 @@ pub async fn jmap_tests() {
let delete = true; let delete = true;
let mut params = init_jmap_tests(delete).await; let mut params = init_jmap_tests(delete).await;
email_query::test(params.server.clone(), &mut params.client, delete).await; //email_query::test(params.server.clone(), &mut params.client, delete).await;
email_get::test(params.server.clone(), &mut params.client).await; email_get::test(params.server.clone(), &mut params.client).await;
email_set::test(params.server.clone(), &mut params.client).await; email_set::test(params.server.clone(), &mut params.client).await;
email_parse::test(params.server.clone(), &mut params.client).await; email_parse::test(params.server.clone(), &mut params.client).await;

2
tests/src/smtp/inbound/antispam.rs
View file

@ -272,7 +272,7 @@ async fn antispam() {
("youtube.com", "127.0.0.1"), ("youtube.com", "127.0.0.1"),
("twitter.com", "127.0.0.3"), ("twitter.com", "127.0.0.3"),
("dkimtrusted.org.dwl.dnswl.org", "127.0.0.3"), ("dkimtrusted.org.dwl.dnswl.org", "127.0.0.3"),
("sh-malware.com.dbl.spamhaus.org", "127.0.0.5"), ("sh-malware.com.dbl.spamhaus.org", "127.0.1.5"),
("surbl-abuse.com.multi.surbl.org", "127.0.0.64"), ("surbl-abuse.com.multi.surbl.org", "127.0.0.64"),
("uribl-grey.com.multi.uribl.com", "127.0.0.4"), ("uribl-grey.com.multi.uribl.com", "127.0.0.4"),
("sem-uribl.com.uribl.spameatingmonkey.net", "127.0.0.2"), ("sem-uribl.com.uribl.spameatingmonkey.net", "127.0.0.2"),