Check versus max output size because max string length should just be used for truncating

jasmith-hs · jasmith-hs · commit 77c669d5e543 · 2022-11-21T09:27:18.000-05:00
diff --git a/src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java b/src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java
@@ -126,9 +126,9 @@ public JinjavaInterpreter(JinjavaInterpreter orig) {
     scopeDepth = orig.getScopeDepth() + 1;
   }
 
-  public static void checkStringLength(String string) {
+  public static void checkOutputSize(String string) {
     Optional<Long> maxStringLength = getCurrentMaybe()
-      .map(interpreter -> interpreter.getConfig().getMaxStringLength())
+      .map(interpreter -> interpreter.getConfig().getMaxOutputSize())
       .filter(max -> max > 0);
     if (maxStringLength.map(max -> string.length() > max).orElse(false)) {
       throw new OutputTooBigException(maxStringLength.get(), string.length());
diff --git a/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagDecorator.java b/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagDecorator.java
@@ -36,7 +36,7 @@ public T getTag() {
   public final String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
     try {
       String output = innerInterpret(tagNode, interpreter);
-      JinjavaInterpreter.checkStringLength(output);
+      JinjavaInterpreter.checkOutputSize(output);
       return output;
     } catch (DeferredValueException | TemplateSyntaxException | OutputTooBigException e) {
       try {
diff --git a/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java b/src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java
@@ -50,7 +50,7 @@ public static String getAsPyishStringOrThrow(Object val)
     throws JsonProcessingException {
     String string = PYISH_OBJECT_WRITER.writeValueAsString(val);
     Optional<JinjavaInterpreter> interpreterMaybe = JinjavaInterpreter.getCurrentMaybe();
-    JinjavaInterpreter.checkStringLength(string);
+    JinjavaInterpreter.checkOutputSize(string);
     if (
       interpreterMaybe
         .map(
diff --git a/src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java b/src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java
@@ -7,6 +7,7 @@
 import com.hubspot.jinjava.el.ext.ExtendedParser;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
+import com.hubspot.jinjava.interpret.OutputTooBigException;
 import com.hubspot.jinjava.interpret.TemplateSyntaxException;
 import com.hubspot.jinjava.interpret.UnknownTokenException;
 import com.hubspot.jinjava.objects.serialization.PyishObjectMapper;
@@ -107,7 +108,7 @@ public static String getValueAsJinjavaStringSafe(Object val) {
           return pyishString;
         }
       }
-    } catch (JsonProcessingException ignored) {}
+    } catch (JsonProcessingException | OutputTooBigException ignored) {}
     throw new DeferredValueException("Can not convert deferred result to string");
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerForTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerForTagTest.java
@@ -87,13 +87,13 @@ public void itHandlesNestedDeferredForLoop() {
 
   @Test
   public void itLimitsLength() {
-    interpreter.render(
+    String out = interpreter.render(
       String.format(
         "{%% for item in (range(1000, %s)) + deferred %%}{%% endfor %%}",
         MAX_OUTPUT_SIZE
       )
     );
-    assertThat(interpreter.getContext().getDeferredNodes()).hasSize(1);
+    assertThat(interpreter.getContext().getDeferredTokens()).hasSize(1);
   }
 
   @Test
@@ -102,11 +102,11 @@ public void itUsesDeferredExecutionModeWhenChildrenAreLarge() {
         interpreter.render(
           String.format(
             "{%% for item in range(%d) %%}1234567890{%% endfor %%}",
-            MAX_OUTPUT_SIZE / 10
+            MAX_OUTPUT_SIZE / 10 - 1
           )
         )
       )
-      .hasSize((int) MAX_OUTPUT_SIZE);
+      .hasSize((int) MAX_OUTPUT_SIZE - 10);
     assertThat(interpreter.getContext().getDeferredTokens()).isEmpty();
     assertThat(interpreter.getContext().getDeferredNodes()).isEmpty();
     assertThat(interpreter.getErrors()).isEmpty();

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import com.hubspot.jinjava.el.ext.ExtendedParser;`
`8`	`8`	`import com.hubspot.jinjava.interpret.DeferredValueException;`
`9`	`9`	`import com.hubspot.jinjava.interpret.JinjavaInterpreter;`
	`10`	`+import com.hubspot.jinjava.interpret.OutputTooBigException;`
`10`	`11`	`import com.hubspot.jinjava.interpret.TemplateSyntaxException;`
`11`	`12`	`import com.hubspot.jinjava.interpret.UnknownTokenException;`
`12`	`13`	`import com.hubspot.jinjava.objects.serialization.PyishObjectMapper;`
`@@ -107,7 +108,7 @@ public static String getValueAsJinjavaStringSafe(Object val) {`
`107`	`108`	`return pyishString;`
`108`	`109`	`}`
`109`	`110`	`}`
`110`		`- } catch (JsonProcessingException ignored) {}`
	`111`	`+ } catch (JsonProcessingException \| OutputTooBigException ignored) {}`
`111`	`112`	`throw new DeferredValueException("Can not convert deferred result to string");`
`112`	`113`	`}`
`113`	`114`
Original file line number	Diff line number	Diff line change
`@@ -87,13 +87,13 @@ public void itHandlesNestedDeferredForLoop() {`
`87`	`87`
`88`	`88`	`@Test`
`89`	`89`	`public void itLimitsLength() {`
`90`		`- interpreter.render(`
	`90`	`+ String out = interpreter.render(`
`91`	`91`	`String.format(`
`92`	`92`	`"{%% for item in (range(1000, %s)) + deferred %%}{%% endfor %%}",`
`93`	`93`	`MAX_OUTPUT_SIZE`
`94`	`94`	`)`
`95`	`95`	`);`
`96`		`- assertThat(interpreter.getContext().getDeferredNodes()).hasSize(1);`
	`96`	`+ assertThat(interpreter.getContext().getDeferredTokens()).hasSize(1);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`@Test`
`@@ -102,11 +102,11 @@ public void itUsesDeferredExecutionModeWhenChildrenAreLarge() {`
`102`	`102`	`interpreter.render(`
`103`	`103`	`String.format(`
`104`	`104`	`"{%% for item in range(%d) %%}1234567890{%% endfor %%}",`
`105`		`- MAX_OUTPUT_SIZE / 10`
	`105`	`+ MAX_OUTPUT_SIZE / 10 - 1`
`106`	`106`	`)`
`107`	`107`	`)`
`108`	`108`	`)`
`109`		`- .hasSize((int) MAX_OUTPUT_SIZE);`
	`109`	`+ .hasSize((int) MAX_OUTPUT_SIZE - 10);`
`110`	`110`	`assertThat(interpreter.getContext().getDeferredTokens()).isEmpty();`
`111`	`111`	`assertThat(interpreter.getContext().getDeferredNodes()).isEmpty();`
`112`	`112`	`assertThat(interpreter.getErrors()).isEmpty();`