You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/10/08 00:21:31 UTC
svn commit: rev 54022 - in spamassassin/branches/3.0: lib/Mail/SpamAssassin/Plugin rules
Author: felicity
Date: Thu Oct 7 15:21:30 2004
New Revision: 54022
Modified:
spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/branches/3.0/rules/25_uribl.cf
Log:
bug 3734: uridnsbl rules work on body data, not header data, so change the rule type from header to body
Modified: spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
==============================================================================
--- spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Thu Oct 7 15:21:30 2004
@@ -21,12 +21,12 @@
Specify a lookup. C<NAME_OF_RULE> is the name of the rule to be
used, C<dnsbl_zone> is the zone to look up IPs in, and C<lookuptype>
is the type of lookup (B<TXT> or B<A>). Note that you must also
-define a header-eval rule calling C<check_uridnsbl()> to use this.
+define a body-eval rule calling C<check_uridnsbl()> to use this.
Example:
uridnsbl URIBL_SBLXBL sbl-xbl.spamhaus.org. TXT
- header URIBL_SBLXBL eval:check_uridnsbl('URIBL_SBLXBL')
+ body URIBL_SBLXBL eval:check_uridnsbl('URIBL_SBLXBL')
describe URIBL_SBLXBL Contains a URL listed in the SBL/XBL blocklist
=item urirhsbl NAME_OF_RULE rhsbl_zone lookuptype
@@ -34,7 +34,7 @@
Specify a RHSBL-style domain lookup. C<NAME_OF_RULE> is the name of the rule
to be used, C<rhsbl_zone> is the zone to look up domain names in, and
C<lookuptype> is the type of lookup (B<TXT> or B<A>). Note that you must also
-define a header-eval rule calling C<check_uridnsbl()> to use this.
+define a body-eval rule calling C<check_uridnsbl()> to use this.
An RHSBL zone is one where the domain name is looked up, as a string; e.g. a
URI using the domain C<foo.com> will cause a lookup of C<foo.com.uriblzone.net>.
@@ -58,7 +58,7 @@
single A record containing a bitmask of results, or (if none of the preceding
options seem to fit) a regular expression.
-Note that, as with C<urirhsbl>, you must also define a header-eval rule calling
+Note that, as with C<urirhsbl>, you must also define a body-eval rule calling
C<check_uridnsbl()> to use this.
Example:
@@ -138,7 +138,6 @@
# this is just a placeholder; in fact the results are dealt with later
sub check_uridnsbl {
- my ($self, $permsgstatus, $rulename) = @_;
return 0;
}
@@ -167,7 +166,7 @@
$scanstate->{active_rules_rhsbl} = { };
$scanstate->{active_rules_revipbl} = { };
foreach my $rulename (keys %{$scanner->{conf}->{uridnsbls}}) {
- next unless ($scanner->{conf}->is_rule_active('head_evals',$rulename));
+ next unless ($scanner->{conf}->is_rule_active('body_evals',$rulename));
my $rulecf = $scanstate->{scanner}->{conf}->{uridnsbls}->{$rulename};
if ($rulecf->{is_rhsbl}) {
Modified: spamassassin/branches/3.0/rules/25_uribl.cf
==============================================================================
--- spamassassin/branches/3.0/rules/25_uribl.cf (original)
+++ spamassassin/branches/3.0/rules/25_uribl.cf Thu Oct 7 15:21:30 2004
@@ -34,32 +34,32 @@
uridnsbl_timeout 2
uridnsbl URIBL_SBL sbl.spamhaus.org. TXT
-header URIBL_SBL eval:check_uridnsbl('URIBL_SBL')
+body URIBL_SBL eval:check_uridnsbl('URIBL_SBL')
describe URIBL_SBL Contains an URL listed in the SBL blocklist
tflags URIBL_SBL net
urirhssub URIBL_SC_SURBL multi.surbl.org. A 2
-header URIBL_SC_SURBL eval:check_uridnsbl('URIBL_SC_SURBL')
+body URIBL_SC_SURBL eval:check_uridnsbl('URIBL_SC_SURBL')
describe URIBL_SC_SURBL Contains an URL listed in the SC SURBL blocklist
tflags URIBL_SC_SURBL net
urirhssub URIBL_WS_SURBL multi.surbl.org. A 4
-header URIBL_WS_SURBL eval:check_uridnsbl('URIBL_WS_SURBL')
+body URIBL_WS_SURBL eval:check_uridnsbl('URIBL_WS_SURBL')
describe URIBL_WS_SURBL Contains an URL listed in the WS SURBL blocklist
tflags URIBL_WS_SURBL net
urirhssub URIBL_PH_SURBL multi.surbl.org. A 8
-header URIBL_PH_SURBL eval:check_uridnsbl('URIBL_PH_SURBL')
+body URIBL_PH_SURBL eval:check_uridnsbl('URIBL_PH_SURBL')
describe URIBL_PH_SURBL Contains an URL listed in the PH SURBL blocklist
tflags URIBL_PH_SURBL net
urirhssub URIBL_OB_SURBL multi.surbl.org. A 16
-header URIBL_OB_SURBL eval:check_uridnsbl('URIBL_OB_SURBL')
+body URIBL_OB_SURBL eval:check_uridnsbl('URIBL_OB_SURBL')
describe URIBL_OB_SURBL Contains an URL listed in the OB SURBL blocklist
tflags URIBL_OB_SURBL net
urirhssub URIBL_AB_SURBL multi.surbl.org. A 32
-header URIBL_AB_SURBL eval:check_uridnsbl('URIBL_AB_SURBL')
+body URIBL_AB_SURBL eval:check_uridnsbl('URIBL_AB_SURBL')
describe URIBL_AB_SURBL Contains an URL listed in the AB SURBL blocklist
tflags URIBL_AB_SURBL net