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/11/08 21:32:22 UTC
svn commit: rev 56969 - in spamassassin/trunk: lib/Mail/SpamAssassin rules
Author: felicity
Date: Mon Nov 8 12:32:21 2004
New Revision: 56969
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
spamassassin/trunk/rules/70_testing.cf
Log:
update the blank uri code some more -- breakdown the types as much as possible (blank href from a, blank src from img, etc.) hopefully we may get better results?
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm Mon Nov 8 12:32:21 2004
@@ -135,6 +135,7 @@
$self->put_results(comment => $self->{comment});
$self->put_results(title => $self->{title});
$self->put_results(anchor => $self->{anchor});
+ $self->put_results(blank_uri => $self->{blank_uri});
# final result hashes
$self->put_results(inside => $self->{inside});
@@ -337,7 +338,7 @@
if ($tag =~ /^(?:body|table|tr|td)$/) {
if (defined $attr->{background}) {
if ($attr->{background} eq '') {
- $self->put_results('blank_background' => $tag);
+ push(@{$self->{blank_uri}}, $tag);
}
$self->push_uri($attr->{background});
}
@@ -345,7 +346,7 @@
elsif ($tag =~ /^(?:a|area|link)$/) {
if (defined $attr->{href}) {
if ($attr->{href} eq '') {
- $self->put_results('blank_href' => $tag)
+ push(@{$self->{blank_uri}}, $tag);
}
$self->push_uri($attr->{href});
}
@@ -353,7 +354,7 @@
elsif ($tag =~ /^(?:img|frame|iframe|embed|script)$/) {
if (defined $attr->{src}) {
if ($attr->{src} eq '') {
- $self->put_results('blank_src' => $tag)
+ push(@{$self->{blank_uri}}, $tag);
}
$self->push_uri($attr->{src});
}
@@ -361,7 +362,7 @@
elsif ($tag eq "form") {
if (defined $attr->{action}) {
if ($attr->{action} eq '') {
- $self->put_results('blank_action' => $tag)
+ push(@{$self->{blank_uri}}, $tag);
}
$self->push_uri($attr->{action});
}
Modified: spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf (original)
+++ spamassassin/trunk/rules/70_testing.cf Mon Nov 8 12:32:21 2004
@@ -318,7 +318,24 @@
# bug 3439
uri T_EMPTY_URI /^$/
-body T_EMPTY_URI_HREF eval:html_test('blank_href')
-body T_EMPTY_URI_SRC eval:html_test('blank_src')
-body T_EMPTY_URI_ACTION eval:html_test('blank_action')
-body T_EMPTY_URI_BG eval:html_test('blank_background')
+
+meta T_EMPTY_URI_HREF T_EMPTY_URI_HREF_A || T_EMPTY_URI_HREF_AREA || T_EMPTY_URI_HREF_LINK
+body T_EMPTY_URI_HREF_A eval:html_text_match('blank_uri', '^a$')
+body T_EMPTY_URI_HREF_AREA eval:html_text_match('blank_uri', '^area$')
+body T_EMPTY_URI_HREF_LINK eval:html_text_match('blank_uri', '^link$')
+
+meta T_EMPTY_URI_BG T_EMPTY_URI_BG_BODY || T_EMPTY_URI_BG_TABLE || T_EMPTY_URI_BG_TD || T_EMPTY_URI_BG_TR
+body T_EMPTY_URI_BG_BODY eval:html_text_match('blank_uri', '^body$')
+body T_EMPTY_URI_BG_TABLE eval:html_text_match('blank_uri', '^table$')
+body T_EMPTY_URI_BG_TD eval:html_text_match('blank_uri', '^td$')
+body T_EMPTY_URI_BG_TR eval:html_text_match('blank_uri', '^tr$')
+
+meta T_EMPTY_URI_SRC T_EMPTY_URI_SRC_IMG || T_EMPTY_URI_SRC_FRAME || T_EMPTY_URI_SRC_IFRAME || T_EMPTY_URI_SRC_EMBED || T_EMPTY_URI_SRC_SCRIPT
+body T_EMPTY_URI_SRC_IMG eval:html_text_match('blank_uri', '^img$')
+body T_EMPTY_URI_SRC_FRAME eval:html_text_match('blank_uri', '^frame$')
+body T_EMPTY_URI_SRC_IFRAME eval:html_text_match('blank_uri', '^iframe$')
+body T_EMPTY_URI_SRC_EMBED eval:html_text_match('blank_uri', '^embed$')
+body T_EMPTY_URI_SRC_SCRIPT eval:html_text_match('blank_uri', '^script$')
+
+# can only be from "form"
+body T_EMPTY_URI_ACTION eval:html_text_match('blank_uri', '^form$')