You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2004/02/29 03:36:51 UTC
svn commit: rev 6929 - in incubator/spamassassin/trunk: lib/Mail/SpamAssassin rules
Author: jm
Date: Sat Feb 28 18:36:50 2004
New Revision: 6929
Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
incubator/spamassassin/trunk/rules/20_html_tests.cf
incubator/spamassassin/trunk/rules/30_text_de.cf
incubator/spamassassin/trunk/rules/30_text_fr.cf
incubator/spamassassin/trunk/rules/50_scores.cf
incubator/spamassassin/trunk/rules/regression_tests.cf
Log:
bug 1399: cannot tell window-blurring and widget-defocusing apart, so dropping HTML_WIN_BLUR rule
Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm Sat Feb 28 18:36:50 2004
@@ -847,13 +847,11 @@
{
$self->{html}{html_event} = 1;
}
- if (/\bon(?:blur|contextmenu|focus|load|resize|submit|unload)\b/i &&
+ if (/\bon(?:contextmenu|load|resize|submit|unload)\b/i &&
$attr->{$_})
{
$self->{html}{html_event_unsafe} = 1;
if ($attr->{$_} =~ /\.open\s*\(/) { $self->{html}{window_open} = 1; }
- if ($attr->{$_} =~ /\.blur\s*\(/) { $self->{html}{window_blur} = 1; }
- if ($attr->{$_} =~ /\.focus\s*\(/) { $self->{html}{window_focus} = 1; }
}
}
}
@@ -963,8 +961,6 @@
$self->{html}{html_event_unsafe} = 1;
}
if ($text =~ /\.open\s*\(/) { $self->{html}{window_open} = 1; }
- if ($text =~ /\.blur\s*\(/) { $self->{html}{window_blur} = 1; }
- if ($text =~ /\.focus\s*\(/) { $self->{html}{window_focus} = 1; }
return;
}
@@ -1018,8 +1014,6 @@
$self->{html}{html_event_unsafe} = 1;
}
if ($text =~ /\.open\s*\(/) { $self->{html}{window_open} = 1; }
- if ($text =~ /\.blur\s*\(/) { $self->{html}{window_blur} = 1; }
- if ($text =~ /\.focus\s*\(/) { $self->{html}{window_focus} = 1; }
return;
}
Modified: incubator/spamassassin/trunk/rules/20_html_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_html_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_html_tests.cf Sat Feb 28 18:36:50 2004
@@ -245,12 +245,6 @@
body HTML_WEB_BUGS eval:html_test('web_bugs')
describe HTML_WEB_BUGS Image tag intended to identify you
-body HTML_WIN_BLUR eval:html_test('window_blur')
-describe HTML_WIN_BLUR Javascript to move windows around
-
-body HTML_WIN_FOCUS eval:html_test('window_focus')
-describe HTML_WIN_FOCUS Javascript to change window focus
-
body HTML_WIN_OPEN eval:html_test('window_open')
describe HTML_WIN_OPEN Javascript to open a new window
Modified: incubator/spamassassin/trunk/rules/30_text_de.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_de.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_de.cf Sat Feb 28 18:36:50 2004
@@ -422,8 +422,6 @@
lang de describe HTML_LINK_CLICK_CAPS Hyperlink sagt "CLICK"
lang de describe HTML_RELAYING_FRAME HTML-Frame in Nachricht
lang de describe HTML_WEB_BUGS Bildhyperlink mit Identifizierungsnummer
-lang de describe HTML_WIN_BLUR bewegte Fenster durch Javascript-Anweisungen
-lang de describe HTML_WIN_FOCUS Javascript-Anweisungen �ndern den Fokus des Mauszeigers
lang de describe HTML_WIN_OPEN Javascript-Anweisungen �ffnen neue Fenster
lang de describe HTML_WITH_BGCOLOR HTML-Hintergrundfarbe in E-Mail nicht Wei�
lang de describe HTML_TAG_BALANCE_A zuviele schlie�ende "/a"-Markierungen in HTML-Nachricht
Modified: incubator/spamassassin/trunk/rules/30_text_fr.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_fr.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_fr.cf Sat Feb 28 18:36:50 2004
@@ -417,8 +417,6 @@
lang fr describe HTML_TITLE_EMPTY Le titre HTML ne contient aucun texte
lang fr describe HTML_TITLE_UNTITLED Le titre HTML contient "untitled" (sans-titre)
lang fr describe HTML_WEB_BUGS Tag image HTML avec un code ID permettant de vous identifier
-lang fr describe HTML_WIN_BLUR Javascript pr�vu pour promener une fen�tre � l'�cran
-lang fr describe HTML_WIN_FOCUS Javascript pr�vu pour mettre une fen�tre � l'avant-plan
lang fr describe HTML_WIN_OPEN HTML: Pr�sence de Javascript causant l'ouverture d'une fen�tre
lang fr describe HTML_WITH_BGCOLOR Message en HTML avec un fond de couleur
lang fr describe HTML_00_10 Le message est compos� de 0 � 10% de HTML
Modified: incubator/spamassassin/trunk/rules/50_scores.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/50_scores.cf (original)
+++ incubator/spamassassin/trunk/rules/50_scores.cf Sat Feb 28 18:36:50 2004
@@ -288,7 +288,6 @@
score HTML_TITLE_EMPTY 0.449 0.544 0.200 0.119
score HTML_TITLE_UNTITLED 0.501 0.699 0.360 0.430
score HTML_WEB_BUGS 1.116 0.587 0.279 0.336
-score HTML_WIN_BLUR 0.064 0.001 0.001 0.951
score HTTP_ENTITIES_HOST 1.059 0.001 1.719 1.920
score HTTP_ESCAPED_HOST 1.101 2.403 1.001 1.509
score HTTP_EXCESSIVE_ESCAPES 0.153 0.748 0.502 0.777
@@ -685,7 +684,6 @@
score MSGID_THREESIXSIX 0.196 1.298 0.001 0.001
score RATWARE_HASH_2 0.001 1.237 0.001 0.001
score BUY_JUDGEMENTS 0.001
-score HTML_WIN_FOCUS 0.001
score CONGRATULATIONS 0.001 0.041 0.001 0.001
score TO_INVESTORS 0.001
score FAKE_HELO_NETZERO 0.001
Modified: incubator/spamassassin/trunk/rules/regression_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/regression_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/regression_tests.cf Sat Feb 28 18:36:50 2004
@@ -84,10 +84,6 @@
test HTML_WIN_OPEN ok <body onload='win=window.open("http://foo/")'>
test HTML_WIN_OPEN fail The window.open() function
-test HTML_WIN_BLUR ok <script> win=window.open("http://foo/") win.blur() window.focus() </script>
-test HTML_WIN_BLUR ok <body onload='win=window.open("http://foo/"); win.blur()'>
-test HTML_WIN_BLUR fail The win.blur() function
-
test BAD_CREDIT ok no credit checks
test BAD_CREDIT ok reestablish credit
test BAD_CREDIT ok establish good credit
Re: svn commit: rev 6929 - in incubator/spamassassin/trunk: lib/Mail/SpamAssassin rules
Posted by Daniel Quinlan <qu...@pathname.com>.
jm@apache.org writes:
> bug 1399: cannot tell window-blurring and widget-defocusing apart, so
> dropping HTML_WIN_BLUR rule
Should we drop HTML_WIN_FOCUS? The statistics seemed pretty decent for
that rule (HTML_MESSAGE results).
0.165 0.1676 0.0000 1.000 0.93 0.00 HTML_WIN_FOCUS
0.318 0.3230 0.0000 1.000 0.88 0.00 HTML_WIN_FOCUS:daf
1.313 1.3560 0.0000 1.000 0.89 0.00 HTML_WIN_FOCUS:jm
0.345 0.3565 0.0000 1.000 0.91 0.00 HTML_WIN_FOCUS:parkerm
0.078 0.0856 0.0000 1.000 0.95 0.00 HTML_WIN_FOCUS:quinlan
0.118 0.1444 0.0000 1.000 0.94 0.00 HTML_WIN_FOCUS:rODbegbie
0.096 0.0965 0.0000 1.000 0.92 0.00 HTML_WIN_FOCUS:theo
Rod's results last night have some FPs, but not many:
0.270 0.2905 0.0615 0.825 0.50 0.00 HTML_WIN_FOCUS:rODbegbie
--
Daniel Quinlan anti-spam (SpamAssassin), Linux,
http://www.pathname.com/~quinlan/ and open source consulting