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 2005/05/02 17:32:16 UTC
svn commit: r165643 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/EvalTests.pm t/dnsbl.t
Author: sidney
Date: Mon May 2 08:32:14 2005
New Revision: 165643
URL: http://svn.apache.org/viewcvs?rev=165643&view=rev
Log:
bug 4290 Canonicalize rbl name to put a dot at end if it is a FQDN without a dot. Also change regression test because this changes the output of the test
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
spamassassin/trunk/t/dnsbl.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?rev=165643&r1=165642&r2=165643&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Mon May 2 08:32:14 2005
@@ -1158,7 +1158,13 @@
return 0 if $self->{conf}->{skip_rbl_checks};
return 0 unless $self->is_dns_available();
$self->load_resolver();
-
+
+ if (($rbl_server !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) &&
+ (index($rbl_server, '.') >= 0) &&
+ ($rbl_server !~ /\.$/)) {
+ $rbl_server .= ".";
+ }
+
dbg("dns: checking RBL $rbl_server, set $set");
# ok, make a list of all the IPs in the untrusted set
@@ -1346,6 +1352,14 @@
return unless scalar keys %hosts;
$self->load_resolver();
+
+ if (($rbl_server !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) &&
+ (index($rbl_server, '.') >= 0) &&
+ ($rbl_server !~ /\.$/)) {
+ $rbl_server .= ".";
+ }
+ dbg("dns: _check_rbl_addresses RBL $rbl_server, set $set");
+
for my $host (keys %hosts) {
$self->do_rbl_lookup($rule, $set, 'A', $rbl_server, "$host.$rbl_server");
}
Modified: spamassassin/trunk/t/dnsbl.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/dnsbl.t?rev=165643&r1=165642&r2=165643&view=diff
==============================================================================
--- spamassassin/trunk/t/dnsbl.t (original)
+++ spamassassin/trunk/t/dnsbl.t Mon May 2 08:32:14 2005
@@ -66,7 +66,7 @@
q{ <dns:98.3.137.144.dnsbltest.spamassassin.org> [127.0.0.2] } => 'P_1',
q{ <dns:134.88.73.210.dnsbltest.spamassassin.org> [127.0.0.4] } => 'P_2',
q{ <dns:18.13.119.61.dnsbltest.spamassassin.org> [127.0.0.12] } => 'P_3',
- q{ <dns:14.35.17.212.dnsbltest.spamassassin.org> [127.0.0.1, 127.0.0.1] } => 'P_4',
+ q{ <dns:14.35.17.212.dnsbltest.spamassassin.org> [127.0.0.1] } => 'P_4',
q{ <dns:226.149.120.193.dnsbltest.spamassassin.org> [127.0.0.1] } => 'P_5',
q{ <dns:example.com.dnsbltest.spamassassin.org> [127.0.0.2] } => 'P_6',
q{ <dns:134.88.73.210.sb.dnsbltest.spamassassin.org?type=TXT> } => 'P_7',
@@ -104,7 +104,7 @@
describe DNSBL_TEST_TOP DNSBL A record match
tflags DNSBL_TEST_TOP net
-header DNSBL_TEST_WHITELIST eval:check_rbl('white-firsttrusted', 'dnsbltest.spamassassin.org', '127.0.0.1')
+header DNSBL_TEST_WHITELIST eval:check_rbl('white-firsttrusted', 'dnsbltest.spamassassin.org.', '127.0.0.1')
describe DNSBL_TEST_WHITELIST DNSBL whitelist match
tflags DNSBL_TEST_WHITELIST net nice