Skip authenticated users, reorder filters to allow optimizations,allow everything for postmaster and remove spamd result from local headers

This commit is contained in:
Alex D. 2021-02-14 03:00:24 +00:00
parent 0dd8360b9f
commit 097636b04c
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
3 changed files with 20 additions and 7 deletions

View File

@ -6,7 +6,7 @@ _configpath="/etc/rspamd/redxen"
. ../APKBUILD-config.common
pkgver=2021.02.14
pkgrel=2
pkgrel=6
_baseconf="
rspamd.conf
composites.conf
@ -55,14 +55,14 @@ a3849ae55a68c90afd913ed18f6b210803f5dbaa2beab5abf23a84b9b4bcb48e617023123724222c
a753d136a21206cdc28a1554a38f51ad55e2eec842a31dbe1d151198bb8d9bb090e0f49b6b50cbc44e5011efb2ebeb2d2657a54df2f1a0c89ce3134fbd55220c ratelimit.conf
6ca83b91e70e43eff6de380065fc5591c6669a27497a47d74e5e096df68afea6269cfad41be982bb144f2dfb92fd5765a600cf9c4067c4612bd1aa1bf5e6ebfd phishing.conf
47907ec7d9d9d2775d7feeef448d53940e3e21b0e5cc17e40663e2cbac42e4e8a29eb53a956ffbca3f425c3b4673192354b3be2e575a0b8e8014efdd5b957e6d mx_check.conf
932c0dc5ae47ecc470c0a5eb684c5d24f95a75dec09e4ee3e191b0cfa274a4a9e343ed012afeb83d405df802792f9c5a3ad11c73bb933d40210c9e149314c12b milter_headers.conf
985c0796cd3adaf5ddd8cb8854e06deff7527730efd60e91bb8ef9ca1504601ba2677b2265fa4acc86dec1f8a2732c32d0f2d790611c52e50b361bd852a68ce2 milter_headers.conf
08966d0a3c077a12a1113f774e11d51d3c7d04bb45914e295324e8aa51c3d75b55395c256a905c6d9ae1e98a004a9e6b3b37d36fce810a426dd5d90408331c0a maillist.conf
8660fd01589476bbc01bbe75bed392faa55f55fa9b6fea77be79f339cefb43ddbacdbe193ad136c42da91d4ef7f1e1ec40fc5f8f4f398d04bcebf51d5a59ad1f greylist.conf
17fec11d41106909dfb7bd790ff12b4f546d2b1e6c06205ea48ecf2b82ce028710fd6ca636f414c0fe35dda99257c20eaed4d4ff90cdcc0a86d552f98cb26d15 fuzzy_check.conf
e14c3683b48dde5584cbcd0bd5811f6111a201635dd7400d7703003b4c98255d10be9b64ee81784c1fe1df50159e12d6777086c5a18ee9b14be852d233cf6dc5 dmarc.conf
ad3fa5e3c4c3d7b882c9e85bdde3b1949a32f2f2c9dd43e38977d828e7b6740d31002c502f24a0ea2e27105d5a6b1af7b7140c5d8e306f90c3f7d28c1e4607d5 dkim.conf
dcec5c53bd29c345ed5c47727af9a8d11328cc8f69ae61064ba3b053ee306baa79b747067097b2354a1fecd6e6527d56d14c79be22c94531f2a5ddc41ce3ca7e chartable.conf
1afa7428637e7f3a8c2906c5693d25259e1635540a049af3db12becce19d6ea97abf056f97d21e455a83b0a7a723a2aa2a1ea4c0d1f7a4072005a16306525636 rspamd.conf
813d2d707af4eb5d26e7749919b4d54e3b33c2d17bd6232270d4121d259f0c1f7849b8426628510b2770931f4b2bc8982c660f7f625cf7d304fc30be885fa822 rspamd.conf
667ec0331c811730e096e27f5e8659062239f46e3ccd148411984bb4d83b8770cc0d7d3c74dd5a2da71781e9b99d4bcb5a700cbd5f56ae8e17f7c4e50519ffb2 composites.conf
5f193596d1d9827b194a2ea4a9b06b729450ca7e77e8049ad9c53be99b5e28fc95fd69a2c4b639691bacd6aef099f8c69ee364f1ecd902f256f64c25ad9d3374 groups.conf
78df39cbc6e09cdc5e01d27e123d82aa677a70a6f5d59ba0be8d0ce6af012c5311e4a2527e4fbc586f9cdd8da033e9f05e2371970fa23db60eaa8c16c8e85f05 logging.conf

View File

@ -1,10 +1,9 @@
milter_headers {
skip_local = false;
skip_authenticated = false;
skip_authenticated = true;
extended_spam_headers = false;
use = ["x-spamd-result", "authentication-results"];
authenticated_headers = ["authentication-results"];
local_headers = ["x-spamd-result"];
spf_symbols {
pass = "R_SPF_ALLOW";
fail = "R_SPF_FAIL";

View File

@ -1,6 +1,6 @@
options {
pidfile = "$RUNDIR/rspamd.pid";
filters = "chartable,dkim,dmarc,greylist,maillist,milter_headers,phishing,rbl,redis,spf,ratelimit,bayes_expiry,mx_check,fuzzy_check";
filters = "ratelimit,phishing,mx_check,fuzzy_check,chartable,dkim,dmarc,maillist,rbl,spf,greylist,milter_headers,redis";
raw_mode = false;
one_shot = false;
cache_file = "$DBDIR/symbols.cache";
@ -23,7 +23,7 @@ options {
"X-MimeOLE",
];
history_rows = 200;
explicit_modules = ["settings"];
explicit_modules = ["settings","bayes_expiry"];
# Scan messages even if they are not MIME
allow_raw_input = true;
@ -39,6 +39,20 @@ options {
# Timeout for messages processing (must be larger than any internal timeout used)
task_timeout = 8s;
whitelist {
priority = low;
rcpt = "postmaster";
want_spam = yes;
}
authenticated {
priority = high;
authenticated = yes;
apply {
groups_disabled = ["rbl", "spf"];
}
}
# Emit soft reject when timeout takes place
soft_reject_on_timeout = true;
}