You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/07/10 17:10:34 UTC

svn commit: r1862889 - in /spamassassin: branches/3.4/lib/Mail/SpamAssassin/HTML.pm trunk/lib/Mail/SpamAssassin/HTML.pm

Author: hege
Date: Wed Jul 10 17:10:34 2019
New Revision: 1862889

URL: http://svn.apache.org/viewvc?rev=1862889&view=rev
Log:
HTML_FONT_FACE_BAD fixes from Bug 5956, 7312

Modified:
    spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm?rev=1862889&r1=1862888&r2=1862889&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm Wed Jul 10 17:10:34 2019
@@ -616,7 +616,16 @@ sub html_tests {
   my ($self, $tag, $attr, $num) = @_;
 
   if ($tag eq "font" && exists $attr->{face}) {
-    if ($attr->{face} !~ /^'?[a-z ][a-z -]*[a-z](?:,\s*[a-z][a-z -]*[a-z])*'?$/i) {
+    # Fixes from Bug 5956, 7312
+    # Examples seen in ham:
+    #  "Tahoma", Verdana, Arial, sans-serif
+    #  'Montserrat', sans-serif
+    #  Arial,Helvetica,Sans-Serif;
+    #  .SFUIDisplay
+    #  hirakakupro-w3
+    # TODO: There's still the problem completely foreign unicode strings,
+    # probably this rule should be deprecated.
+    if ($attr->{face} !~ /^\s*["'.]?[a-z ][a-z -]*[a-z]\d?["']?(?:,\s*["']?[a-z][a-z -]*[a-z]\d?["']?)*;?$/i) {
       $self->put_results(font_face_bad => 1);
     }
   }

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm?rev=1862889&r1=1862888&r2=1862889&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm Wed Jul 10 17:10:34 2019
@@ -627,7 +627,16 @@ sub html_tests {
   my ($self, $tag, $attr, $num) = @_;
 
   if ($tag eq "font" && exists $attr->{face}) {
-    if ($attr->{face} !~ /^'?[a-z ][a-z -]*[a-z](?:,\s*[a-z][a-z -]*[a-z])*'?$/i) {
+    # Fixes from Bug 5956, 7312
+    # Examples seen in ham:
+    #  "Tahoma", Verdana, Arial, sans-serif
+    #  'Montserrat', sans-serif
+    #  Arial,Helvetica,Sans-Serif;
+    #  .SFUIDisplay
+    #  hirakakupro-w3
+    # TODO: There's still the problem completely foreign unicode strings,
+    # probably this rule should be deprecated.
+    if ($attr->{face} !~ /^\s*["'.]?[a-z ][a-z -]*[a-z]\d?["']?(?:,\s*["']?[a-z][a-z -]*[a-z]\d?["']?)*;?$/i) {
       $self->put_results(font_face_bad => 1);
     }
   }