Fixes: #4053 - Zammad email display broken.

(cherry picked from commit 584e3ec)
zammad · May 10, 2022 · 8042a60 · 8042a60
1 parent 61f42f9
commit 8042a60
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/config/initializers/html_sanitizer.rb b/config/initializers/html_sanitizer.rb
@@ -132,17 +132,22 @@
   'table' => [
     'font-size:0',
     'font-size:0px',
+    'font-size:0pt',
     'font-size:0em',
     'font-size:0%',
+    'font-size:1',
     'font-size:1px',
+    'font-size:1pt',
     'font-size:1em',
     'font-size:1%',
     'font-size:2',
     'font-size:2px',
+    'font-size:2pt',
     'font-size:2em',
     'font-size:2%',
     'font-size:3',
     'font-size:3px',
+    'font-size:3pt',
     'font-size:3em',
     'font-size:3%',
     'display:none',
@@ -151,17 +156,22 @@
   'th'    => [
     'font-size:0',
     'font-size:0px',
+    'font-size:0pt',
     'font-size:0em',
     'font-size:0%',
+    'font-size:1',
     'font-size:1px',
+    'font-size:1pt',
     'font-size:1em',
     'font-size:1%',
     'font-size:2',
     'font-size:2px',
+    'font-size:2pt',
     'font-size:2em',
     'font-size:2%',
     'font-size:3',
     'font-size:3px',
+    'font-size:3pt',
     'font-size:3em',
     'font-size:3%',
     'display:none',
@@ -170,18 +180,22 @@
   'tr'    => [
     'font-size:0',
     'font-size:0px',
+    'font-size:0pt',
     'font-size:0em',
     'font-size:0%',
     'font-size:1',
     'font-size:1px',
+    'font-size:1pt',
     'font-size:1em',
     'font-size:1%',
     'font-size:2',
     'font-size:2px',
+    'font-size:2pt',
     'font-size:2em',
     'font-size:2%',
     'font-size:3',
     'font-size:3px',
+    'font-size:3pt',
     'font-size:3em',
     'font-size:3%',
     'display:none',
@@ -190,17 +204,22 @@
   'td'    => [
     'font-size:0',
     'font-size:0px',
+    'font-size:0pt',
     'font-size:0em',
     'font-size:0%',
+    'font-size:1',
     'font-size:1px',
+    'font-size:1pt',
     'font-size:1em',
     'font-size:1%',
     'font-size:2',
     'font-size:2px',
+    'font-size:2pt',
     'font-size:2em',
     'font-size:2%',
     'font-size:3',
     'font-size:3px',
+    'font-size:3pt',
     'font-size:3em',
     'font-size:3%',
     'display:none',

diff --git a/test/unit/html_sanitizer_test.rb b/test/unit/html_sanitizer_test.rb
@@ -134,6 +134,7 @@ class HtmlSanitizerTest < ActiveSupport::TestCase
 <a href="#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2">abc</a>')
     assert_equal(HtmlSanitizer.strict('<table><tr style="font-size: 0"><td>123</td></tr></table>'), '<table><tr><td>123</td></tr></table>')
     assert_equal(HtmlSanitizer.strict('<table><tr style="font-size: 0px"><td>123</td></tr></table>'), '<table><tr><td>123</td></tr></table>')
+    assert_equal(HtmlSanitizer.strict('<table><tr style="font-size: 0pt"><td>123</td></tr></table>'), '<table><tr><td>123</td></tr></table>')
     assert_equal(HtmlSanitizer.strict('<table><tr style="font-size:0"><td>123</td></tr></table>'), '<table><tr><td>123</td></tr></table>')
     assert_equal(HtmlSanitizer.strict('<table><tr style="font-Size:0px"><td>123</td></tr></table>'), '<table><tr><td>123</td></tr></table>')
     assert_equal(HtmlSanitizer.strict('<table><tr style="font-size:0em"><td>123</td></tr></table>'), '<table><tr><td>123</td></tr></table>')