You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2022/05/04 11:06:22 UTC
svn commit: r1900547 - in /spamassassin/trunk: ./ t/ t/data/ t/data/spam/
Author: sidney
Date: Wed May 4 11:06:22 2022
New Revision: 1900547
URL: http://svn.apache.org/viewvc?rev=1900547&view=rev
Log:
bug 7982 fix tests failing when run from release tarball, removing dependency on rules that are in trunk
Modified:
spamassassin/trunk/MANIFEST
spamassassin/trunk/t/askdns.t
spamassassin/trunk/t/blacklist_autolearn.t
spamassassin/trunk/t/blocklist_autolearn.t
spamassassin/trunk/t/data/01_test_rules.cf
spamassassin/trunk/t/data/spam/razor2
spamassassin/trunk/t/dcc.t
spamassassin/trunk/t/dkim.t
spamassassin/trunk/t/dmarc.t
spamassassin/trunk/t/header_utf8.t
spamassassin/trunk/t/originating_ip_hdr.t
spamassassin/trunk/t/priorities.t
spamassassin/trunk/t/priorities_welcome_block.t
spamassassin/trunk/t/pyzor.t
spamassassin/trunk/t/razor2.t
spamassassin/trunk/t/reportheader.t
spamassassin/trunk/t/shortcircuit.t
spamassassin/trunk/t/spamd_welcomelist_leak.t
spamassassin/trunk/t/spamd_whitelist_leak.t
spamassassin/trunk/t/spf.t
spamassassin/trunk/t/spf_welcome_block.t
spamassassin/trunk/t/sql_based_welcomelist.t
spamassassin/trunk/t/sql_based_whitelist.t
spamassassin/trunk/t/trust_path.t
spamassassin/trunk/t/welcomelist_addrs.t
spamassassin/trunk/t/welcomelist_from.t
spamassassin/trunk/t/welcomelist_subject.t
spamassassin/trunk/t/welcomelist_to.t
spamassassin/trunk/t/whitelist_addrs.t
spamassassin/trunk/t/whitelist_from.t
spamassassin/trunk/t/whitelist_subject.t
spamassassin/trunk/t/whitelist_to.t
spamassassin/trunk/t/wlbl_uri.t
Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Wed May 4 11:06:22 2022
@@ -153,6 +153,7 @@ rules/v341.pre
rules/v342.pre
rules/v343.pre
rules/v400.pre
+rules/20_aux_tlds.cf
rules-extras/README.txt
rules-extras/10_uridnsbl_skip_financial.cf
sa-awl.raw
Modified: spamassassin/trunk/t/askdns.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/askdns.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/askdns.t (original)
+++ spamassassin/trunk/t/askdns.t Wed May 4 11:06:22 2022
@@ -26,6 +26,7 @@ plan tests => $tests;
if (HAS_DKIM_VERIFIER) {
tstlocalrules(q{
+ full DKIM_SIGNED eval:check_dkim_signed()
askdns ASKDNS_DKIM_AUTHORDOMAIN _AUTHORDOMAIN_.askdnstest.spamassassin.org. A /^127\.0\.0\.8$/
askdns ASKDNS_DKIM_DKIMDOMAIN _DKIMDOMAIN_.askdnstest.spamassassin.org. A /^127\.0\.0\.8$/
# Bug 7897 - test that meta rules depending on net rules hit
Modified: spamassassin/trunk/t/blacklist_autolearn.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/blacklist_autolearn.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/blacklist_autolearn.t (original)
+++ spamassassin/trunk/t/blacklist_autolearn.t Wed May 4 11:06:22 2022
@@ -17,6 +17,12 @@ disable_compat "welcomelist_blocklist";
);
tstprefs ('
+ header USER_IN_BLOCKLIST eval:check_from_in_blocklist()
+ tflags USER_IN_BLOCKLIST userconf nice noautolearn
+ meta USER_IN_BLACKLIST (USER_IN_BLOCKLIST)
+ tflags USER_IN_BLACKLIST userconf nice noautolearn
+ score USER_IN_BLACKLIST 100
+ score USER_IN_BLOCKLIST 0.01
blacklist_from *@ximian.com
');
Modified: spamassassin/trunk/t/blocklist_autolearn.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/blocklist_autolearn.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/blocklist_autolearn.t (original)
+++ spamassassin/trunk/t/blocklist_autolearn.t Wed May 4 11:06:22 2022
@@ -15,6 +15,9 @@ use Test::More tests => 3;
);
tstprefs ('
+ header USER_IN_BLOCKLIST eval:check_from_in_blocklist()
+ tflags USER_IN_BLOCKLIST userconf nice noautolearn
+ score USER_IN_BLOCKLIST 100
blacklist_from *@ximian.com
');
Modified: spamassassin/trunk/t/data/01_test_rules.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.cf?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.cf (original)
+++ spamassassin/trunk/t/data/01_test_rules.cf Wed May 4 11:06:22 2022
@@ -18,7 +18,19 @@
# limitations under the License.
# </...@LICENSE>
-# Disable dcc/razor/pyzor by default
+# This file defines a subset of the default configuration and rules that tests can count on
+# If you need something else in a test, use tstpre, tstlocalrules, or tstprefs in the test
+# instead of adding it here, so tests can be more self-contained and maintainable.
+
+clear_report_template
+report _SUMMARY_
+
+clear_headers
+
+add_header spam Flag _YESNOCAPS_
+add_header all Level _STARS(*)_
+add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_"
+
ifplugin Mail::SpamAssassin::Plugin::DCC
use_dcc 0
endif
@@ -100,12 +112,3 @@ redirector_pattern /^http:\/\/redir
redirector_pattern /^http:\/\/(?:.*?\.)?adtech\.de\/.*(?:;|\|)link=(.*?)(?:;|$)/i
redirector_pattern m'^http.*?/redirect\.php\?.*(?<=[?&])goto=(.*?)(?:$|[&\#])'i
redirector_pattern m'^https?:/*(?:[^/]+\.)?emf\d\.com/r\.cfm.*?&r=(.*)'i
-
-ifplugin Mail::SpamAssassin::Plugin::DKIM
-adsp_override sa-test-nxd.spamassassin.org nxdomain
-adsp_override sa-test-unk.spamassassin.org unknown
-adsp_override sa-test-all.spamassassin.org all
-adsp_override sa-test-dis.spamassassin.org discardable
-adsp_override sa-test-di2.spamassassin.org
-endif
-
Modified: spamassassin/trunk/t/data/spam/razor2
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/spam/razor2?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/data/spam/razor2 (original)
+++ spamassassin/trunk/t/data/spam/razor2 Wed May 4 11:06:22 2022
@@ -1,152 +1,14 @@
-From WalterYoung@oxente.net Fri Jun 7 08:44:21 2019
-Received: from smtp-server1.cfdenselr.com ([103.223.64.66]) by smtp18.yenddx.com with LOCAL; Fri, 07 Jun 2019 21:44:21 +0900
-Message-ID: <99...@oxente.net>
-Date: Fri, 07 Jun 2019 21:31:14 +0900
-From: "Nicole" <Wa...@oxente.net>
-User-Agent: Mozilla/5.0 (Macintosh; U; PPC; en-US; rv:1.0.1) Gecko/20020823 Netscape/7.0
-X-Accept-Language: en-us
+Message-ID: <Ra...@example-spam-url-for-testing.com>
+Date: Wed, 23 Jul 2003 23:30:00 +0200
+From: Sender <se...@example-spam-url-for-testing.com>
+To: Recipient <re...@example-spam-url-for-testing.com>
+Subject: Test spam mail (Razor2)
+Precedence: junk
MIME-Version: 1.0
-To: "Nicole" <re...@redact.com>
-Subject: could you meet me today?
-Content-Type: text/html;
- charset="iso-8859-1"
-Content-Transfer-Encoding: base64
-X-KAM-Reverse: Passed - Reverse DNS of 161.82.84.187.oxente.net/187.84.82.161
-X-Relay-Addr: 187.84.82.161
-X-Relay-Host: [187.84.82.161]
-X-Relay-Time: Fri Jun 7 02:46:20 2019
-Status: RO
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: 7bit
-PCFkb2N0eXBlIGh0bWw+DQo8aHRtbD4NCjxoZWFkPg0KPG1ldGEgY2hhcnNl
-dD0idXRmLTgiPg0KPC9oZWFkPg0KPGJvZHk+DQo8dGFibGUgd2lkdGg9IjYw
-MCIgYm9yZGVyPSIwIiBhbGlnbj0iY2VudGVyIiBzdHlsZT0iZm9udC1mYW1p
-bHk6IEFyaWFsOyBmb250LXNpemU6IDE4cHgiPg0KPHRib2R5Pg0KPHRyPg0K
-PHRoIGhlaWdodD0iNzkiIHNjb3BlPSJjb2wiPkxvb2tpbmcgZm9yIGhvdCBn
-aXJscyBhbmQgd29tZW5zPzxwPjwvcD48L3RoPg0KPC90cj4NCjx0cj4NCjx0
-ZCBoZWlnaHQ9IjYzIiBhbGlnbj0iY2VudGVyIiBiZ2NvbG9yPSIjQzEwMDAz
-IiBzdHlsZT0iY29sb3I6ICNGRkZGRkY7IGZvbnQtc2l6ZTogMjRweDsgZm9u
-dC1mYW1pbHk6IEFyaWFsIj5XYW50IHNleCB0b25pZ2h0LCBhbmQgbmV3IHB1
-c3N5IGV2ZXJ5IGRheT88aGVhZGVyPjwvaGVhZGVyPjwvdGQ+DQo8L3RyPg0K
-PHRyPg0KPHRkIGhlaWdodD0iMTMzIiBhbGlnbj0iY2VudGVyIj48cD5IZXJl
-IHlvdSBjYW4gZmluZCBhbnkgZ2lybCBmb3Igc2V4ISBUaGV5IGFsbCB3YW50
-IHRvIGZ1Y2suPHRhYmxlIHdpZHRoPSIxNyUiIGJvcmRlcj0iMCI+PHRib2R5
-Pjx0cj48dGQ+PC90ZD48L3RyPjwvdGJvZHk+PC90YWJsZT48L3A+DQo8cD48
-YSBocmVmPSJodHRwOi8vaG90bWFyeS5zdSIgc3R5bGU9ImZvbnQtZmFtaWx5
-OiBBcmlhbDsgZm9udC1zaXplOiAxOHB4OyBjb2xvcjogIzNGNTBGQzsiPmh0
-dHA6Ly9ob3RtYXJ5LnN1PC9hPjwvcD48dGFibGUgd2lkdGg9IjYwJSIgYm9y
-ZGVyPSIwIj48dGJvZHk+PHRyPjx0ZD48L3RkPjx0ZD48L3RkPjx0ZD48L3Rk
-PjwvdHI+PC90Ym9keT48L3RhYmxlPg0KPHA+RG8gbm90IGJlIHNoeSwgY29t
-ZSBhbmQgY2hvb3NlITwvcD48aHI+DQo8cD5Gb3IgZXhhbXBsZSwgcmlnaHQg
-bm93IHRoZXNlIGdpcmxzICA8c3Ryb25nPkZST00gWU9VUiBDSVRZPC9zdHJv
-bmc+IGFyZSByZWFkeSB0byBmdWNrLiBXYW50IG90aGVycz8gQ29tZSB0byBv
-dXIgc2l0ZSEgPT0+IDxhIGhyZWY9Imh0dHA6Ly9ob3RtYXJ5LnN1IiBzdHls
-ZT0iZm9udC1mYW1pbHk6IEFyaWFsOyBmb250LXNpemU6IDE4cHg7IGNvbG9y
-OiAjM0Y1MEZDOyI+aHR0cDovL2hvdG1hcnkuc3U8L2E+PC9wPg0KPG9sPjwv
-b2w+PC90ZD4NCjwvdHI+DQo8L3Rib2R5Pg0KPC90YWJsZT48aGVhZGVyPjwv
-aGVhZGVyPg0KPHRhYmxlIHdpZHRoPSI2MDAiIGJvcmRlcj0iMCIgYWxpZ249
-ImNlbnRlciI+DQo8dGJvZHk+DQo8dHI+DQo8dGg+PGEgaHJlZj0iaHR0cDov
-L2hvdG1hcnkuc3UiPjxpbWcgc3JjPSJodHRwOi8vMjQtaW5mby5pbmZvL3Vw
-bG9hZHMvcG9zdHMvMjAxOC0xMS9kYXZheXRlLXZ6Z2x5YW5lbS1jaHRvLXUt
-ZGV2dXNoZWstcG9kLW1heWtveS0zMS1mb3RvXzkuanBnIiB3aWR0aD0iMjgw
-IiBhbHQ9InBob3RvIG9uZSIvPjwvYT48L3RoPg0KPHRoPjxhIGhyZWY9Imh0
-dHA6Ly9ob3RtYXJ5LnN1Ij48aW1nIHNyYz0iaHR0cDovLzI0LWluZm8uaW5m
-by91cGxvYWRzL3Bvc3RzLzIwMTgtMTEvZ3J1ZGFzdHllLWRldnVzaGtpLWl6
-LXNvY2lhbG55aC1zZXRleS01NS1mb3RvXzE1LmpwZyIgd2lkdGg9IjI4MCIg
-YWx0PSJwaG90byB0d28iLz48L2E+PC90aD4NCjwvdHI+DQo8dHI+DQo8dGQ+
-PGxhYmVsPjwvbGFiZWw+PC90ZD4NCjx0ZD48dGFibGUgd2lkdGg9IjQxJSIg
-Ym9yZGVyPSIwIj48dGJvZHk+PHRyPjx0ZD48L3RkPjx0ZD48L3RkPjx0ZD48
-L3RkPjx0ZD48L3RkPjx0ZD48L3RkPjwvdHI+PC90Ym9keT48L3RhYmxlPjwv
-dGQ+DQo8L3RyPg0KPHRyPg0KPHRkPjxhIGhyZWY9Imh0dHA6Ly9ob3RtYXJ5
-LnN1Ij48aW1nIHNyYz0iaHR0cDovLzI0LWluZm8uaW5mby91cGxvYWRzL3Bv
-c3RzLzIwMTgtMTAvMTU0MDI0NTM4OV9lb2xtenV1MGRiYy5qcGciIHdpZHRo
-PSIyODAiIGFsdD0icGhvdG8gdGhyZWUiLz48L2E+PC90ZD4NCjx0ZD48YSBo
-cmVmPSJodHRwOi8vaG90bWFyeS5zdSI+PGltZyBzcmM9Imh0dHA6Ly8yNC1p
-bmZvLmluZm8vdXBsb2Fkcy9wb3N0cy8yMDE4LTEwLzE1NDAyNDU0MThfLWty
-YXNpdmF5YS1maWd1cmEta3Jhc2l2YXlhLWRldnVzaGthLWtyYXNpdmF5YS1n
-cnVkLTE4NTc2NDAuanBlZyIgd2lkdGg9IjI4MCIgYWx0PSJwaG90byBmb3Vy
-Ii8+PC9hPjwvdGQ+DQo8L3RyPg0KPC90Ym9keT4NCjwvdGFibGU+DQo8cD48
-YnI+IDwvcD4NCjx0YWJsZSB3aWR0aD0iNjAwIiBib3JkZXI9IjAiIGFsaWdu
-PSJjZW50ZXIiPg0KPHRib2R5Pg0KPHRyPg0KPHRkPjxhIGhyZWY9Imh0dHA6
-Ly9ob3RtYXJ5LnN1Ij4NCjx0YWJsZT4NCjx0cj4NCjx0ZCB2YWxpZ249InRv
-cCIgc3R5bGU9ImJhY2tncm91bmQ6IHVybChodHRwOi8vMjQtaW5mby5pbmZv
-L3VwbG9hZHMvcG9zdHMvMjAxOC0wNy9kZXZ1c2hraS1mb3RvZ3JhZmlydXl1
-dC1zZWJ5YS1wZXJlZC16ZXJrYWxvbS03MC1mb3RvXzYuanBnKSBuby1yZXBl
-YXQgY2VudGVyO2JhY2tncm91bmQtcG9zaXRpb246IHRvcDtiYWNrZ3JvdW5k
-LXNpemU6IGNvdmVyOyI+PCEtLVtpZiBndGUgbXNvIDldPiA8djpyZWN0IHht
-bG5zOnY9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206dm1sIiBmaWxsPSJ0
-cnVlIiBzdHJva2U9ImZhbHNlIiBzdHlsZT0ibXNvLXdpZHRoLXBlcmNlbnQ6
-MTAwMDtoZWlnaHQ6NDAwcHg7Ij4gPHY6ZmlsbCB0eXBlPSJ0aWxlIiBzcmM9
-Imh0dHA6Ly8yNC1pbmZvLmluZm8vdXBsb2Fkcy9wb3N0cy8yMDE4LTExL2dy
-dWRhc3R5ZS1kZXZ1c2hraS1pei1zb2NpYWxueWgtc2V0ZXktNTUtZm90b18x
-NS5qcGciIC8+IDx2OnRleHRib3ggaW5zZXQ9IjAsMCwwLDAiPiA8IVtlbmRp
-Zl0tLT48b2w+PHA+PC9wPjwvb2w+DQo8ZGl2Pg0KPGNlbnRlcj4NCjx0YWJs
-ZSBjZWxsc3BhY2luZz0iMCIgY2VsbHBhZGRpbmc9IjAiIHdpZHRoPSIyODAi
-IGhlaWdodD0iNDAwIj4NCjx0cj4NCjx0ZCB2YWxpZ249Im1pZGRsZSIgc3R5
-bGU9InZlcnRpY2FsLWFsaWduOm1pZGRsZTt0ZXh0LWFsaWduOmxlZnQ7IiBj
-bGFzcz0ibW9iaWxlLWNlbnRlciIgaGVpZ2h0PSI0MDAiPjxvbD48L29sPiA8
-L3RkPg0KPC90cj4NCjwvdGFibGU+DQo8L2NlbnRlcj4NCjwvZGl2Pg0KPCEt
-LVtpZiBndGUgbXNvIDldPiA8L3Y6dGV4dGJveD4gPC92OnJlY3Q+IDwhW2Vu
-ZGlmXS0tPjwvdGQ+DQo8L3RyPg0KPC90YWJsZT48L2E+DQo8L3RkPg0KPHRk
-Pg0KPGEgaHJlZj0iaHR0cDovL2hvdG1hcnkuc3UiPg0KPHRhYmxlPg0KPHRy
-Pg0KPHRkIHZhbGlnbj0idG9wIiBzdHlsZT0iYmFja2dyb3VuZDogdXJsKGh0
-dHA6Ly8yNC1pbmZvLmluZm8vdXBsb2Fkcy9wb3N0cy8yMDE4LTExL2dydWRh
-c3R5ZS1kZXZ1c2hraS1pei1zb2NpYWxueWgtc2V0ZXktNTUtZm90b18yOC5q
-cGcpIG5vLXJlcGVhdCBjZW50ZXI7YmFja2dyb3VuZC1wb3NpdGlvbjogdG9w
-O2JhY2tncm91bmQtc2l6ZTogY292ZXI7Ij48IS0tW2lmIGd0ZSBtc28gOV0+
-IDx2OnJlY3QgeG1sbnM6dj0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp2
-bWwiIGZpbGw9InRydWUiIHN0cm9rZT0iZmFsc2UiIHN0eWxlPSJtc28td2lk
-dGgtcGVyY2VudDoxMDAwO2hlaWdodDo0MDBweDsiPiA8djpmaWxsIHR5cGU9
-InRpbGUiIHNyYz0iaHR0cDovLzI0LWluZm8uaW5mby91cGxvYWRzL3Bvc3Rz
-LzIwMTgtMTEvZ3J1ZGFzdHllLWRldnVzaGtpLWl6LXNvY2lhbG55aC1zZXRl
-eS01NS1mb3RvXzI1LmpwZyIgLz4gPHY6dGV4dGJveCBpbnNldD0iMCwwLDAs
-MCI+IDwhW2VuZGlmXS0tPjxwPjwvcD4NCjxkaXY+DQo8Y2VudGVyPg0KPHRh
-YmxlIGNlbGxzcGFjaW5nPSIwIiBjZWxscGFkZGluZz0iMCIgd2lkdGg9IjI4
-MCIgaGVpZ2h0PSI0MDAiPg0KPHRyPg0KPHRkIHZhbGlnbj0ibWlkZGxlIiBz
-dHlsZT0idmVydGljYWwtYWxpZ246bWlkZGxlO3RleHQtYWxpZ246bGVmdDsi
-IGNsYXNzPSJtb2JpbGUtY2VudGVyIiBoZWlnaHQ9IjQwMCI+PGRpdj48L2Rp
-dj4gPC90ZD4NCjwvdHI+DQo8L3RhYmxlPg0KPC9jZW50ZXI+DQo8L2Rpdj4N
-CjwhLS1baWYgZ3RlIG1zbyA5XT4gPC92OnRleHRib3g+IDwvdjpyZWN0PiA8
-IVtlbmRpZl0tLT48L3RkPg0KPC90cj4NCjwvdGFibGU+PC9hPg0KPC90ZD4N
-CjwvdHI+DQo8dHI+DQo8dGQ+DQo8YSBocmVmPSJodHRwOi8vaG90bWFyeS5z
-dSI+DQo8dGFibGU+DQo8dHI+DQo8dGQgdmFsaWduPSJ0b3AiIHN0eWxlPSJi
-YWNrZ3JvdW5kOiB1cmwoaHR0cDovLzI0LWluZm8uaW5mby91cGxvYWRzL3Bv
-c3RzLzIwMTgtMTEvZ3J1ZGFzdHllLWRldnVzaGtpLWl6LXNvY2lhbG55aC1z
-ZXRleS01NS1mb3RvXzQwLmpwZykgbm8tcmVwZWF0IGNlbnRlcjtiYWNrZ3Jv
-dW5kLXBvc2l0aW9uOiB0b3A7YmFja2dyb3VuZC1zaXplOiBjb3ZlcjsiPjwh
-LS1baWYgZ3RlIG1zbyA5XT4gPHY6cmVjdCB4bWxuczp2PSJ1cm46c2NoZW1h
-cy1taWNyb3NvZnQtY29tOnZtbCIgZmlsbD0idHJ1ZSIgc3Ryb2tlPSJmYWxz
-ZSIgc3R5bGU9Im1zby13aWR0aC1wZXJjZW50OjEwMDA7aGVpZ2h0OjQwMHB4
-OyI+IDx2OmZpbGwgdHlwZT0idGlsZSIgc3JjPSJodHRwOi8vMjQtaW5mby5p
-bmZvL3VwbG9hZHMvcG9zdHMvMjAxOC0xMS9kZXZ1c2hraS1zLWtyYXNpdm95
-LWdydWR5dS00MC1mb3RvXzUuanBnIiAvPiA8djp0ZXh0Ym94IGluc2V0PSIw
-LDAsMCwwIj4gPCFbZW5kaWZdLS0+PG9sPjxwPjwvcD48L29sPg0KPGRpdj4N
-CjxjZW50ZXI+DQo8dGFibGUgY2VsbHNwYWNpbmc9IjAiIGNlbGxwYWRkaW5n
-PSIwIiB3aWR0aD0iMjgwIiBoZWlnaHQ9IjQwMCI+DQo8dHI+DQo8dGQgdmFs
-aWduPSJtaWRkbGUiIHN0eWxlPSJ2ZXJ0aWNhbC1hbGlnbjptaWRkbGU7dGV4
-dC1hbGlnbjpsZWZ0OyIgY2xhc3M9Im1vYmlsZS1jZW50ZXIiIGhlaWdodD0i
-NDAwIj48b2w+PC9vbD4gPC90ZD4NCjwvdHI+DQo8L3RhYmxlPg0KPC9jZW50
-ZXI+DQo8L2Rpdj4NCjwhLS1baWYgZ3RlIG1zbyA5XT4gPC92OnRleHRib3g+
-IDwvdjpyZWN0PiA8IVtlbmRpZl0tLT48L3RkPg0KPC90cj4NCjwvdGFibGU+
-PC9hPg0KPC90ZD4NCjx0ZD4NCjxhIGhyZWY9Imh0dHA6Ly9ob3RtYXJ5LnN1
-Ij4NCjx0YWJsZT4NCjx0cj4NCjx0ZCB2YWxpZ249InRvcCIgc3R5bGU9ImJh
-Y2tncm91bmQ6IHVybChodHRwOi8vMjQtaW5mby5pbmZvL3VwbG9hZHMvcG9z
-dHMvMjAxOC0xMS9kZXZ1c2hraS1zLWtyYXNpdm95LWdydWR5dS00MC1mb3Rv
-XzIwLmpwZykgbm8tcmVwZWF0IGNlbnRlcjtiYWNrZ3JvdW5kLXBvc2l0aW9u
-OiB0b3A7YmFja2dyb3VuZC1zaXplOiBjb3ZlcjsiPjwhLS1baWYgZ3RlIG1z
-byA5XT4gPHY6cmVjdCB4bWxuczp2PSJ1cm46c2NoZW1hcy1taWNyb3NvZnQt
-Y29tOnZtbCIgZmlsbD0idHJ1ZSIgc3Ryb2tlPSJmYWxzZSIgc3R5bGU9Im1z
-by13aWR0aC1wZXJjZW50OjEwMDA7aGVpZ2h0OjQwMHB4OyI+IDx2OmZpbGwg
-dHlwZT0idGlsZSIgc3JjPSJodHRwczovL3NleHluYS5vcmcvd3AtY29udGVu
-dC91cGxvYWRzLzIwMTkvMDEvTmFoJUMzJUE5LWhvbGt5LXplLXNuYXBjaGF0
-dS0wMDI2LmpwZyIgLz4gPHY6dGV4dGJveCBpbnNldD0iMCwwLDAsMCI+IDwh
-W2VuZGlmXS0tPjxoZWFkZXI+PC9oZWFkZXI+DQo8ZGl2Pg0KPGNlbnRlcj4N
-Cjx0YWJsZSBjZWxsc3BhY2luZz0iMCIgY2VsbHBhZGRpbmc9IjAiIHdpZHRo
-PSIyODAiIGhlaWdodD0iNDAwIj4NCjx0cj4NCjx0ZCB2YWxpZ249Im1pZGRs
-ZSIgc3R5bGU9InZlcnRpY2FsLWFsaWduOm1pZGRsZTt0ZXh0LWFsaWduOmxl
-ZnQ7IiBjbGFzcz0ibW9iaWxlLWNlbnRlciIgaGVpZ2h0PSI0MDAiPjxuYXY+
-PC9uYXY+IDwvdGQ+DQo8L3RyPg0KPC90YWJsZT4NCjwvY2VudGVyPg0KPC9k
-aXY+DQo8IS0tW2lmIGd0ZSBtc28gOV0+IDwvdjp0ZXh0Ym94PiA8L3Y6cmVj
-dD4gPCFbZW5kaWZdLS0+PC90ZD4NCjwvdHI+DQo8L3RhYmxlPjwvYT4NCjwv
-dGQ+DQo8L3RyPg0KPC90Ym9keT4NCjwvdGFibGU+DQoNCjxkaXY+PC9kaXY+
-DQo8L2JvZHk+DQo8L2h0bWw+DQo=
+This is a test mail that should be categorized as spam by Razor2
+which flags as spam messages that include in the body the URL
+http://example-spam-url-for-testing.com
Modified: spamassassin/trunk/t/dcc.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dcc.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/dcc.t (original)
+++ spamassassin/trunk/t/dcc.t Wed May 4 11:06:22 2022
@@ -21,6 +21,9 @@ diag('Note: Failure may not be an SpamAs
);
tstprefs ("
+ full DCC_CHECK eval:check_dcc()
+ tflags DCC_CHECK net autolearn_body
+ priority DCC_CHECK 10
dns_available no
use_dcc 1
meta X_META_POS DCC_CHECK
Modified: spamassassin/trunk/t/dkim.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dkim.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/dkim.t (original)
+++ spamassassin/trunk/t/dkim.t Wed May 4 11:06:22 2022
@@ -70,6 +70,22 @@ sub test_samples($$) {
# ensure rules will fire, and disable some expensive ones
tstlocalrules("
+ full DKIM_SIGNED eval:check_dkim_signed()
+ full DKIM_VALID eval:check_dkim_valid()
+ full DKIM_VALID_AU eval:check_dkim_valid_author_sig()
+ meta DKIM_INVALID DKIM_SIGNED && !DKIM_VALID
+ header DKIM_ADSP_NXDOMAIN eval:check_dkim_adsp('N')
+ header DKIM_ADSP_DISCARD eval:check_dkim_adsp('D')
+ header DKIM_ADSP_ALL eval:check_dkim_adsp('A')
+ header DKIM_ADSP_CUSTOM_LOW eval:check_dkim_adsp('1')
+ header DKIM_ADSP_CUSTOM_MED eval:check_dkim_adsp('2')
+ header DKIM_ADSP_CUSTOM_HIGH eval:check_dkim_adsp('3')
+ adsp_override sa-test-nxd.spamassassin.org nxdomain
+ adsp_override sa-test-unk.spamassassin.org unknown
+ adsp_override sa-test-all.spamassassin.org all
+ adsp_override sa-test-dis.spamassassin.org discardable
+ adsp_override sa-test-di2.spamassassin.org
+
dkim_minimum_key_bits 512
score DKIM_SIGNED -0.1
score DKIM_VALID -0.1
Modified: spamassassin/trunk/t/dmarc.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dmarc.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/dmarc.t (original)
+++ spamassassin/trunk/t/dmarc.t Wed May 4 11:06:22 2022
@@ -22,9 +22,11 @@ plan tests => 18;
tstpre ("
loadplugin Mail::SpamAssassin::Plugin::DMARC
+loadplugin Mail::SpamAssassin::Plugin::DKIM
");
tstprefs("
+full DKIM_SIGNED eval:check_dkim_signed()
# Check that rename backwards compatibility works with if's
ifplugin Mail::SpamAssassin::Plugin::Dmarc
if plugin ( Mail::SpamAssassin::Plugin::Dmarc)
Modified: spamassassin/trunk/t/header_utf8.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/header_utf8.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/header_utf8.t [UTF-8] (original)
+++ spamassassin/trunk/t/header_utf8.t [UTF-8] Wed May 4 11:06:22 2022
@@ -73,8 +73,11 @@ plan tests => $tests;
);
my $myrules = <<'END';
+ header USER_IN_BLOCKLIST eval:check_from_in_blocklist()
+ tflags USER_IN_BLOCKLIST userconf nice noautolearn
+ score USER_IN_BLOCKLIST 100
add_header all AuthorDomain _AUTHORDOMAIN_
- blacklist_from Marilù.Gioffré@esempio-università.it
+ blocklist_from Marilù.Gioffré@esempio-università.it
header LT_UTF8SMTP_ANY Received =~ /\bwith\s*UTF8SMTPS?A?\b/mi
score LT_UTF8SMTP_ANY -0.1
header LT_RPATH Return-Path:addr =~ /^Marilù\.Gioffré\@esempio-università\.it\z/
Modified: spamassassin/trunk/t/originating_ip_hdr.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/originating_ip_hdr.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/originating_ip_hdr.t (original)
+++ spamassassin/trunk/t/originating_ip_hdr.t Wed May 4 11:06:22 2022
@@ -7,6 +7,9 @@ use Test::More tests => 9;
# ---------------------------------------------------------------------------
tstlocalrules (q{
+ clear_originating_ip_headers
+ originating_ip_headers X-Yahoo-Post-IP X-Apparently-From
+ originating_ip_headers X-Originating-IP X-SenderIP
header TEST_ORIG_IP_H1 X-Spam-Relays-External =~ /\bip=198\.51\.100\.1\b/
score TEST_ORIG_IP_H1 0.1
header TEST_ORIG_IP_H2 X-Spam-Relays-External =~ /\bip=198\.51\.100\.2\b/
Modified: spamassassin/trunk/t/priorities.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/priorities.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/priorities.t (original)
+++ spamassassin/trunk/t/priorities.t Wed May 4 11:06:22 2022
@@ -11,6 +11,77 @@ disable_compat "welcomelist_blocklist";
tstlocalrules (q{
+ body BAYES_99 eval:check_bayes('0.99', '1.00')
+ tflags BAYES_99 learn
+ score BAYES_99 0 0 3.5 3.5
+
+ header USER_IN_BLOCKLIST eval:check_from_in_blocklist()
+ describe USER_IN_BLOCKLIST From: user is listed in the block-list
+ tflags USER_IN_BLOCKLIST userconf nice noautolearn
+ score USER_IN_BLOCKLIST 100
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_BLACKLIST (USER_IN_BLOCKLIST)
+ describe USER_IN_BLACKLIST DEPRECATED: See USER_IN_BLOCKLIST
+ tflags USER_IN_BLACKLIST userconf nice noautolearn
+ score USER_IN_BLACKLIST 100
+ score USER_IN_BLOCKLIST 0.01
+ endif
+
+ header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
+ describe USER_IN_WELCOMELIST User is listed in 'welcomelist_from'
+ tflags USER_IN_WELCOMELIST userconf nice noautolearn
+ score USER_IN_WELCOMELIST -100
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_WHITELIST (USER_IN_WELCOMELIST)
+ describe USER_IN_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
+ tflags USER_IN_WHITELIST userconf nice noautolearn
+ score USER_IN_WHITELIST -100
+ score USER_IN_WELCOMELIST -0.01
+ endif
+
+ header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist()
+ describe USER_IN_DEF_WELCOMELIST From: user is listed in the default welcome-list
+ tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn
+ score USER_IN_DEF_WELCOMELIST -15
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST)
+ describe USER_IN_DEF_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
+ tflags USER_IN_DEF_WHITELIST userconf nice noautolearn
+ score USER_IN_DEF_WHITELIST -15
+ score USER_IN_DEF_WELCOMELIST -0.01
+ endif
+
+ header USER_IN_BLOCKLIST_TO eval:check_to_in_blocklist()
+ describe USER_IN_BLOCKLIST_TO User is listed in 'blocklist_to'
+ tflags USER_IN_BLOCKLIST_TO userconf nice noautolearn
+ score USER_IN_BLOCKLIST_TO 10
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_BLACKLIST_TO (USER_IN_BLOCKLIST_TO)
+ describe USER_IN_BLACKLIST_TO DEPRECATED: See USER_IN_BLOCKLIST_TO
+ tflags USER_IN_BLACKLIST_TO userconf nice noautolearn
+ score USER_IN_BLACKLIST_TO 10
+ score USER_IN_BLOCKLIST_TO 0.01
+ endif
+ header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
+ describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to'
+ tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -6
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO)
+ describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
+ tflags USER_IN_WHITELIST_TO userconf nice noautolearn
+ score USER_IN_WHITELIST_TO -6
+ score USER_IN_WELCOMELIST_TO -0.01
+ endif
+
+ header USER_IN_ALL_SPAM_TO eval:check_to_in_all_spam()
+ tflags USER_IN_ALL_SPAM_TO userconf nice noautolearn
+
priority USER_IN_WHITELIST -1000
priority USER_IN_DEF_WHITELIST -1000
priority USER_IN_ALL_SPAM_TO -1000
Modified: spamassassin/trunk/t/priorities_welcome_block.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/priorities_welcome_block.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/priorities_welcome_block.t (original)
+++ spamassassin/trunk/t/priorities_welcome_block.t Wed May 4 11:06:22 2022
@@ -9,6 +9,72 @@ use Mail::SpamAssassin;
tstlocalrules (q{
+ body BAYES_99 eval:check_bayes('0.99', '1.00')
+ tflags BAYES_99 learn
+ score BAYES_99 0 0 3.5 3.5
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_BLACKLIST (USER_IN_BLOCKLIST)
+ describe USER_IN_BLACKLIST DEPRECATED: See USER_IN_BLOCKLIST
+ tflags USER_IN_BLACKLIST userconf nice noautolearn
+ score USER_IN_BLACKLIST 100
+ score USER_IN_BLOCKLIST 0.01
+ endif
+
+ header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
+ describe USER_IN_WELCOMELIST User is listed in 'welcomelist_from'
+ tflags USER_IN_WELCOMELIST userconf nice noautolearn
+ score USER_IN_WELCOMELIST -100
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_WHITELIST (USER_IN_WELCOMELIST)
+ describe USER_IN_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
+ tflags USER_IN_WHITELIST userconf nice noautolearn
+ score USER_IN_WHITELIST -100
+ score USER_IN_WELCOMELIST -0.01
+ endif
+
+ header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist()
+ describe USER_IN_DEF_WELCOMELIST From: user is listed in the default welcome-list
+ tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn
+ score USER_IN_DEF_WELCOMELIST -15
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST)
+ describe USER_IN_DEF_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
+ tflags USER_IN_DEF_WHITELIST userconf nice noautolearn
+ score USER_IN_DEF_WHITELIST -15
+ score USER_IN_DEF_WELCOMELIST -0.01
+ endif
+
+ header USER_IN_BLOCKLIST_TO eval:check_to_in_blocklist()
+ describe USER_IN_BLOCKLIST_TO User is listed in 'blocklist_to'
+ tflags USER_IN_BLOCKLIST_TO userconf nice noautolearn
+ score USER_IN_BLOCKLIST_TO 10
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_BLACKLIST_TO (USER_IN_BLOCKLIST_TO)
+ describe USER_IN_BLACKLIST_TO DEPRECATED: See USER_IN_BLOCKLIST_TO
+ tflags USER_IN_BLACKLIST_TO userconf nice noautolearn
+ score USER_IN_BLACKLIST_TO 10
+ score USER_IN_BLOCKLIST_TO 0.01
+ endif
+ header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
+ describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to'
+ tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -6
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO)
+ describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
+ tflags USER_IN_WHITELIST_TO userconf nice noautolearn
+ score USER_IN_WHITELIST_TO -6
+ score USER_IN_WELCOMELIST_TO -0.01
+ endif
+
+ header USER_IN_ALL_SPAM_TO eval:check_to_in_all_spam()
+ tflags USER_IN_ALL_SPAM_TO userconf nice noautolearn
+
priority USER_IN_WELCOMELIST -1000
priority USER_IN_DEF_WELCOMELIST -1000
priority USER_IN_ALL_SPAM_TO -1000
Modified: spamassassin/trunk/t/pyzor.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/pyzor.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/pyzor.t (original)
+++ spamassassin/trunk/t/pyzor.t Wed May 4 11:06:22 2022
@@ -15,8 +15,11 @@ diag('Note: Failures may not be an SpamA
# ---------------------------------------------------------------------------
tstprefs ("
+ full PYZOR_CHECK eval:check_pyzor()
+ tflags PYZOR_CHECK net autolearn_body
dns_available no
use_pyzor 1
+ pyzor_count_min 1
score PYZOR_CHECK 3.3
");
Modified: spamassassin/trunk/t/razor2.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/razor2.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/razor2.t (original)
+++ spamassassin/trunk/t/razor2.t Wed May 4 11:06:22 2022
@@ -16,21 +16,15 @@ diag('Note: Failures may not be an SpamA
# ---------------------------------------------------------------------------
-#report the email as spam so it fails below. This process is not likely to work and I can't find a test point for razor. KAM 2018-08-20
-#unless (HAS_RAZOR2 or HAS_RAZOR2_IDENT) {
-# system ("razor-report < data/spam/001");
-# if (($? >> 8) != 0) {
-# warn "'razor-report < data/spam/001' failed. This may cause this test to fail.\n";
-# }
-#}
-
tstprefs ("
+ full RAZOR2_CHECK eval:check_razor2()
+ tflags RAZOR2_CHECK net autolearn_body
dns_available no
use_razor2 1
score RAZOR2_CHECK 3.3
");
-#RAZOR2 file was from real-world spam in June 2019
+#RAZOR2 file contains a test string supplied by Razor tech support
#TESTING FOR SPAM
%patterns = (
Modified: spamassassin/trunk/t/reportheader.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/reportheader.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/reportheader.t (original)
+++ spamassassin/trunk/t/reportheader.t Wed May 4 11:06:22 2022
@@ -23,9 +23,34 @@ $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';
q{ Uses a dotted-decimal IP address in URL }, 'dotteddec',
);
-tstprefs ("
+# This test checks that the report template feature works.
+# Define a representative example default template here to test out
+tstprefs ('
+ clear_report_template
+ report Spam detection software, running on the system "_HOSTNAME_",
+ report has_YESNO(, NOT)_ identified this incoming email as_YESNO( possible,)_ spam. The original
+ report message has been attached to this so you can view it or label
+ report similar future email. If you have any questions, see
+ report _CONTACTADDRESS_ for details.
+ report
+ report Content preview: _PREVIEW_
+ report
+ report Content analysis details: (_SCORE_ points, _REQD_ required)
+ report
+ report " pts rule name description"
+ report ---- ---------------------- --------------------------------------------------
+ report _SUMMARY_
+
+ report_contact @@CONTACT_ADDRESS@@
+
+ clear_headers
+
+ add_header all Checker-Version SpamAssassin _VERSION_ (_SUBVERSION_) on _HOSTNAME_
+ add_header spam Flag _YESNOCAPS_
+ add_header all Level _STARS(*)_
+ add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_"
report_safe 0
-");
+');
sarun ("-L -t < data/spam/001", \&patterns_run_cb);
ok_all_patterns();
Modified: spamassassin/trunk/t/shortcircuit.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/shortcircuit.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/shortcircuit.t (original)
+++ spamassassin/trunk/t/shortcircuit.t Wed May 4 11:06:22 2022
@@ -17,6 +17,9 @@ tstpre ('
tstlocalrules ('
+ header SHORTCIRCUIT eval:check_shortcircuit()
+ describe SHORTCIRCUIT Not all rules were run, due to a shortcircuited rule
+ tflags SHORTCIRCUIT userconf noautolearn
add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ shortcircuit=_SCTYPE_ autolearn=_AUTOLEARN_ version=_VERSION_"
# hits spam/001
Modified: spamassassin/trunk/t/spamd_welcomelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_welcomelist_leak.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_welcomelist_leak.t (original)
+++ spamassassin/trunk/t/spamd_welcomelist_leak.t Wed May 4 11:06:22 2022
@@ -12,6 +12,9 @@ plan tests => 8;
# bug 6003
tstlocalrules (q{
+ header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
+ tflags USER_IN_WELCOMELIST userconf nice noautolearn
+ score USER_IN_WELCOMELIST -100
body MYBODY /LOSE WEIGHT/
score MYBODY 99
});
Modified: spamassassin/trunk/t/spamd_whitelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_whitelist_leak.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_whitelist_leak.t (original)
+++ spamassassin/trunk/t/spamd_whitelist_leak.t Wed May 4 11:06:22 2022
@@ -14,6 +14,12 @@ plan tests => 8;
disable_compat "welcomelist_blocklist";
tstlocalrules (q{
+ header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
+ tflags USER_IN_WELCOMELIST userconf nice noautolearn
+ meta USER_IN_WHITELIST (USER_IN_WELCOMELIST)
+ tflags USER_IN_WHITELIST userconf nice noautolearn
+ score USER_IN_WHITELIST -100
+ score USER_IN_WELCOMELIST -0.01
body MYBODY /LOSE WEIGHT/
score MYBODY 99
});
Modified: spamassassin/trunk/t/spf.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spf.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/spf.t (original)
+++ spamassassin/trunk/t/spf.t Wed May 4 11:06:22 2022
@@ -19,6 +19,28 @@ disable_compat "welcomelist_blocklist";
# ensure all rules will fire
tstlocalrules ("
+ header SPF_PASS eval:check_for_spf_pass()
+ header SPF_NEUTRAL eval:check_for_spf_neutral()
+ header SPF_FAIL eval:check_for_spf_fail()
+ header SPF_SOFTFAIL eval:check_for_spf_softfail()
+ header SPF_HELO_PASS eval:check_for_spf_helo_pass()
+ header SPF_HELO_NEUTRAL eval:check_for_spf_helo_neutral()
+ header SPF_HELO_FAIL eval:check_for_spf_helo_fail()
+ header SPF_HELO_SOFTFAIL eval:check_for_spf_helo_softfail()
+ tflags SPF_PASS nice userconf net
+ tflags SPF_HELO_PASS nice userconf net
+ tflags SPF_NEUTRAL net
+ tflags SPF_FAIL net
+ tflags SPF_SOFTFAIL net
+ tflags SPF_HELO_NEUTRAL net
+ tflags SPF_HELO_FAIL net
+ tflags SPF_HELO_SOFTFAIL net
+ header USER_IN_SPF_WELCOMELIST eval:check_for_spf_welcomelist_from()
+ tflags USER_IN_SPF_WELCOMELIST userconf nice noautolearn net
+ header USER_IN_DEF_SPF_WL eval:check_for_def_spf_welcomelist_from()
+ tflags USER_IN_DEF_SPF_WL userconf nice noautolearn net
+ meta USER_IN_SPF_WHITELIST (USER_IN_SPF_WELCOMELIST)
+ tflags USER_IN_SPF_WHITELIST userconf nice noautolearn net
score SPF_FAIL 0.001
score SPF_HELO_FAIL 0.001
score SPF_HELO_NEUTRAL 0.001
@@ -28,6 +50,7 @@ tstlocalrules ("
score SPF_PASS -0.001
score SPF_HELO_PASS -0.001
score USER_IN_DEF_SPF_WL -0.001
+ score USER_IN_SPF_WELCOMELIST -0.001
score USER_IN_SPF_WHITELIST -0.001
");
Modified: spamassassin/trunk/t/spf_welcome_block.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spf_welcome_block.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/spf_welcome_block.t (original)
+++ spamassassin/trunk/t/spf_welcome_block.t Wed May 4 11:06:22 2022
@@ -17,6 +17,28 @@ plan tests => 72;
# ensure all rules will fire
tstlocalrules ("
+ header SPF_PASS eval:check_for_spf_pass()
+ header SPF_NEUTRAL eval:check_for_spf_neutral()
+ header SPF_FAIL eval:check_for_spf_fail()
+ header SPF_SOFTFAIL eval:check_for_spf_softfail()
+ header SPF_HELO_PASS eval:check_for_spf_helo_pass()
+ header SPF_HELO_NEUTRAL eval:check_for_spf_helo_neutral()
+ header SPF_HELO_FAIL eval:check_for_spf_helo_fail()
+ header SPF_HELO_SOFTFAIL eval:check_for_spf_helo_softfail()
+ tflags SPF_PASS nice userconf net
+ tflags SPF_HELO_PASS nice userconf net
+ tflags SPF_NEUTRAL net
+ tflags SPF_FAIL net
+ tflags SPF_SOFTFAIL net
+ tflags SPF_HELO_NEUTRAL net
+ tflags SPF_HELO_FAIL net
+ tflags SPF_HELO_SOFTFAIL net
+ header USER_IN_SPF_WELCOMELIST eval:check_for_spf_welcomelist_from()
+ tflags USER_IN_SPF_WELCOMELIST userconf nice noautolearn net
+ header USER_IN_DEF_SPF_WL eval:check_for_def_spf_welcomelist_from()
+ tflags USER_IN_DEF_SPF_WL userconf nice noautolearn net
+ meta USER_IN_SPF_WHITELIST (USER_IN_SPF_WELCOMELIST)
+ tflags USER_IN_SPF_WHITELIST userconf nice noautolearn net
score SPF_FAIL 0.001
score SPF_HELO_FAIL 0.001
score SPF_HELO_NEUTRAL 0.001
Modified: spamassassin/trunk/t/sql_based_welcomelist.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sql_based_welcomelist.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/sql_based_welcomelist.t (original)
+++ spamassassin/trunk/t/sql_based_welcomelist.t Wed May 4 11:06:22 2022
@@ -25,6 +25,7 @@ sa_t_init("sql_based_welcomelist");
clear_localrules();
my $rules = q(
+ add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_"
# Needed for AWL to run
header AWL eval:check_from_in_auto_welcomelist()
priority AWL 1000
Modified: spamassassin/trunk/t/sql_based_whitelist.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sql_based_whitelist.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/sql_based_whitelist.t (original)
+++ spamassassin/trunk/t/sql_based_whitelist.t Wed May 4 11:06:22 2022
@@ -25,6 +25,7 @@ sa_t_init("sql_based_whitelist");
clear_localrules();
my $rules = q(
+ add_header all Status "_YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_"
# Needed for AWL to run
header AWL eval:check_from_in_auto_whitelist()
priority AWL 1000
Modified: spamassassin/trunk/t/trust_path.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/trust_path.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/trust_path.t (original)
+++ spamassassin/trunk/t/trust_path.t Wed May 4 11:06:22 2022
@@ -25,6 +25,13 @@ open(OLDERR, ">&STDERR") || die "Cannot
# quiet "used only once" warnings
1 if *OLDERR;
+tstlocalrules ("
+ clear_originating_ip_headers
+ originating_ip_headers X-Yahoo-Post-IP X-Originating-IP X-Apparently-From
+ originating_ip_headers X-SenderIP X-AOL-IP
+ originating_ip_headers X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp
+");
+
my @data = (
# ---------------------------------------------------------------------------
Modified: spamassassin/trunk/t/welcomelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_addrs.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_addrs.t (original)
+++ spamassassin/trunk/t/welcomelist_addrs.t Wed May 4 11:06:22 2022
@@ -13,6 +13,12 @@ plan tests => 35;
# ---------------------------------------------------------------------------
+tstprefs ("
+ header AWL eval:check_from_in_auto_welcomelist()
+ tflags AWL userconf noautolearn
+ priority AWL 1000
+");
+
%added_address_welcomelist_patterns = (
q{SpamAssassin auto-welcomelist: adding address to welcomelist:}, 'added address to welcomelist',
);
Modified: spamassassin/trunk/t/welcomelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_from.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_from.t (original)
+++ spamassassin/trunk/t/welcomelist_from.t Wed May 4 11:06:22 2022
@@ -10,6 +10,12 @@ plan tests => 32;
# ---------------------------------------------------------------------------
tstprefs ("
+ header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
+ tflags USER_IN_WELCOMELIST userconf nice noautolearn
+ score USER_IN_WELCOMELIST -100
+ header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist()
+ tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn
+ score USER_IN_DEF_WELCOMELIST -15
def_welcomelist_from_rcvd *\@paypal.com paypal.com
def_welcomelist_from_rcvd *\@paypal.com ebay.com
def_welcomelist_from_rcvd mumble\@example.com example.com
Modified: spamassassin/trunk/t/welcomelist_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_subject.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_subject.t (original)
+++ spamassassin/trunk/t/welcomelist_subject.t Wed May 4 11:06:22 2022
@@ -16,6 +16,12 @@ use Test::More tests => 4;
tstprefs ("
loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject
+ header SUBJECT_IN_WELCOMELIST eval:check_subject_in_welcomelist()
+ tflags SUBJECT_IN_WELCOMELIST userconf nice noautolearn
+ score SUBJECT_IN_WELCOMELIST -100
+ header SUBJECT_IN_BLOCKLIST eval:check_subject_in_blocklist()
+ tflags SUBJECT_IN_BLOCKLIST userconf noautolearn
+ score SUBJECT_IN_BLOCKLIST 100
# Check that rename backwards compatibility works with if's
ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject
Modified: spamassassin/trunk/t/welcomelist_to.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_to.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_to.t (original)
+++ spamassassin/trunk/t/welcomelist_to.t Wed May 4 11:06:22 2022
@@ -11,6 +11,9 @@ use Test::More tests => 1;
);
tstprefs ("
+ header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
+ tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -6
welcomelist_to announce*
");
Modified: spamassassin/trunk/t/whitelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_addrs.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_addrs.t (original)
+++ spamassassin/trunk/t/whitelist_addrs.t Wed May 4 11:06:22 2022
@@ -13,6 +13,12 @@ plan tests => 35;
# ---------------------------------------------------------------------------
+tstprefs ("
+ header AWL eval:check_from_in_auto_welcomelist()
+ tflags AWL userconf noautolearn
+ priority AWL 1000
+");
+
%added_address_whitelist_patterns = (
q{SpamAssassin auto-welcomelist: adding address to welcomelist:}, 'added address to welcomelist',
);
Modified: spamassassin/trunk/t/whitelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_from.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_from.t (original)
+++ spamassassin/trunk/t/whitelist_from.t Wed May 4 11:06:22 2022
@@ -12,6 +12,18 @@ plan tests => 32;
disable_compat "welcomelist_blocklist";
tstprefs ("
+ header USER_IN_WELCOMELIST eval:check_from_in_welcomelist()
+ tflags USER_IN_WELCOMELIST userconf nice noautolearn
+ header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist()
+ tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn
+ meta USER_IN_WHITELIST (USER_IN_WELCOMELIST)
+ tflags USER_IN_WHITELIST userconf nice noautolearn
+ score USER_IN_WHITELIST -100
+ score USER_IN_WELCOMELIST -0.01
+ meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST)
+ tflags USER_IN_DEF_WHITELIST userconf nice noautolearn
+ score USER_IN_DEF_WHITELIST -15
+ score USER_IN_DEF_WELCOMELIST -0.01
def_whitelist_from_rcvd *\@paypal.com paypal.com
def_whitelist_from_rcvd *\@paypal.com ebay.com
def_whitelist_from_rcvd mumble\@example.com example.com
Modified: spamassassin/trunk/t/whitelist_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_subject.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_subject.t (original)
+++ spamassassin/trunk/t/whitelist_subject.t Wed May 4 11:06:22 2022
@@ -18,6 +18,27 @@ disable_compat "welcomelist_blocklist";
tstprefs ("
loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+ header SUBJECT_IN_WELCOMELIST eval:check_subject_in_welcomelist()
+ tflags SUBJECT_IN_WELCOMELIST userconf nice noautolearn
+ score SUBJECT_IN_WELCOMELIST -100
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta SUBJECT_IN_WHITELIST (SUBJECT_IN_WELCOMELIST)
+ tflags SUBJECT_IN_WHITELIST userconf nice noautolearn
+ score SUBJECT_IN_WHITELIST -100
+ score SUBJECT_IN_WELCOMELIST -0.01
+ endif
+
+ header SUBJECT_IN_BLOCKLIST eval:check_subject_in_blocklist()
+ tflags SUBJECT_IN_BLOCKLIST userconf noautolearn
+ score SUBJECT_IN_BLOCKLIST 100
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta SUBJECT_IN_BLACKLIST (SUBJECT_IN_BLOCKLIST)
+ tflags SUBJECT_IN_BLACKLIST userconf noautolearn
+ score SUBJECT_IN_BLACKLIST 100
+ score SUBJECT_IN_BLOCKLIST 0.01
+ endif
# Check that rename backwards compatibility works with if's
ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject
Modified: spamassassin/trunk/t/whitelist_to.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_to.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_to.t (original)
+++ spamassassin/trunk/t/whitelist_to.t Wed May 4 11:06:22 2022
@@ -11,6 +11,9 @@ use Test::More tests => 1;
);
tstprefs ("
+ header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
+ tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -6
whitelist_to announce*
");
Modified: spamassassin/trunk/t/wlbl_uri.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/wlbl_uri.t?rev=1900547&r1=1900546&r2=1900547&view=diff
==============================================================================
--- spamassassin/trunk/t/wlbl_uri.t (original)
+++ spamassassin/trunk/t/wlbl_uri.t Wed May 4 11:06:22 2022
@@ -4,6 +4,58 @@ use lib '.'; use lib 't';
use SATest; sa_t_init("wlbl_uri");
use Test::More tests => 12;
+# copied from 60_welcome.cf
+# should do the right thing with the different disable/enable compat settings
+my $myrules = <<'END';
+ if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
+ body URI_HOST_IN_BLOCKLIST eval:check_uri_host_in_blocklist()
+ tflags URI_HOST_IN_BLOCKLIST userconf noautolearn
+ score URI_HOST_IN_BLOCKLIST 100
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta URI_HOST_IN_BLACKLIST (URI_HOST_IN_BLOCKLIST)
+ tflags URI_HOST_IN_BLACKLIST userconf noautolearn
+ score URI_HOST_IN_BLACKLIST 100
+ score URI_HOST_IN_BLOCKLIST 0.01
+ endif
+ endif
+ if !can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
+ if (version >= 3.004000)
+ body URI_HOST_IN_BLOCKLIST eval:check_uri_host_in_blacklist()
+ tflags URI_HOST_IN_BLOCKLIST userconf noautolearn
+ score URI_HOST_IN_BLOCKLIST 0.01
+
+ meta URI_HOST_IN_BLACKLIST (URI_HOST_IN_BLOCKLIST)
+ tflags URI_HOST_IN_BLACKLIST userconf noautolearn
+ score URI_HOST_IN_BLACKLIST 100
+ endif
+ endif
+
+ if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
+ body URI_HOST_IN_WELCOMELIST eval:check_uri_host_in_welcomelist()
+ tflags URI_HOST_IN_WELCOMELIST userconf nice noautolearn
+ score URI_HOST_IN_WELCOMELIST -100
+
+ if !can(Mail::SpamAssassin::Conf::compat_welcomelist_blocklist)
+ meta URI_HOST_IN_WHITELIST (URI_HOST_IN_WELCOMELIST)
+ tflags URI_HOST_IN_WHITELIST userconf nice noautolearn
+ score URI_HOST_IN_WHITELIST -100
+ score URI_HOST_IN_WELCOMELIST -0.01
+ endif
+ endif
+ if !can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
+ if (version >= 3.004000)
+ body URI_HOST_IN_WELCOMELIST eval:check_uri_host_in_whitelist()
+ tflags URI_HOST_IN_WELCOMELIST userconf nice noautolearn
+ score URI_HOST_IN_WELCOMELIST -0.01
+
+ meta URI_HOST_IN_WHITELIST (URI_HOST_IN_WELCOMELIST)
+ tflags URI_HOST_IN_WHITELIST userconf nice noautolearn
+ score URI_HOST_IN_WHITELIST -100
+ endif
+ endif
+END
+
disable_compat "welcomelist_blocklist";
%patterns = (
@@ -15,7 +67,7 @@ disable_compat "welcomelist_blocklist";
###
-tstprefs("
+tstprefs($myrules . "
blocklist_uri_host ximian.com
welcomelist_uri_host helixcode.com
");
@@ -25,7 +77,7 @@ ok_all_patterns();
###
-tstprefs("
+tstprefs($myrules . "
blacklist_uri_host ximian.com
whitelist_uri_host helixcode.com
");
@@ -47,7 +99,7 @@ ok_all_patterns();
tstpre("
enable_compat welcomelist_blocklist
");
-tstprefs("
+tstprefs($myrules . "
blocklist_uri_host ximian.com
welcomelist_uri_host helixcode.com
");