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

Spam filter adjustements

Browse Source
This commit is contained in:
mdecimus
2023-10-23 17:19:16 +02:00
parent eae3457f77
commit 73ccf7be65
13 changed files with 115 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/resources/smtp/antispam/combined.test
View File

@@ -6,9 +6,9 @@ spf.result none
spf_ehlo.result none
dmarc.result none
remote_ip 195.210.29.48
expect_header X-Spam-Status Yes, score=7.
expect_header X-Spam-Status Yes, score=8.
expect_header X-Spam-Result
expect auth_na dmarc_na helo_nores_a_or_mx once_received mid_rhs_match_from r_spf_na has_data_uri arc_na subject_has_exclaim subject_ends_exclaim rdns_dnsfail mime_html_only html_short_link_img_1 to_dn_none rcpt_count_one to_match_envrcpt_all fromhost_nores_a_or_mx rcvd_count_zero from_eq_envfrom r_dkim_na rcvd_no_tls_last from_has_dn date_in_past
expect rdns_none auth_na dmarc_na helo_nores_a_or_mx once_received mid_rhs_match_from spf_na has_data_uri arc_na subject_has_exclaim subject_ends_exclaim mime_html_only html_short_link_img_1 to_dn_none rcpt_count_one to_match_envrcpt_all fromhost_nores_a_or_mx rcvd_count_zero from_eq_envfrom dkim_na rcvd_no_tls_last from_has_dn date_in_past
From: Client Services <noreply@tetheer.com>
To: licensing@stalw.art
@@ -52,7 +52,7 @@ remote_ip 185.58.86.181
tls.version TLSv1.3
expect_header X-Spam-Status No, score=4.
expect_header X-Spam-Result
expect from_eq_envfrom from_has_dn helo_nores_a_or_mx forged_rcvd_trail date_in_past arc_na uri_count_odd dkim_signed has_attachment r_spf_allow rcvd_tls_last rcpt_count_one mime_good subject_ends_spaces fromhost_nores_a_or_mx to_dn_eq_addr_all r_dkim_allow dmarc_policy_allow rcvd_count_three to_match_envrcpt_all
expect from_eq_envfrom from_has_dn helo_nores_a_or_mx forged_rcvd_trail date_in_past arc_na uri_count_odd dkim_signed has_attachment spf_allow rcvd_tls_last rcpt_count_one mime_good subject_ends_spaces fromhost_nores_a_or_mx to_dn_eq_addr_all dkim_allow dmarc_policy_allow rcvd_count_three to_match_envrcpt_all
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenthrevolution.com;
s=mimecast20200102; t=1669138703;
@@ -627,7 +627,7 @@ remote_ip 51.89.165.39
tls.version TLS1_2
expect_header X-Spam-Status Yes, score=13.
expect_header X-Spam-Result
expect has_replyto violated_direct_spf replyto_addr_eq_from once_received r_parts_differ mid_rhs_match_from fromhost_nores_a_or_mx from_has_dn r_dkim_allow date_in_past to_match_envrcpt_all html_short_link_img_1 rcpt_count_one arc_na helo_nores_a_or_mx r_spf_softfail rcvd_tls_last rcvd_count_zero replyto_dom_eq_from_dom to_dn_none has_list_unsub dkim_signed rdns_none from_eq_envfrom dmarc_policy_reject
expect has_replyto violated_direct_spf replyto_addr_eq_from once_received r_parts_differ mid_rhs_match_from fromhost_nores_a_or_mx from_has_dn dkim_allow date_in_past to_match_envrcpt_all html_short_link_img_1 rcpt_count_one arc_na helo_nores_a_or_mx spf_softfail rcvd_tls_last rcvd_count_zero replyto_dom_eq_from_dom to_dn_none has_list_unsub dkim_signed rdns_none from_eq_envfrom dmarc_policy_reject
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=sectionalism; d=grupokonecta.net;
h=To:Subject:Message-ID:Date:From:Reply-To:MIME-Version:List-Unsubscribe:

30
tests/resources/smtp/antispam/dmarc.test
View File

@@ -1,4 +1,4 @@
expect DMARC_NA R_SPF_NA R_DKIM_NA ARC_NA
expect DMARC_NA SPF_NA DKIM_NA ARC_NA
Subject: test
@@ -9,7 +9,7 @@ spf.result pass
dkim.result pass
arc.result pass
dmarc.result pass
expect DKIM_SIGNED ARC_SIGNED R_DKIM_ALLOW R_SPF_ALLOW ARC_ALLOW DMARC_POLICY_ALLOW
expect DKIM_SIGNED ARC_SIGNED DKIM_ALLOW SPF_ALLOW ARC_ALLOW DMARC_POLICY_ALLOW
DKIM-Signature: abc
ARC-Seal: xyz
@@ -23,7 +23,7 @@ dkim.result fail
arc.result fail
dmarc.result fail
dmarc.policy quarantine
expect R_SPF_FAIL ARC_REJECT R_DKIM_REJECT DMARC_POLICY_QUARANTINE
expect SPF_FAIL ARC_REJECT DKIM_REJECT DMARC_POLICY_QUARANTINE
Subject: test
@@ -35,7 +35,7 @@ dkim.result temperror
arc.result permerror
dmarc.result fail
dmarc.policy reject
expect R_DKIM_TEMPFAIL R_SPF_NEUTRAL ARC_INVALID DMARC_POLICY_REJECT
expect DKIM_TEMPFAIL SPF_NEUTRAL ARC_INVALID DMARC_POLICY_REJECT
Subject: test
@@ -46,7 +46,7 @@ spf.result softfail
dkim.result permerror
arc.result temperror
dmarc.result permerror
expect ARC_DNSFAIL DMARC_BAD_POLICY R_DKIM_PERMFAIL R_SPF_SOFTFAIL
expect ARC_DNSFAIL DMARC_BAD_POLICY DKIM_PERMFAIL SPF_SOFTFAIL
Subject: test
@@ -55,7 +55,7 @@ Test
dmarc.result pass
dkim.result pass
spf.result pass
expect ALLOWLIST_DMARC DMARC_POLICY_ALLOW R_DKIM_ALLOW R_SPF_ALLOW ARC_NA
expect ALLOWLIST_DMARC DMARC_POLICY_ALLOW DKIM_ALLOW SPF_ALLOW ARC_NA
From: user@dmarc-allow.org
Subject: test
@@ -66,7 +66,7 @@ Test
dmarc.result fail
dkim.result fail
spf.result fail
expect BLOCKLIST_DMARC DMARC_POLICY_SOFTFAIL R_DKIM_REJECT R_SPF_FAIL ARC_NA
expect BLOCKLIST_DMARC DMARC_POLICY_SOFTFAIL DKIM_REJECT SPF_FAIL ARC_NA
From: user@dmarc-allow.org
Subject: test
@@ -77,7 +77,7 @@ Test
dkim.result pass
dkim.domains spf-dkim-allow.org
spf.result pass
expect ALLOWLIST_SPF_DKIM R_DKIM_ALLOW R_SPF_ALLOW ARC_NA DMARC_NA
expect ALLOWLIST_SPF_DKIM DKIM_ALLOW SPF_ALLOW ARC_NA DMARC_NA
From: user@spf-dkim-allow.org
Subject: test
@@ -87,7 +87,7 @@ Test
dkim.result pass
spf.result pass
arc.result pass
expect ALLOWLIST_SPF_DKIM R_DKIM_ALLOW R_SPF_ALLOW ARC_ALLOW DMARC_NA
expect ALLOWLIST_SPF_DKIM DKIM_ALLOW SPF_ALLOW ARC_ALLOW DMARC_NA
From: user@spf-dkim-allow.org
Subject: test
@@ -96,7 +96,7 @@ Test
<!-- NEXT TEST -->
spf.result pass
dkim.result fail
expect ALLOWLIST_SPF BLOCKLIST_DKIM R_DKIM_REJECT R_SPF_ALLOW ARC_NA DMARC_NA
expect ALLOWLIST_SPF BLOCKLIST_DKIM DKIM_REJECT SPF_ALLOW ARC_NA DMARC_NA
From: user@spf-dkim-allow.org
Subject: test
@@ -105,7 +105,7 @@ Test
<!-- NEXT TEST -->
spf.result pass
dkim.result temperror
expect ALLOWLIST_SPF R_DKIM_TEMPFAIL R_SPF_ALLOW ARC_NA DMARC_NA
expect ALLOWLIST_SPF DKIM_TEMPFAIL SPF_ALLOW ARC_NA DMARC_NA
From: user@spf-dkim-allow.org
Subject: test
@@ -115,7 +115,7 @@ Test
dkim.result pass
dkim.domains spf-dkim-allow.org
spf.result fail
expect BLOCKLIST_SPF ALLOWLIST_DKIM R_DKIM_ALLOW R_SPF_FAIL ARC_NA DMARC_NA
expect BLOCKLIST_SPF ALLOWLIST_DKIM DKIM_ALLOW SPF_FAIL ARC_NA DMARC_NA
From: user@spf-dkim-allow.org
Subject: test
@@ -125,7 +125,7 @@ Test
dkim.result pass
dkim.domains spf-dkim-allow.org
spf.result temperror
expect ALLOWLIST_DKIM R_DKIM_ALLOW R_SPF_DNSFAIL ARC_NA DMARC_NA
expect ALLOWLIST_DKIM DKIM_ALLOW SPF_DNSFAIL ARC_NA DMARC_NA
From: user@spf-dkim-allow.org
Subject: test
@@ -134,7 +134,7 @@ Test
<!-- NEXT TEST -->
dkim.result fail
spf.result fail
expect BLOCKLIST_SPF_DKIM R_DKIM_REJECT R_SPF_FAIL ARC_NA DMARC_NA
expect BLOCKLIST_SPF_DKIM DKIM_REJECT SPF_FAIL ARC_NA DMARC_NA
From: user@spf-dkim-allow.org
Subject: test
@@ -143,7 +143,7 @@ Test
<!-- NEXT TEST -->
dkim.result temperror
spf.result temperror
expect R_DKIM_TEMPFAIL R_SPF_DNSFAIL ARC_NA DMARC_NA
expect DKIM_TEMPFAIL SPF_DNSFAIL ARC_NA DMARC_NA
From: user@spf-dkim-allow.org
Subject: test

32
tests/resources/smtp/antispam/pyzor.test
View File

@@ -18,3 +18,35 @@ Subject: test
TestX TestY TestZ TestW
<!-- NEXT TEST -->
expect
MIME-Version: 1.0
X-Received: by 2002:a05:6870:c7a6:b0:1e9:8f74:ce15 with SMTP id
dy38-20020a056870c7a600b001e98f74ce15mr2429202oab.11.1697967052502; Sun, 22
Oct 2023 02:30:52 -0700 (PDT)
Date: Sat, 21 Oct 2023 16:59:59 -0700
Message-ID: <17434871060391156945@google.com>
Subject: Report domain: stalw.art Submitter: google.com Report-ID: 17434871060391156945
From: noreply-dmarc-support@google.com
To: domains@stalw.art
Content-Type: application/zip;
name="google.com!stalw.art!1697846400!1697932799.zip"
Content-Disposition: attachment;
filename="google.com!stalw.art!1697846400!1697932799.zip"
Content-Transfer-Encoding: base64
UEsDBAoAAAAIABdJVldhOnFiLAIAAG4JAAAuAAAAZ29vZ2xlLmNvbSFzdGFsdy5hcnQhMTY5Nzg0
NjQwMCExNjk3OTMyNzk5LnhtbO1WwXKbMBC95ys8vhshDBgYRempX9CeGRkE1hgkjSTs5O8rIgnT
pMl0ptOcfEK83X27+/TwGD09j8PmQpVmgj9uYRRvN5Q3omW8f9z+/PF9V2w3T/gBdZS2R9Kc8cNm
gxSVQpl6pIa0xJAZs6hQfc3JSHEvRD/QqBEjAgvocuhI2IC5sAzDy64diWp2epIz3bd1mcvzNc9G
kboR3JDG1Ix3Ap+MkboCwJdGt1JAAOH6ShVI0jzPithyva93xH4N1mJ4SPdpcYBxHu9LCLO8TDME
bnGXb3eltSK899tY6Eh7xjHMy0OR5mlsuzkkxClvX6PlPjmUpZ2FBzLwO9vSbS0qkmJgzUstp+PA
9IkugwgrD8fakOEaEWUsmUNcmLRnNmKFgDt4UMvuFZufDpL2IjhFQPp3HQAdENkYDOet5oODeEji
0s39pxmttI1QYVwlrosgWkyqoTWTGO6zCBYwgmUWJbHV5hYKyY2YuMF7BNwhwL4jvZBhsiK2ITAr
w7QUmhnrZj/mGlnlzcJIorVNWDTyInQ+sAi12vJNT3trYTfEWsoN65j9lpayEyUtVXWnxLi+rTXs
ed5VIzKZU62ongZzI3wz7OdG8CafGfxK/mW1LR1oY4TCFzqwM9NKEp4kdveALwKsO6OVNP88xUpo
6843S8/JwUl/Y6qExHEF0yyu0iJPqySuqiQ9fOwt+OXe6uwP291b/8FbTtiv9RZM87u37t76zFsI
3P46/QJQSwECCgAKAAAACAAXSVZXYTpxYiwCAABuCQAALgAAAAAAAAAAAAAAAAAAAAAAZ29vZ2xl
LmNvbSFzdGFsdy5hcnQhMTY5Nzg0NjQwMCExNjk3OTMyNzk5LnhtbFBLBQYAAAAAAQABAFwAAAB4
AgAAAAA=

6
tests/resources/smtp/antispam/url.test
View File

@@ -16,13 +16,13 @@ Subject: test
my site is https://192.168.1.1
<!-- NEXT TEST -->
expect OMOGRAPH_URL
expect HOMOGRAPH_URL
Subject: test
my site is https://xn--youtue-tg7b.com
<!-- NEXT TEST -->
expect R_MIXED_CHARSET_URL
expect MIXED_CHARSET_URL
Subject: test
@@ -40,7 +40,7 @@ Subject: nested redirect
login to https://redirect.com/?https://redirect.org/?https://redirect.net/?https://redirect.io/?https://redirect.me/?https://redirect.com
<!-- NEXT TEST -->
expect REDIRECTOR_URL OMOGRAPH_URL
expect REDIRECTOR_URL HOMOGRAPH_URL
Subject: redirect to omograph

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

@@ -38,7 +38,7 @@ no-capability-check = true
redirects = 3
out-messages = 5
received-headers = 50
cpu = 10000
cpu = 500000
nested-includes = 5
duplicate-expiry = "7d"