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 2005/06/20 05:00:41 UTC
svn commit: r191379 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/EvalTests.pm rules/20_dnsbl_tests.cf
rules/30_text_de.cf rules/30_text_fr.cf rules/30_text_nl.cf
rules/50_scores.cf
Author: felicity
Date: Sun Jun 19 20:00:40 2005
New Revision: 191379
URL: http://svn.apache.org/viewcvs?rev=191379&view=rev
Log:
per discussions with Habeas folks, clean up the rules -- get rid of user and infringer, just do accreditor lookup
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
spamassassin/trunk/rules/20_dnsbl_tests.cf
spamassassin/trunk/rules/30_text_de.cf
spamassassin/trunk/rules/30_text_fr.cf
spamassassin/trunk/rules/30_text_nl.cf
spamassassin/trunk/rules/50_scores.cf
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?rev=191379&r1=191378&r2=191379&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Sun Jun 19 20:00:40 2005
@@ -1318,46 +1318,6 @@
check_rbl_sub(@_);
}
-# Check an RBL if a message is Habeas SWE (a.k.a. the Habeas Haiku).
-# Test is skipped if the message contains an Accreditor assertion;
-# otherwise transitional senders using both the SWE header and the
-# accreditor assertion would get a double bonus. <cs...@habeas.com>
-#
-sub check_rbl_swe {
- my ($self, $rule, $set, $rbl_server, $subtest) = @_;
-
- if (!defined $self->{accreditor_tag}) {
- $self->message_accreditor_tag();
- }
- if (%{$self->{accreditor_tag}}) {
- return 0;
- }
- if (!defined $self->{habeas_swe}) {
- $self->message_is_habeas_swe();
- }
- if (defined $self->{habeas_swe} && $self->{habeas_swe}) {
- $self->check_rbl_backend($rule, $set, $rbl_server, 'A', $subtest);
- }
- return 0;
-}
-
-# check an RBL if the message contains an "accreditor assertion," that is,
-# the message contains the name of a service that will vouch for their
-# practices. <cs...@habeas.com>
-#
-sub check_rbl_accreditor {
- my ($self, $rule, $set, $rbl_server, $subtest, $accreditor) = @_;
-
- if (!defined $self->{accreditor_tag}) {
- $self->message_accreditor_tag();
- }
- if ($self->{accreditor_tag}->{$accreditor}) {
- $self->check_rbl_backend($rule, $set, $rbl_server, 'A', $subtest);
- }
- return 0;
-}
-
-
# this only checks the address host name and not the domain name because
# using the domain name had much worse results for dsn.rfc-ignorant.org
sub check_rbl_from_host {
@@ -2045,29 +2005,20 @@
###########################################################################
-sub message_is_habeas_swe {
- my ($self) = @_;
-
- return $self->{habeas_swe} if defined $self->{habeas_swe};
-
- $self->{habeas_swe} = 0;
+# check an RBL if the message contains an "accreditor assertion,"
+# that is, the message contains the name of a service that will vouch
+# for their practices.
+#
+sub check_rbl_accreditor {
+ my ($self, $rule, $set, $rbl_server, $subtest, $accreditor) = @_;
- my $text = '';
- for (my $i = 1; $i <= 9; $i++) {
- $text .= (lc($self->get("X-Habeas-SWE-$i")) || return 0);
+ if (!defined $self->{accreditor_tag}) {
+ $self->message_accreditor_tag();
}
- if ($text) {
- $text =~ s/\s+/ /g;
- $text =~ s/^\s|\s$//g;
- $text =~ s@/?>@/>@;
- my $sha1 = sha1_hex($text);
-
- if ($sha1 eq '76c65d9eb65e572166a08b50fd197b29af09d43a') {
- $self->{habeas_swe} = 1;
- }
+ if ($self->{accreditor_tag}->{$accreditor}) {
+ $self->check_rbl_backend($rule, $set, $rbl_server, 'A', $subtest);
}
-
- return $self->{habeas_swe};
+ return 0;
}
# Check for an Accreditor Assertion within the message, that is, the name of
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=191379&r1=191378&r2=191379&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Sun Jun 19 20:00:40 2005
@@ -295,23 +295,6 @@
# ---------------------------------------------------------------------------
-# Habeas Legacy support: the Habeas Infringers blocklist.
-# sa-hil.habeas.com for SpamAssassin queries
-# hil.habeas.com for other queries
-header HABEAS_INFRINGER eval:check_rbl_swe('hil', 'sa-hil.habeas.com.')
-describe HABEAS_INFRINGER Has Habeas warrant mark and on Infringer List
-tflags HABEAS_INFRINGER net
-#reuse HABEAS_INFRINGER
-
-# Habeas Legacy support: the Habeas Users whitelist. This list contains users
-# from accredit.habeas.com at "accreditation level" 10 to 39.
-# sa-hul.habeas.com for SpamAssassin queries
-# hul.habeas.com for other queries
-header HABEAS_USER eval:check_rbl_swe('hul-firsttrusted', 'sa-hul.habeas.com.')
-describe HABEAS_USER Has Habeas warrant mark and on User List
-tflags HABEAS_USER net nice
-#reuse HABEAS_USER
-
# Habeas Accredited Senders
# Last octet of the returned A record indicates the Habeas-assigned
# "Accreditation Level" of the Sender.
@@ -321,16 +304,14 @@
#
# sa-accredit.habeas.com is for SpamAssassin use.
#
-header HABEAS_ACCREDITED_COI eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[123]\d', 'habeas')
+header HABEAS_ACCREDITED_COI eval:check_rbl('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[123]\d', 'habeas')
describe HABEAS_ACCREDITED_COI Habeas Accredited Confirmed Opt-In or Better
tflags HABEAS_ACCREDITED_COI net nice
-header HABEAS_ACCREDITED_SOI eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[45]\d', 'habeas')
+header HABEAS_ACCREDITED_SOI eval:check_rbl_sub('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[45]\d', 'habeas')
describe HABEAS_ACCREDITED_SOI Habeas Accredited Opt-In or Better
tflags HABEAS_ACCREDITED_SOI net nice
-header HABEAS_CHECKED eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[6789]\d', 'habeas')
+header HABEAS_CHECKED eval:check_rbl_sub('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[6789]\d', 'habeas')
describe HABEAS_CHECKED Habeas Checked
tflags HABEAS_CHECKED net nice
-
-
Modified: spamassassin/trunk/rules/30_text_de.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/30_text_de.cf?rev=191379&r1=191378&r2=191379&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_de.cf (original)
+++ spamassassin/trunk/rules/30_text_de.cf Sun Jun 19 20:00:40 2005
@@ -108,8 +108,6 @@
lang de describe DNS_FROM_RFC_BOGUSMX Absender in bogusmx-Liste von www.rfc-ignorant.org
lang de describe RCVD_IN_DSBL Transportiert via Rechner in Liste von list.dsbl.org
lang de describe DNS_FROM_AHBL_RHSBL Absenderadresse in Liste von dnsbl.ahbl.org
-lang de describe HABEAS_INFRINGER Verletzung das Warenzeichens der Firma Habeas
-lang de describe HABEAS_USER Offizieller Nutzer des Warenzeichens der Firma Habeas
lang de describe RCVD_IN_BSP_TRUSTED Senderechner in Liste von http://www.bondedsender.org/
lang de describe RCVD_IN_BSP_OTHER Senderechner in Liste von http://www.bondedsender.org/
lang de describe RCVD_IN_BL_SPAMCOP_NET Transportiert via Rechner in Liste von www.spamcop.net
Modified: spamassassin/trunk/rules/30_text_fr.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/30_text_fr.cf?rev=191379&r1=191378&r2=191379&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_fr.cf (original)
+++ spamassassin/trunk/rules/30_text_fr.cf Sun Jun 19 20:00:40 2005
@@ -199,7 +199,6 @@
lang fr describe GTUBE Test générique de courrier non sollicté en masse
lang fr describe GUARANTEED_STUFF Copntient "Guaranteed Stuff" (produit garanti)
lang fr describe GUARANTEED_100_PERCENT Contient "One hundred percent guaranteed" (100% garanti)
-lang fr describe HABEAS_INFRINGER Sur la liste d'infraction d'Habeas, mais utilise la marque d'Habeas
lang fr describe HAIR_LOSS Prétend lutter contre la calvitie
lang fr describe HARDCORE_PORN Pornographie probable "Hardcore Porn"
lang fr describe HEAD_ILLEGAL_CHARS En-tête contient trop de caractères bruts invalides
Modified: spamassassin/trunk/rules/30_text_nl.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/30_text_nl.cf?rev=191379&r1=191378&r2=191379&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_nl.cf (original)
+++ spamassassin/trunk/rules/30_text_nl.cf Sun Jun 19 20:00:40 2005
@@ -45,7 +45,6 @@
lang nl describe BLANK_LINES_80_90 Bericht bestaat voor 80-90% uit witregels
lang nl describe BLANK_LINES_90_100 Bericht bestaat voor 90-100% uit witregels
lang nl describe UNIQUE_WORDS Bericht bevat veel woorden die slechts eenmaal worden gebruikt
-lang nl describe HABEAS_USER Bevat een Habeas watermerk (http://www.habeas.com/)
lang nl describe __RCVD_IN_NJABL Ontvangen via een relay die gevonden is in dnsbl.njabl.org
lang nl describe RCVD_IN_NJABL_RELAY NJABL: verzender is een bevestigde open relay
lang nl describe RCVD_IN_NJABL_DUL NJABL: inbellende verzender verstuurde nier via local SMTP
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/50_scores.cf?rev=191379&r1=191378&r2=191379&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Sun Jun 19 20:00:40 2005
@@ -608,8 +608,6 @@
score HABEAS_ACCREDITED_COI 0 -8.0 0 -8.0
score HABEAS_ACCREDITED_SOI 0 -4.3 0 -4.3
score HABEAS_CHECKED 0 -0.2 0 -0.2
-score HABEAS_INFRINGER 0 16.0 0 16.0
-score HABEAS_USER 0 -8.0 0 -8.0
# CompleteWhois: http://www.completewhois.com/
score RCVD_IN_WHOIS_HIJACKED 0 1.0 0 1.0