Using document traversal to close HTML tags

HubSpot · Nov 15, 2023 · b4c604f · b4c604f
1 parent daf2c84
commit b4c604f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/CloseHtmlFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/CloseHtmlFilter.java
@@ -6,6 +6,7 @@
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import java.util.Objects;
 import org.jsoup.Jsoup;
+import org.jsoup.safety.Safelist;
 
 @JinjavaDoc(
   value = "Closes open HTML tags in a string",
@@ -21,6 +22,6 @@ public String getName() {
 
   @Override
   public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
-    return Jsoup.parse(Objects.toString(var)).toString();
+    return Jsoup.parseBodyFragment(Objects.toString(var)).body().html();
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/CloseHtmlFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/CloseHtmlFilterTest.java
@@ -21,4 +21,17 @@ public void itClosesTags() {
     String openTags = "<p>Hello, world!";
     assertThat(f.filter(openTags, interpreter)).isEqualTo("<p>Hello, world!</p>");
   }
+
+  @Test
+  public void itIgnoresClosedTags() {
+    String openTags = "<p>Hello, world!</p>";
+    assertThat(f.filter(openTags, interpreter)).isEqualTo("<p>Hello, world!</p>");
+  }
+
+  @Test
+  public void itClosesMultipleTags() {
+    String openTags = "<h1><p>Hello, world!";
+    assertThat(f.filter(openTags, interpreter))
+      .isEqualTo("<h1><p>Hello, world!</p></h1>");
+  }
 }