TSS-18300/ZCS-10506: Addressing review comments.

Zimbra · Apr 22, 2021 · 3823214 · 3823214
1 parent 9d475b3
commit 3823214
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -319,7 +319,6 @@
                     <exclude name="**/cs/redolog/op/CreateMessageTest.java"/>
                     <exclude name="**/cs/service/mail/SearchActionTest.java"/>
                     <exclude name="**/cs/filter/RuleManagerWithCustomActionFilterTest.java"/>
-                    <exclude name="**/html/owasp/OwaspHtmlSanitizerTest.java"/>
                 </fileset>
             </batchtest>
           </junit>

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
@@ -720,6 +720,6 @@ public void testBugTSS18004() throws Exception {
                 + "style=\"font-size:11pt;font-family:Arial;font-variant-ligatures:normal;font-variant-east-asian:normal;font-variant-position:normal;vertical-align:baseline\">ave\n"
                 + "a nice day.</span></p>";
         // check that the extra double quotes are removed
-        Assert.assertTrue(output.equals(result.trim()));
+        Assert.assertTrue("Verification failed: Failed to remove extra double quotes.", output.equals(result.trim()));
     }
 }
diff --git a/store/src/java/com/zimbra/cs/html/owasp/OwaspHtmlSanitizer.java b/store/src/java/com/zimbra/cs/html/owasp/OwaspHtmlSanitizer.java
@@ -66,11 +66,11 @@ public String sanitize() throws UnsupportedEncodingException {
         return processSanitization(true).toString();
     }
 
-    public String sanitize(boolean cleanData) throws UnsupportedEncodingException {
-        return processSanitization(cleanData).toString();
+    public String sanitize(boolean cleanMalformedHtml) throws UnsupportedEncodingException {
+        return processSanitization(cleanMalformedHtml).toString();
     }
 
-    private StringBuilder processSanitization(boolean cleanData) throws UnsupportedEncodingException {
+    private StringBuilder processSanitization(boolean cleanMalformedHtml) throws UnsupportedEncodingException {
         OwaspThreadLocal threadLocalInstance = new OwaspThreadLocal();
         threadLocalInstance.setVHost(vHost);
         OwaspHtmlSanitizer.zThreadLocal.set(threadLocalInstance);
@@ -93,14 +93,14 @@ public void handle(final String x) {
         instantiatePolicy();
         final Policy policy = POLICY_DEFINITION.apply(new StyleTagReceiver(renderer));
         // run the html through the sanitizer
-        runSanitizer(html, policy, cleanData);
+        runSanitizer(html, policy, cleanMalformedHtml);
         // return the resulting HTML from the builder
         OwaspHtmlSanitizer.zThreadLocal.remove();
         return htmlBuilder;
     }
 
-    private void runSanitizer(String str, Policy policy, boolean cleanData) throws UnsupportedEncodingException {
-        if (cleanData) {
+    private void runSanitizer(String str, Policy policy, boolean cleanMalformedHtml) throws UnsupportedEncodingException {
+        if (cleanMalformedHtml) {
             HtmlSanitizer.sanitize(cleanMalformedHtml(str, false), policy);
         } else {
             HtmlSanitizer.sanitize(str, policy);