RedXen
/
aports
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix force_actions and reorder filters, offload action handling based on symbols from dkim module

This commit is contained in:
Alex D. 2022-03-20 16:45:30 +00:00
parent 7a1ef43ddd
commit 35a0f0c364
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
4 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/rspamd/APKBUILD
View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2022.03.11.01
pkgver=2022.03.20.01
pkgrel=0
_baseconf="
rspamd.conf
@ -66,13 +66,13 @@ a753d136a21206cdc28a1554a38f51ad55e2eec842a31dbe1d151198bb8d9bb090e0f49b6b50cbc4
08966d0a3c077a12a1113f774e11d51d3c7d04bb45914e295324e8aa51c3d75b55395c256a905c6d9ae1e98a004a9e6b3b37d36fce810a426dd5d90408331c0a maillist.conf
8dc0e553cdb92517b22767cbef085afb35d67389d5225bec791b0239452b69f9adbc12edfa6319670099de82ba09d9a4b1d54d90c5534e28f1008b391e1bdb12 hfilter.conf
8660fd01589476bbc01bbe75bed392faa55f55fa9b6fea77be79f339cefb43ddbacdbe193ad136c42da91d4ef7f1e1ec40fc5f8f4f398d04bcebf51d5a59ad1f greylist.conf
d8981456a4472f324ee3cd94098bc898f3b0c7ba9d70d89b1bf496e1293faa5b64fe832e1badf4d17c50137383cb5ef815b9ecd0b1ee11c1a819fc00c9e9a037 force_actions.conf
30f2153b379485446d3c59b4cbf748740b9a3eb7ec9a48c80b1b077a9ae6b7f198b608bcff2dbed707cf72f7064983c0c6bbfd5e52a2501c2c9f62f4e4feaba1 force_actions.conf
17fec11d41106909dfb7bd790ff12b4f546d2b1e6c06205ea48ecf2b82ce028710fd6ca636f414c0fe35dda99257c20eaed4d4ff90cdcc0a86d552f98cb26d15 fuzzy_check.conf
e14c3683b48dde5584cbcd0bd5811f6111a201635dd7400d7703003b4c98255d10be9b64ee81784c1fe1df50159e12d6777086c5a18ee9b14be852d233cf6dc5 dmarc.conf
edc76ef05c986aca3ef98cd0a6fac95c0c2d9fe3bc37f1b699de9f5261a81e9b076168b0fc020ba8d313c23b2a3f77cdbe78b099d385b6777db72ded2a525621 dmarc.conf
ad3fa5e3c4c3d7b882c9e85bdde3b1949a32f2f2c9dd43e38977d828e7b6740d31002c502f24a0ea2e27105d5a6b1af7b7140c5d8e306f90c3f7d28c1e4607d5 dkim.conf
dcec5c53bd29c345ed5c47727af9a8d11328cc8f69ae61064ba3b053ee306baa79b747067097b2354a1fecd6e6527d56d14c79be22c94531f2a5ddc41ce3ca7e chartable.conf
eacbbe96fdfea9112b633bdf5471fcf8b2c297513685397759d588ad47905cf225dae3e4262dacb14477a2f52e6d3bf93b57abaf205719481f11a9ec8552fe07 arc.conf
7c64de1547869ebee9ee055cc7f4e9348c4bb996d83315a83c628aa12820eab16de9ddee364def049bfe07eaf1bdfa0f932947ddf357dccf4e08c325d494aaf4 rspamd.conf
30213e30941be39203e63bb2bd25c66d7b8ce85a8ff11cdfa16cc98a2edbead4daa43d39a01fef8e7365a2e6dca98350807a64404a94ace1f02271e8b4c9e511 rspamd.conf
edae8f99503c6396df0bc59b581e6e324c9f4d666dc5dcbb9721c1b806e62627470c086b8780d7f7040b22655f2a25aaec6edb261c56e6fc9f091d75afadcf7f composites.conf
85470ad10b9b10573b9e0338044a0cc9b8c0de91503fab7b803b9dcfe60fc396622eb40bc146be1ebcf6fb4b3a17206d40c0cb99f9958b1cb87c50082fda6f22 groups.conf
99d6b2b173ac5b62977562bb3f2d04cf29d3d94329a4b2abc120e6cca6da79d5ac2a35a16832f62b8e1fed331b6724f21b5e1aab076bd3c57b28b2261302238a logging.conf

4
config/rspamd/modules/dmarc.conf
View File

@ -1,8 +1,4 @@
dmarc {
reporting = true;
send_reports = false;
actions = {
quarantine = "add_header";
reject = "reject";
}
}

104
config/rspamd/modules/force_actions.conf
View File

@ -1,53 +1,55 @@
rules {
DMARC_POLICY_REJECT {
action = "reject";
message = "DMARC failed"
}
DMARC_POLICY_SOFTFAIL {
action = "soft reject";
message = "DMARC failed temporarily, please retry later"
}
DMARC_POLICY_QUARANTINE {
action = "add header";
}
ARC_REJECT {
action = "reject";
message = "ARC failed"
}
FORGED_ANY {
action = "reject";
message = "You may not send mails with a forged/modified sender/reciever here."
}
RBL_SPAMHAUS_DROP_ANY {
action = "reject";
message = "Mail sender / contents are listed on SPAMHAUS DROP"
}
RBL_SPAMHAUS_XBL_ANY {
action = "soft reject";
message = "Mail sender / contents are listed on SPAMHAUS XBL"
}
URIBL_BLACK {
action = "reject"
message = "You are listed on URIBL black"
}
URIBL_GREY {
action = "soft reject"
message = "You are listed on URIBL grey"
}
RBL_MAILSPIKE_BAD {
action = "soft reject"
message = "You are listed on Mailspike as bad"
}
RBL_MAILSPIKE_VERYBAD {
action = "reject"
message = "You are listed on Mailspike as very bad"
}
RBL_MAILSPIKE_WORST {
action = "reject"
message = "You are listed on Mailspike as worst"
}
SPAMTRAP {
action = "reject"
message = "Thank you kind sir"
force_actions {
rules {
DMARC_POLICY_REJECT {
action = "reject";
message = "DMARC failed"
}
DMARC_POLICY_SOFTFAIL {
action = "soft reject";
message = "DMARC failed temporarily, please retry later"
}
DMARC_POLICY_QUARANTINE {
action = "add header";
}
ARC_REJECT {
action = "reject";
message = "ARC failed"
}
FORGED_ANY {
action = "reject";
message = "You may not send mails with a forged/modified sender/reciever here."
}
RBL_SPAMHAUS_DROP_ANY {
action = "reject";
message = "Mail sender / contents are listed on SPAMHAUS DROP"
}
RBL_SPAMHAUS_XBL_ANY {
action = "soft reject";
message = "Mail sender / contents are listed on SPAMHAUS XBL"
}
URIBL_BLACK {
action = "reject"
message = "You are listed on URIBL black"
}
URIBL_GREY {
action = "soft reject"
message = "You are listed on URIBL grey"
}
RBL_MAILSPIKE_BAD {
action = "soft reject"
message = "You are listed on Mailspike as bad"
}
RBL_MAILSPIKE_VERYBAD {
action = "reject"
message = "You are listed on Mailspike as very bad"
}
RBL_MAILSPIKE_WORST {
action = "reject"
message = "You are listed on Mailspike as worst"
}
SPAMTRAP {
action = "reject"
message = "Thank you kind sir"
}
}
}

2
config/rspamd/rspamd.conf
View File

@ -1,6 +1,6 @@
options {
pidfile = "$RUNDIR/rspamd.pid";
filters = "ratelimit,phishing,mx_check,fuzzy_check,chartable,dkim,arc,dmarc,maillist,rbl,spf,hfilter,forged_recipients,force_actions,greylist,milter_headers,redis";
filters = "ratelimit,mx_check,dkim,spf,arc,dmarc,maillist,fuzzy_check,chartable,phishing,rbl,hfilter,forged_recipients,force_actions,greylist,milter_headers,redis";
raw_mode = false;
one_shot = false;
cache_file = "$DBDIR/symbols.cache";