Wrap at a higher level and don't resolve ____int3rpr3t3r____

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/el/HasInterpreter.java

@@ -0,0 +1,7 @@
+package com.hubspot.jinjava.el;
+
+import com.hubspot.jinjava.interpret.JinjavaInterpreter;
+
+public interface HasInterpreter {
+  JinjavaInterpreter interpreter();
+}

src/main/java/com/hubspot/jinjava/el/JinjavaELContext.java

@@ -5,11 +5,12 @@
 import java.lang.reflect.Method;
 import javax.el.ELResolver;
 
-public class JinjavaELContext extends SimpleContext {
+public class JinjavaELContext extends SimpleContext implements HasInterpreter {
 
   private JinjavaInterpreter interpreter;
   private MacroFunctionMapper functionMapper;
 
+  @Deprecated
   public JinjavaELContext() {
     super();
   }
@@ -19,6 +20,11 @@ public JinjavaELContext(JinjavaInterpreter interpreter, ELResolver resolver) {
     this.interpreter = interpreter;
   }
 
+  @Override
+  public JinjavaInterpreter interpreter() {
+    return interpreter;
+  }
+
   @Override
   public MacroFunctionMapper getFunctionMapper() {
     if (functionMapper == null) {

src/main/java/com/hubspot/jinjava/el/JinjavaInterpreterResolver.java

@@ -276,7 +276,7 @@ private Object getValue(
     }
 
     context.setPropertyResolved(true);
-    return wrap(value);
+    return value;
   }
 
   @SuppressWarnings("unchecked")

src/main/java/com/hubspot/jinjava/el/NoInvokeELContext.java

@@ -1,13 +1,14 @@
 package com.hubspot.jinjava.el;
 
+import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import javax.el.ELContext;
 import javax.el.ELResolver;
 import javax.el.FunctionMapper;
 import javax.el.VariableMapper;
 
-public class NoInvokeELContext extends ELContext {
+public class NoInvokeELContext extends ELContext implements HasInterpreter {
 
-  private ELContext delegate;
+  private final ELContext delegate;
   private NoInvokeELResolver elResolver;
 
   public NoInvokeELContext(ELContext delegate) {
@@ -31,4 +32,9 @@ public FunctionMapper getFunctionMapper() {
   public VariableMapper getVariableMapper() {
     return delegate.getVariableMapper();
   }
+
+  @Override
+  public JinjavaInterpreter interpreter() {
+    return ((HasInterpreter) delegate).interpreter();
+  }
 }

src/main/java/com/hubspot/jinjava/el/ReturnTypeValidatingJinjavaInterpreterResolver.java

@@ -40,7 +40,7 @@ public Class<?> getType(ELContext context, Object base, Object property) {
   @Override
   public Object getValue(ELContext context, Object base, Object property) {
     return returnTypeValidator.validateReturnType(
-      delegate.getValue(context, base, property)
+      wrap(delegate.getValue(context, base, property))
     );
   }
 
@@ -63,7 +63,11 @@ public Object invoke(
     Object[] params
   ) {
     return returnTypeValidator.validateReturnType(
-      delegate.invoke(context, base, method, paramTypes, params)
+      wrap(delegate.invoke(context, base, method, paramTypes, params))
     );
   }
+
+  Object wrap(Object object) {
+    return delegate.wrap(object);
+  }
 }

src/main/java/com/hubspot/jinjava/el/ext/AllowlistGroup.java

@@ -129,6 +129,11 @@ Class<?>[] allowedDeclaredMethodsFromClasses() {
     String[] allowedDeclaredMethodsFromCanonicalClassPrefixes() {
       return ARRAY;
     }
+
+    @Override
+    String[] allowedReturnTypeCanonicalClassPrefixes() {
+      return ARRAY;
+    }
   },
   JinjavaFunctions,
   JinjavaExpTests {

src/main/java/com/hubspot/jinjava/el/ext/AllowlistReturnTypeValidator.java

@@ -2,7 +2,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 
 public final class AllowlistReturnTypeValidator {
 
@@ -32,27 +31,22 @@ private AllowlistReturnTypeValidator(
   }
 
   public Object validateReturnType(Object o) {
-    Object wrapped = JinjavaInterpreter
-      .getCurrentMaybe()
-      .map(jinjavaInterpreter -> jinjavaInterpreter.wrap(o))
-      .orElse(o);
-
-    if (wrapped == null) {
+    if (o == null) {
       return null;
     }
-    Class<?> clazz = wrapped.getClass();
+    Class<?> clazz = o.getClass();
     String canonicalClassName = clazz.getCanonicalName();
     if (
       allowedCanonicalClassNames.contains(canonicalClassName) ||
       allowedCanonicalClassPrefixes.stream().anyMatch(canonicalClassName::startsWith)
     ) {
       for (ReturnTypeValidator v : additionalValidators) {
-        wrapped = v.validateReturnType(wrapped);
-        if (wrapped == null) {
+        o = v.validateReturnType(o);
+        if (o == null) {
           return null;
         }
       }
-      return wrapped;
+      return o;
     }
     return null;
   }

src/main/java/com/hubspot/jinjava/el/ext/AstDict.java

@@ -1,5 +1,6 @@
 package com.hubspot.jinjava.el.ext;
 
+import com.hubspot.jinjava.el.HasInterpreter;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateStateException;
 import com.hubspot.jinjava.objects.collections.SizeLimitingPyMap;
@@ -26,10 +27,7 @@ public AstDict(Map<AstNode, AstNode> dict) {
   public Object eval(Bindings bindings, ELContext context) {
     Map<String, Object> resolved = new LinkedHashMap<>();
 
-    JinjavaInterpreter interpreter = (JinjavaInterpreter) context
-      .getELResolver()
-      .getValue(context, null, ExtendedParser.INTERPRETER);
-
+    JinjavaInterpreter interpreter = ((HasInterpreter) context).interpreter();
     for (Map.Entry<AstNode, AstNode> entry : dict.entrySet()) {
       String key;
       AstNode entryKey = entry.getKey();

src/main/java/com/hubspot/jinjava/el/ext/AstFilterChain.java

@@ -1,5 +1,6 @@
 package com.hubspot.jinjava.el.ext;
 
+import com.hubspot.jinjava.el.HasInterpreter;
 import com.hubspot.jinjava.interpret.DisabledException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateError;
@@ -120,9 +121,7 @@ public Object eval(Bindings bindings, ELContext context) {
   }
 
   protected JinjavaInterpreter getInterpreter(ELContext context) {
-    return (JinjavaInterpreter) context
-      .getELResolver()
-      .getValue(context, null, ExtendedParser.INTERPRETER);
+    return ((HasInterpreter) context).interpreter();
   }
 
   protected Object[] evaluateFilterArgs(

src/main/java/com/hubspot/jinjava/el/ext/AstList.java

@@ -1,5 +1,6 @@
 package com.hubspot.jinjava.el.ext;
 
+import com.hubspot.jinjava.el.HasInterpreter;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.objects.collections.SizeLimitingPyList;
 import de.odysseus.el.tree.Bindings;
@@ -26,9 +27,7 @@ public Object eval(Bindings bindings, ELContext context) {
       list.add(elements.getChild(i).eval(bindings, context));
     }
 
-    JinjavaInterpreter interpreter = (JinjavaInterpreter) context
-      .getELResolver()
-      .getValue(context, null, ExtendedParser.INTERPRETER);
+    JinjavaInterpreter interpreter = ((HasInterpreter) context).interpreter();
 
     return new SizeLimitingPyList(list, interpreter.getConfig().getMaxListSize());
   }