Merge branch bugfix/ZCS-10594 into develop #1150

ZCS-10594: Adding unit test for media queries not get removed from the style sheet.
Zimbra · Dec 17, 2021 · d7ef846 · d7ef846
1 parent c1ce7ee
commit d7ef846
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/store/src/java-test/com/zimbra/cs/html/owasp/OwaspHtmlSanitizerTest.java b/store/src/java-test/com/zimbra/cs/html/owasp/OwaspHtmlSanitizerTest.java
@@ -708,4 +708,31 @@ public void testZBUG1215() throws Exception {
         // check that the id and class attributes are not removed
         Assert.assertTrue(result.equals(html));
     }
+
+    @Test
+    public void testBugTSS18004() throws Exception {
+        String malformedHtml = "<html><body><h1 style=\"background-color:powderblue\"  \" > This is a heading</h1></body></html>";
+        String result = new OwaspHtmlSanitizer(malformedHtml, true, null).sanitize();
+        String output = "<html><body><h1 style=\"background-color:powderblue\"> This is a heading</h1></body></html>";
+        // check that the extra double quotes are removed
+        Assert.assertTrue("Verification failed: Failed to remove extra double quotes.", output.equals(result.trim()));
+    }
+
+    @Test
+    public void testBugTSS18004_1() throws Exception {
+        String malformedHtml = "<html><body><h1 style=\"background-color:powderblue\"\"> This is a heading</h1></body></html>";
+        String result = new OwaspHtmlSanitizer(malformedHtml, true, null).sanitize();
+        String output = "<html><body><h1 style=\"background-color:powderblue\"> This is a heading</h1></body></html>";
+        // check that the extra double quotes are removed
+        Assert.assertTrue("Verification failed: Failed to remove extra double quotes.", output.equals(result.trim()));
+    }
+
+    @Test
+    public void testBugZCS10594() throws Exception {
+        String malformedHtml = "<html><head><style>.uegzbq{font-size:22px;}@media not all and (pointer:coarse){.8bsfb:hover{background-color:#056b27;}}.scem3j{font-size:25px;}</style></head><body><div class=\"uegzbq\">First Line</div><br><div class=\"scem3j\">Second Line</div></body></html>";
+        String result = new OwaspHtmlSanitizer(malformedHtml, true, null).sanitize();
+        String output = "<html><head><style>.uegzbq{font-size:22px;}@media not all and (pointer:coarse){.8bsfb:hover{background-color:#056b27;}}.scem3j{font-size:25px;}</style></head><body><div class=\"uegzbq\">First Line</div><br /><div class=\"scem3j\">Second Line</div></body></html>";
+        Assert.assertTrue("Verification failed: Failed to include media queries.", output.equals(result.trim()));
+    }
+
 }