Merge pull request #927 from HubSpot/revert-926-revert-925-master

Shade and upgrade jsoup to 1.15.3
HubSpot · Jun 12, 2023 · 1a909fc · 1a909fc
2 parents 975dddd + f3c7e03
commit 1a909fc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
       <dependency>
         <groupId>org.jsoup</groupId>
         <artifactId>jsoup</artifactId>
-        <version>1.14.2</version>
+        <version>1.15.3</version>
       </dependency>
       <dependency>
         <groupId>de.odysseus.juel</groupId>
@@ -235,6 +235,7 @@
                 <includes>
                   <include>de.odysseus.juel:juel-api</include>
                   <include>de.odysseus.juel:juel-impl</include>
+                  <include>org.jsoup:jsoup</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -246,6 +247,10 @@
                   <pattern>de.odysseus.el</pattern>
                   <shadedPattern>jinjava.de.odysseus.el</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.jsoup</pattern>
+                  <shadedPattern>jinjava.org.jsoup</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>

diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/StripTagsFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/StripTagsFilter.java
@@ -7,7 +7,7 @@
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import java.util.regex.Pattern;
 import org.jsoup.Jsoup;
-import org.jsoup.safety.Whitelist;
+import org.jsoup.safety.Safelist;
 
 /**
  * striptags(value) Strip SGML/XML tags and replace adjacent whitespace by one space.
@@ -43,7 +43,7 @@ public Object filter(Object object, JinjavaInterpreter interpreter, String... ar
       }
 
       String cleanedVal = Jsoup.parse(val).text();
-      cleanedVal = Jsoup.clean(cleanedVal, Whitelist.none());
+      cleanedVal = Jsoup.clean(cleanedVal, Safelist.none());
 
       // backwards compatibility with Jsoup.parse
       cleanedVal = cleanedVal.replaceAll("&nbsp;", " ");

diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/TruncateHtmlFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/TruncateHtmlFilterTest.java
@@ -26,9 +26,7 @@ public void itPreservesEndTagsWhenTruncatingWithinTagContent() {
       "33"
     );
     assertThat(result)
-      .isEqualTo(
-        "<h1>HTML Ipsum Presents</h1> \n<p><strong>Pellentesque...</strong></p>"
-      );
+      .isEqualTo("<h1>HTML Ipsum Presents</h1>\n<p><strong>Pellentesque...</strong></p>");
   }
 
   @Test
@@ -39,9 +37,7 @@ public void itDoesntChopWordsWhenSpecified() {
       "35"
     );
     assertThat(result)
-      .isEqualTo(
-        "<h1>HTML Ipsum Presents</h1> \n<p><strong>Pellentesque...</strong></p>"
-      );
+      .isEqualTo("<h1>HTML Ipsum Presents</h1>\n<p><strong>Pellentesque...</strong></p>");
 
     result =
       (String) filter.filter(
@@ -53,7 +49,7 @@ public void itDoesntChopWordsWhenSpecified() {
       );
     assertThat(result)
       .isEqualTo(
-        "<h1>HTML Ipsum Presents</h1> \n<p><strong>Pellentesque ha...</strong></p>"
+        "<h1>HTML Ipsum Presents</h1>\n<p><strong>Pellentesque ha...</strong></p>"
       );
   }
 
@@ -66,9 +62,7 @@ public void itTakesKwargs() {
       ImmutableMap.of("breakwords", false)
     );
     assertThat(result)
-      .isEqualTo(
-        "<h1>HTML Ipsum Presents</h1> \n<p><strong>Pellentesque...</strong></p>"
-      );
+      .isEqualTo("<h1>HTML Ipsum Presents</h1>\n<p><strong>Pellentesque...</strong></p>");
 
     result =
       (String) filter.filter(
@@ -79,7 +73,7 @@ public void itTakesKwargs() {
       );
     assertThat(result)
       .isEqualTo(
-        "<h1>HTML Ipsum Presents</h1> \n<p><strong>PellentesqueTEST</strong></p>"
+        "<h1>HTML Ipsum Presents</h1>\n<p><strong>PellentesqueTEST</strong></p>"
       );
   }