From 8042a609cd9205ccc039136654d487f46e43ce80 Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Tue, 10 May 2022 13:54:28 +0200
Subject: [PATCH] Fixes: #4053 - Zammad email display broken.

(cherry picked from commit 584e3ec188d97169593aa0939b063c45b71ad863)
---
 config/initializers/html_sanitizer.rb | 19 +++++++++++++++++++
 test/unit/html_sanitizer_test.rb      |  1 +
 2 files changed, 20 insertions(+)

diff --git a/config/initializers/html_sanitizer.rb b/config/initializers/html_sanitizer.rb
index f4e64ce86..0ee420b05 100644
--- a/config/initializers/html_sanitizer.rb
+++ b/config/initializers/html_sanitizer.rb
@@ -132,17 +132,22 @@ Rails.application.config.html_sanitizer_css_values_blocklist = {
   '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 @@ Rails.application.config.html_sanitizer_css_values_blocklist = {
   '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 @@ Rails.application.config.html_sanitizer_css_values_blocklist = {
   '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 @@ Rails.application.config.html_sanitizer_css_values_blocklist = {
   '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
index 9ae2377d7..0b530ae42 100644
--- a/test/unit/html_sanitizer_test.rb
+++ b/test/unit/html_sanitizer_test.rb
@@ -134,6 +134,7 @@ test 123
 <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>')