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/12/05 05:13:38 UTC
svn commit: r353979 - in /spamassassin:
rules/trunk/sandbox/felicity/70_other.cf
rules/trunk/sandbox/old/70_testing.cf
trunk/lib/Mail/SpamAssassin/EvalTests.pm
Author: felicity
Date: Sun Dec 4 20:13:35 2005
New Revision: 353979
URL: http://svn.apache.org/viewcvs?rev=353979&view=rev
Log:
move my EvalTests code into a plugin
Modified:
spamassassin/rules/trunk/sandbox/felicity/70_other.cf
spamassassin/rules/trunk/sandbox/old/70_testing.cf
spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Modified: spamassassin/rules/trunk/sandbox/felicity/70_other.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/sandbox/felicity/70_other.cf?rev=353979&r1=353978&r2=353979&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/felicity/70_other.cf (original)
+++ spamassassin/rules/trunk/sandbox/felicity/70_other.cf Sun Dec 4 20:13:35 2005
@@ -40,3 +40,23 @@
# tvd
# 0.506 0.5714 0.0000 1.000 1.00 0.01 T_DRUGS_HDIA
header T_DRUGS_HDIA Subject =~ /\bhoodia\b/i
+
+
+loadplugin Mail::SpamAssassin::Plugin::Sandbox::felicity sandbox-felicity.pm
+
+ifplugin Mail::SpamAssassin::Plugin::Sandbox::felicity
+body T_HTML_IFRAME_SRC eval:check_iframe_src()
+describe T_HTML_IFRAME_SRC Message has HTML IFRAME tag with SRC URI
+
+header T_FROM_FORMAT eval:check_from_format()
+
+# From discussion on users@ list
+body T_URI_HTML_ONLY eval:check_html_uri_only()
+describe T_URI_HTML_ONLY URIs only found in HTML part of multipart/alternative message
+
+# tvd
+# 1.345 1.5187 0.0000 1.000 1.00 0.01 T_SUBJ_LEN_SHORT
+# 0.224 0.2525 0.0000 1.000 0.50 0.01 T_SUBJ_LEN_LONG
+header T_SUBJ_LEN_SHORT eval:subject_length('0','4')
+header T_SUBJ_LEN_LONG eval:subject_length('149','999')
+endif
Modified: spamassassin/rules/trunk/sandbox/old/70_testing.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/sandbox/old/70_testing.cf?rev=353979&r1=353978&r2=353979&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/old/70_testing.cf (original)
+++ spamassassin/rules/trunk/sandbox/old/70_testing.cf Sun Dec 4 20:13:35 2005
@@ -18,24 +18,9 @@
#
########################################################################
-body T_HTML_IFRAME_SRC eval:check_iframe_src()
-describe T_HTML_IFRAME_SRC Message has HTML IFRAME tag with SRC URI
-
-header T_FROM_FORMAT eval:check_from_format()
-
ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
urirhsbl T_URIBL_XS_SURBL xs.surbl.org. A
body T_URIBL_XS_SURBL eval:check_uridnsbl('T_URIBL_XS_SURBL')
describe T_URIBL_XS_SURBL Has URI in XS - Testing
tflags T_URIBL_XS_SURBL net
endif
-
-# From discussion on users@ list
-body T_URI_HTML_ONLY eval:check_html_uri_only()
-describe T_URI_HTML_ONLY URIs only found in HTML part of multipart/alternative message
-
-# tvd
-# 1.345 1.5187 0.0000 1.000 1.00 0.01 T_SUBJ_LEN_SHORT
-# 0.224 0.2525 0.0000 1.000 0.50 0.01 T_SUBJ_LEN_LONG
-header T_SUBJ_LEN_SHORT eval:subject_length('0','4')
-header T_SUBJ_LEN_LONG eval:subject_length('149','999')
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?rev=353979&r1=353978&r2=353979&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Sun Dec 4 20:13:35 2005
@@ -3093,26 +3093,6 @@
return 0;
}
-sub check_html_uri_only {
- my ($self) = @_;
-
- # Find out if there are any multipart/alternative parts in the message
- my @ma = $self->{msg}->find_parts(qr@^multipart/alternative\b@i);
-
- # If there are no multipart/alternative sections, skip this test.
- return if (!@ma);
-
- # At this point, we're not actually checking the alternates, just the entire
- # message.
- my $return = 0;
- while (my($k,$v) = each %{$self->{html}->{uri_detail}}) {
- $return = 1; # make sure there's at least 1 URI
- return 0 if ($v->{types}->{parsed});
- }
-
- return $return;
-}
-
sub check_https_ip_mismatch {
my ($self) = @_;
@@ -3127,16 +3107,6 @@
return 0;
}
-sub check_iframe_src {
- my ($self) = @_;
-
- while (my($k,$v) = each %{$self->{html}->{uri_detail}}) {
- return 1 if $v->{types}->{iframe};
- }
-
- return 0;
-}
-
sub check_ratware_envelope_from {
my ($self) = @_;
@@ -3156,25 +3126,6 @@
}
return 0;
-}
-
-sub check_from_format {
- my ($self) = @_;
-
- my $name = $self->get('From:name') || return;
- return if ($name !~ m/^[A-Z][a-z]+\.[A-Z][a-z]+\@/);
-
- my $addr = $self->get('From:addr') || return;
- return if ($addr !~ m/^[A-Z][a-z]+\.[A-Z][a-z]+\@/);
-
- return if ($name eq $addr);
- return 1;
-}
-
-sub subject_length {
- my ($self, $min, $max) = @_;
- my $len = length($self->get('Subject'));
- return($len < $max && $len >= $min);
}
1;