You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/19 13:00:44 UTC
svn commit: r1844336 - in /spamassassin/trunk: MANIFEST t/data/nice/spf1
t/data/nice/spf2 t/data/nice/spf3 t/data/nice/spf3-received-spf
t/data/nice/spf4-received-spf-nofold t/spf.t
Author: hege
Date: Fri Oct 19 13:00:44 2018
New Revision: 1844336
URL: http://svn.apache.org/viewvc?rev=1844336&view=rev
Log:
Bug 7224 - fix unfolded SPF test messages (leave one just in case)
Added:
spamassassin/trunk/t/data/nice/spf4-received-spf-nofold
Modified:
spamassassin/trunk/MANIFEST
spamassassin/trunk/t/data/nice/spf1
spamassassin/trunk/t/data/nice/spf2
spamassassin/trunk/t/data/nice/spf3
spamassassin/trunk/t/data/nice/spf3-received-spf
spamassassin/trunk/t/spf.t
Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?rev=1844336&r1=1844335&r2=1844336&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Fri Oct 19 13:00:44 2018
@@ -354,6 +354,7 @@ t/data/nice/spf1
t/data/nice/spf2
t/data/nice/spf3
t/data/nice/spf3-received-spf
+t/data/nice/spf4-received-spf-nofold
t/data/nice/unicode1
t/data/nice/unicode2
t/data/reporterplugin.pm
Modified: spamassassin/trunk/t/data/nice/spf1
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/nice/spf1?rev=1844336&r1=1844335&r2=1844336&view=diff
==============================================================================
--- spamassassin/trunk/t/data/nice/spf1 (original)
+++ spamassassin/trunk/t/data/nice/spf1 Fri Oct 19 13:00:44 2018
@@ -1,7 +1,11 @@
Return-Path: <ne...@dnsbltest.spamassassin.org>
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: by proxy.google.com with SMTP id so1951389 for <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
-Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [64.142.3.173]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for
+ <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for
+ <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue,
+ 10 Feb 2004 10:14:01 -0800 (PST)
Message-ID: <10...@persist.google.com>
Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
From: newsalerts-noreply@dnsbltest.spamassassin.org
Modified: spamassassin/trunk/t/data/nice/spf2
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/nice/spf2?rev=1844336&r1=1844335&r2=1844336&view=diff
==============================================================================
--- spamassassin/trunk/t/data/nice/spf2 (original)
+++ spamassassin/trunk/t/data/nice/spf2 Fri Oct 19 13:00:44 2018
@@ -1,8 +1,15 @@
Return-Path: <ne...@dnsbltest.spamassassin.org>
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: by proxy.google.com with SMTP id so1951389 for <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
-Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.157]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [64.142.3.173]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for
+ <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for
+ <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue,
+ 10 Feb 2004 10:14:01 -0800 (PST)
Message-ID: <10...@persist.google.com>
Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
From: newsalerts-noreply@dnsbltest.spamassassin.org
Modified: spamassassin/trunk/t/data/nice/spf3
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/nice/spf3?rev=1844336&r1=1844335&r2=1844336&view=diff
==============================================================================
--- spamassassin/trunk/t/data/nice/spf3 (original)
+++ spamassassin/trunk/t/data/nice/spf3 Fri Oct 19 13:00:44 2018
@@ -1,11 +1,27 @@
Return-Path: <ne...@dnsbltest.spamassassin.org>
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.158]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.155]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.156]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: by proxy.google.com with SMTP id so1951389 for <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
-Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.158]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [64.142.3.173]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.155]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.156]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for
+ <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for
+ <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue,
+ 10 Feb 2004 10:14:01 -0800 (PST)
Message-ID: <10...@persist.google.com>
Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
From: newsalerts-noreply@dnsbltest.spamassassin.org
Modified: spamassassin/trunk/t/data/nice/spf3-received-spf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/nice/spf3-received-spf?rev=1844336&r1=1844335&r2=1844336&view=diff
==============================================================================
--- spamassassin/trunk/t/data/nice/spf3-received-spf (original)
+++ spamassassin/trunk/t/data/nice/spf3-received-spf Fri Oct 19 13:00:44 2018
@@ -1,15 +1,39 @@
Return-Path: <ne...@dnsbltest.spamassassin.org>
-X-Comment: Yeah, the Received-SPF headers make no sense, there just there to test that the SPF plugin will parse the results from them... the IPs and comments are bogus
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.158]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received-SPF: fail (dostech.ca: 69.61.78.188 is authorized to use 'spamassassin@dostech.ca' in 'mfrom' identity (mechanism 'mx' matched)) receiver=FC5-VPC; identity=mfrom; envelope-from="spamassassin@dostech.ca"; helo=smtp.dostech.net; client-ip=69.61.78.188
-Received-SPF: softfail (dostech.ca: 69.61.78.188 is authorized to use 'dostech.ca' in 'helo' identity (mechanism 'mx' matched)) receiver=FC5-VPC; identity=helo; helo=dostech.ca; client-ip=69.61.78.188
-Received-SPF: neutral (herse.apache.org: domain of spamassassin@dostech.ca designates 69.61.78.188 as permitted sender)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.155]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.156]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
-Received: by proxy.google.com with SMTP id so1951389 for <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
-Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+X-Comment: Yeah, the Received-SPF headers make no sense,
+ there just there to test that the SPF plugin will parse the results from
+ them... the IPs and comments are bogus
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.158]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [64.142.3.173]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received-SPF: fail (dostech.ca: 69.61.78.188 is authorized to use
+ 'spamassassin@dostech.ca' in 'mfrom' identity (mechanism 'mx' matched))
+ receiver=FC5-VPC; identity=mfrom; envelope-from="spamassassin@dostech.ca";
+ helo=smtp.dostech.net; client-ip=69.61.78.188
+Received-SPF: softfail (dostech.ca: 69.61.78.188 is authorized to use
+ 'dostech.ca' in 'helo' identity (mechanism 'mx' matched)) receiver=FC5-VPC;
+ identity=helo; helo=dostech.ca; client-ip=69.61.78.188
+Received-SPF: neutral (herse.apache.org: domain of spamassassin@dostech.ca
+ designates 69.61.78.188 as permitted sender)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.155]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.156]) by dnsbltest.spamassassin.org (Postfix) with SMTP id
+ B9B2931016D for <jm...@jmason.org>; Tue,
+ 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org
+ [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for
+ <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for
+ <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue,
+ 10 Feb 2004 10:14:01 -0800 (PST)
Message-ID: <10...@persist.google.com>
Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
From: newsalerts-noreply@dnsbltest.spamassassin.org
Added: spamassassin/trunk/t/data/nice/spf4-received-spf-nofold
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/nice/spf4-received-spf-nofold?rev=1844336&view=auto
==============================================================================
--- spamassassin/trunk/t/data/nice/spf4-received-spf-nofold (added)
+++ spamassassin/trunk/t/data/nice/spf4-received-spf-nofold Fri Oct 19 13:00:44 2018
@@ -0,0 +1,32 @@
+Return-Path: <ne...@dnsbltest.spamassassin.org>
+X-Comment: Yeah, the Received-SPF headers make no sense, there just there to test that the SPF plugin will parse the results from them... the IPs and comments are bogus
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.158]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [64.142.3.173]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received-SPF: fail (dostech.ca: 69.61.78.188 is authorized to use 'spamassassin@dostech.ca' in 'mfrom' identity (mechanism 'mx' matched)) receiver=FC5-VPC; identity=mfrom; envelope-from="spamassassin@dostech.ca"; helo=smtp.dostech.net; client-ip=69.61.78.188
+Received-SPF: softfail (dostech.ca: 69.61.78.188 is authorized to use 'dostech.ca' in 'helo' identity (mechanism 'mx' matched)) receiver=FC5-VPC; identity=helo; helo=dostech.ca; client-ip=69.61.78.188
+Received-SPF: neutral (herse.apache.org: domain of spamassassin@dostech.ca designates 69.61.78.188 as permitted sender)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.155]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.156]) by dnsbltest.spamassassin.org (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: from dnsbltest.spamassassin.org (dnsbltest.spamassassin.org [65.214.43.157]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for <jm...@jmason.org>; Tue, 10 Feb 2004 18:18:49 +0000 (GMT)
+Received: by proxy.google.com with SMTP id so1951389 for <jm...@jmason.org>; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+Message-ID: <10...@persist.google.com>
+Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST)
+From: newsalerts-noreply@dnsbltest.spamassassin.org
+To: jm-google-news-alerts@jmason.org
+Subject: Google News Alert - spamassassin
+MIME-Version: 1.0
+Content-Type: text/plain; charset="ISO-8859-1";
+
+SWSOFT Unveils Plesk 7, Deployed by 1&1
+Web Host Industry Review - USA
+... The software also features a newly designed Windows XP-like user interface,
+is equipped SpamAssassin, an open source anti-spam tool, and includes
+"Application ...
+<http://thewhir.com/marketwatch/sws021004.cfm>
+See all stories on this topic:
+<http://news.google.com/news?hl=en&lr=&ie=UTF-8&oe=utf8&client=google&num=30&newsc
+lusterurl=http://thewhir.com/marketwatch/sws021004.cfm>
+
+"v=spf1 ip4:64.142.3.173 -ip4:65.214.43.155 ~ip4:65.214.43.156 ?ip4:65.214.43.157 -all"
+
Modified: spamassassin/trunk/t/spf.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spf.t?rev=1844336&r1=1844335&r2=1844336&view=diff
==============================================================================
--- spamassassin/trunk/t/spf.t (original)
+++ spamassassin/trunk/t/spf.t Fri Oct 19 13:00:44 2018
@@ -11,7 +11,7 @@ plan skip_all => "Net tests disabled" un
plan skip_all => "Need Mail::SPF" unless HAS_MAILSPF;
plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely();
-plan tests => 56;
+plan tests => 64;
# ---------------------------------------------------------------------------
@@ -377,6 +377,9 @@ tstprefs("
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
ok_all_patterns();
+# Test same with nonfolded headers
+sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb);
+ok_all_patterns();
# test usage of Received-SPF headers added by internal relays
@@ -399,6 +402,9 @@ tstprefs("
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
ok_all_patterns();
+# Test same with nonfolded headers
+sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb);
+ok_all_patterns();
# test usage of Received-SPF headers added by internal relays
@@ -420,6 +426,9 @@ tstprefs("
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
ok_all_patterns();
+# Test same with nonfolded headers
+sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb);
+ok_all_patterns();
# test usage of Received-SPF headers added by internal relays
@@ -441,6 +450,8 @@ tstprefs("
);
sarun ("-t < data/nice/spf3-received-spf", \&patterns_run_cb);
-
+ok_all_patterns();
+# Test same with nonfolded headers
+sarun ("-t < data/nice/spf4-received-spf-nofold", \&patterns_run_cb);
ok_all_patterns();