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

Remove trailing dot from iprev ptr

Browse Source
This commit is contained in:
mdecimus
2023-10-21 18:46:48 +02:00
parent 4034c86344
commit eae3457f77
14 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/config/spamfilter/maps/scores.map
View File

@@ -127,15 +127,15 @@ HAS_X_SOURCE 0.0
HEADER_EMPTY_DELIMITER 1.0
HEADER_FORGED_MDN 2.0
HEADER_RCONFIRM_MISMATCH 2.0
HFILTER_FROMHOST_NORES_A_OR_MX 1.5
HFILTER_FROM_BOUNCE 0.0
HFILTER_HELO_BAREIP 3.0
HFILTER_HELO_IP_A 1.0
HFILTER_HELO_NORES_A_OR_MX 0.3
HFILTER_HELO_NOT_FQDN 2.0
HFILTER_HOSTNAME_UNKNOWN 2.5
HFILTER_RCPT_BOUNCEMOREONE 1.5
HFILTER_URL_ONLY 2.2
FROMHOST_NORES_A_OR_MX 1.5
FROM_BOUNCE 0.0
HELO_BAREIP 3.0
HELO_IP_A 1.0
HELO_NORES_A_OR_MX 0.3
HELO_NOT_FQDN 2.0
HELO_IPREV_MISMATCH 1.0
RCPT_BOUNCEMOREONE 1.5
URL_ONLY 2.2
HIDDEN_SOURCE_OBJ 2.0
HTML_META_REFRESH_URL 5.0
HTML_SHORT_LINK_IMG_1 2.0

2
resources/config/spamfilter/scripts/composites.sieve
View File

@@ -66,7 +66,7 @@ if eval "(t.FREEMAIL_FROM || t.FREEMAIL_ENVFROM || t.FREEMAIL_REPLYTO) && (t.TO_
let "t.FREEMAIL_AFF" "1";
}
if eval "t.HFILTER_URL_ONLY && t.REDIRECTOR_URL" {
if eval "t.URL_ONLY && t.REDIRECTOR_URL" {
let "t.REDIRECTOR_URL_ONLY" "1";
}

6
resources/config/spamfilter/scripts/from.sieve
View File

@@ -57,12 +57,12 @@ if eval "from_count > 0" {
(from_local == 'postmaster' ||
from_local == 'mailer-daemon' ||
from_local == 'root')" {
let "t.HFILTER_FROM_BOUNCE" "1";
let "t.FROM_BOUNCE" "1";
}
if eval "(!is_empty(envelope.from) &&
eq_ignore_case(from_addr, envelope.from)) ||
(t.HFILTER_FROM_BOUNCE &&
(t.FROM_BOUNCE &&
!is_empty(from_domain) &&
from_domain_sld == helo_domain_sld)" {
let "t.FROM_EQ_ENVFROM" "1";
@@ -133,7 +133,7 @@ if eval "!is_empty(envelope.from)" {
# Mail from no resolve to A or MX
if eval "!dns_exists(envfrom_domain, 'mx') && !dns_exists(envfrom_domain, 'ip')" {
let "t.HFILTER_FROMHOST_NORES_A_OR_MX" "1";
let "t.FROMHOST_NORES_A_OR_MX" "1";
}
}

12
resources/config/spamfilter/scripts/helo.sieve
View File

@@ -3,12 +3,12 @@ if eval "!is_ip_addr(env.helo_domain)" {
if eval "contains(helo, '.')" {
if eval "!is_empty(env.iprev.ptr) && !eq_ignore_case(helo, env.iprev.ptr)" {
# Unknown client hostname (PTR or FCrDNS verification failed)
let "t.HFILTER_HOSTNAME_UNKNOWN" "1";
# Helo does not match reverse IP
let "t.HELO_IPREV_MISMATCH" "1";
}
if eval "!dns_exists(helo, 'ip') && !dns_exists(helo, 'mx')" {
# Helo no resolve to A or MX
let "t.HFILTER_HELO_NORES_A_OR_MX" "1";
let "t.HELO_NORES_A_OR_MX" "1";
}
} else {
if eval "contains(helo, 'user')" {
@@ -17,14 +17,14 @@ if eval "!is_ip_addr(env.helo_domain)" {
}
# Helo not FQDN
let "t.HFILTER_HELO_NOT_FQDN" "1";
let "t.HELO_NOT_FQDN" "1";
}
} else {
# Helo host is bare ip
let "t.HFILTER_HELO_BAREIP" "1";
let "t.HELO_BAREIP" "1";
if eval "env.helo_domain != env.remote_ip" {
# Helo A IP != hostname IP
let "t.HFILTER_HELO_IP_A" "1";
let "t.HELO_IP_A" "1";
}
}

5
resources/config/spamfilter/scripts/mime.sieve
View File

@@ -105,11 +105,12 @@ foreverypart {
}
} else {
if eval "cte == 'base64'" {
# Has text part encoded in base64
let "t.MIME_BASE64_TEXT" "1";
if eval "is_ascii(part.text)" {
# Has text part encoded in base64 that does not contain any 8bit characters
let "t.MIME_BASE64_TEXT_BOGUS" "1";
} else {
# Has text part encoded in base64
let "t.MIME_BASE64_TEXT" "1";
}
}

2
resources/config/spamfilter/scripts/recipient.sieve
View File

@@ -146,7 +146,7 @@ if eval "rcpt_count > 0" {
(is_empty(envelope.from) ||
envfrom_local == 'postmaster' ||
envfrom_local == 'mailer-daemon')" {
let "t.HFILTER_RCPT_BOUNCEMOREONE" "1";
let "t.RCPT_BOUNCEMOREONE" "1";
}
# Check for sorted recipients

2
resources/config/spamfilter/scripts/url.sieve
View File

@@ -1,5 +1,5 @@
if eval "(count(body_urls) == 1 || count(html_body_urls) == 1) && count(tokenize(text_body, 'words')) == 0" {
let "t.HFILTER_URL_ONLY" "1";
let "t.URL_ONLY" "1";
}
if eval "has_zwsp(urls)" {