Merge pull request #1051 from HubSpot/boulter-patch-1

boulter · web-flow · commit 15b2e6fd54b1 · 2023-06-09T11:06:40.000-04:00
upgrade jackson
diff --git a/pom.xml b/pom.xml
@@ -64,22 +64,22 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>2.12.6</version>
+        <version>2.14.0</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.12.6</version>
+        <version>2.14.0</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.12.6</version>
+        <version>2.14.0</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.dataformat</groupId>
         <artifactId>jackson-dataformat-yaml</artifactId>
-        <version>2.12.6</version>
+        <version>2.14.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java b/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java
@@ -3,18 +3,20 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
+import com.hubspot.jinjava.interpret.OutputTooBigException;
 import com.hubspot.jinjava.objects.collections.SizeLimitingPyMap;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 
 public class PyishObjectMapperTest {
@@ -29,7 +31,7 @@ public void itSerializesMapWithNullKeysAsEmptyString() {
   }
 
   @Test
-  public void itSerializesMapEntrySet() throws JsonProcessingException {
+  public void itSerializesMapEntrySet() {
     SizeLimitingPyMap map = new SizeLimitingPyMap(new HashMap<>(), 10);
     map.put("foo", "bar");
     map.put("bar", ImmutableMap.of("foobar", new ArrayList<>()));
@@ -39,7 +41,7 @@ public void itSerializesMapEntrySet() throws JsonProcessingException {
   }
 
   @Test
-  public void itSerializesMapEntrySetWithLimit() throws JsonProcessingException {
+  public void itSerializesMapEntrySetWithLimit() {
     SizeLimitingPyMap map = new SizeLimitingPyMap(new HashMap<>(), 10);
     map.put("foo", "bar");
     map.put("bar", ImmutableMap.of("foobar", new ArrayList<>()));
@@ -85,7 +87,24 @@ public void itLimitsDepth() {
       JinjavaInterpreter.pushCurrent(jinjava.newInterpreter());
       assertThatThrownBy(() -> PyishObjectMapper.getAsPyishStringOrThrow(original))
         .as("The string to be serialized is larger than the max output size")
-        .isInstanceOf(LengthLimitingJsonProcessingException.class);
+        .isInstanceOf(JsonMappingException.class)
+        .hasMessageContaining("Max length of 10000 chars reached");
+    } finally {
+      JinjavaInterpreter.popCurrent();
+    }
+  }
+
+  @Test
+  public void itLimitsOutputSize() {
+    String input = RandomStringUtils.random(10002);
+    try {
+      Jinjava jinjava = new Jinjava(
+        JinjavaConfig.newBuilder().withMaxOutputSize(10000).build()
+      );
+      JinjavaInterpreter.pushCurrent(jinjava.newInterpreter());
+      assertThatThrownBy(() -> PyishObjectMapper.getAsPyishString(input))
+        .isInstanceOf(OutputTooBigException.class)
+        .hasMessageContaining("over limit of 10000 bytes");
     } finally {
       JinjavaInterpreter.popCurrent();
     }
