Add result validating

Author: jasmith-hs

3.0-changes.md

@@ -1,3 +1,4 @@
 - Migrated JinjavaConfig to immutable
 - Removed whitespaceRequiredWithinTokens LegacyOverride and converted to BuiltinFeatures
-- Nested interpretation disabled by defaut
+- Nested interpretation disabled by default
+- Removed restricted methods and properties from JinjavaConfig

src/main/java/com/hubspot/jinjava/JinjavaConfig.java

@@ -26,6 +26,8 @@
 import com.hubspot.jinjava.el.JinjavaObjectUnwrapper;
 import com.hubspot.jinjava.el.JinjavaProcessors;
 import com.hubspot.jinjava.el.ObjectUnwrapper;
+import com.hubspot.jinjava.el.ext.MethodValidator;
+import com.hubspot.jinjava.el.ext.MethodValidatorConfig;
 import com.hubspot.jinjava.features.FeatureConfig;
 import com.hubspot.jinjava.features.Features;
 import com.hubspot.jinjava.interpret.Context.Library;
@@ -100,10 +102,6 @@ default int getMaxMacroRecursionDepth() {
 
   ImmutableMap<Library, ImmutableSet<String>> getDisabled();
 
-  ImmutableSet<String> getRestrictedMethods();
-
-  ImmutableSet<String> getRestrictedProperties();
-
   @Value.Default
   default boolean isFailOnUnknownTokens() {
     return false;
@@ -164,9 +162,22 @@ default TokenScannerSymbols getTokenScannerSymbols() {
     return new DefaultTokenScannerSymbols();
   }
 
+  @Value.Default
+  default MethodValidator getMethodValidator() {
+    return MethodValidator.create(MethodValidatorConfig.of());
+  }
+
   @Value.Default
   default ELResolver getElResolver() {
-    return JinjavaInterpreterResolver.DEFAULT_RESOLVER_READ_ONLY;
+    return JinjavaInterpreterResolver.createDefaultResolver(
+      isDefaultReadOnlyResolver(),
+      getMethodValidator()
+    );
+  }
+
+  @Value.Default
+  default boolean isDefaultReadOnlyResolver() {
+    return true;
   }
 
   @Value.Default

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

@@ -22,10 +22,12 @@
 import com.hubspot.jinjava.interpret.UnknownTokenException;
 import com.hubspot.jinjava.interpret.errorcategory.BasicTemplateErrorCategory;
 import com.hubspot.jinjava.lib.fn.ELFunctionDefinition;
+import com.hubspot.jinjava.objects.serialization.PyishObjectMapper;
 import com.hubspot.jinjava.util.WhitespaceUtils;
 import de.odysseus.el.tree.TreeBuilderException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import javax.el.ELException;
 import javax.el.ExpressionFactory;
 import javax.el.PropertyNotFoundException;
@@ -343,4 +345,12 @@ public Object resolveProperty(Object object, List<String> propertyNames) {
   public Object wrap(Object object) {
     return resolver.wrap(object);
   }
+
+  public String getAsString(Object object) {
+    if (interpreter.getConfig().getLegacyOverrides().isUsePyishObjectMapper()) {
+      //      resolver.
+      return PyishObjectMapper.getAsUnquotedPyishString(object);
+    }
+    return Objects.toString(object, "");
+  }
 }

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

@@ -8,6 +8,8 @@
 import com.hubspot.jinjava.el.ext.ExtendedParser;
 import com.hubspot.jinjava.el.ext.JinjavaBeanELResolver;
 import com.hubspot.jinjava.el.ext.JinjavaListELResolver;
+import com.hubspot.jinjava.el.ext.MethodValidator;
+import com.hubspot.jinjava.el.ext.MethodValidatorConfig;
 import com.hubspot.jinjava.el.ext.NamedParameter;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.DisabledException;
@@ -50,39 +52,30 @@
 
 public class JinjavaInterpreterResolver extends SimpleResolver {
 
-  public static final ELResolver DEFAULT_RESOLVER_READ_ONLY = new CompositeELResolver() {
-    {
-      add(new ArrayELResolver(true));
-      add(new JinjavaListELResolver(true));
-      add(new TypeConvertingMapELResolver(true));
-      add(new ResourceBundleELResolver());
-      add(
-        new JinjavaBeanELResolver(
-          JinjavaBeanELResolver.JinjavaBeanELResolverConfig
-            .builder()
-            .withReadOnly(true)
-            .build()
-        )
-      );
-    }
-  };
-
-  public static final ELResolver DEFAULT_RESOLVER_READ_WRITE = new CompositeELResolver() {
-    {
-      add(new ArrayELResolver(false));
-      add(new JinjavaListELResolver(false));
-      add(new TypeConvertingMapELResolver(false));
-      add(new ResourceBundleELResolver());
-      add(
-        new JinjavaBeanELResolver(
-          JinjavaBeanELResolver.JinjavaBeanELResolverConfig
-            .builder()
-            .withReadOnly(false)
-            .build()
-        )
-      );
-    }
-  };
+  public static ELResolver createDefaultResolver(
+    boolean readOnly,
+    MethodValidator methodValidator
+  ) {
+    return new CompositeELResolver() {
+      {
+        add(new ArrayELResolver(readOnly));
+        add(new JinjavaListELResolver(readOnly));
+        add(new TypeConvertingMapELResolver(readOnly));
+        add(new ResourceBundleELResolver());
+        add(new JinjavaBeanELResolver(readOnly, methodValidator));
+      }
+    };
+  }
+
+  public static final ELResolver DEFAULT_RESOLVER_READ_ONLY = createDefaultResolver(
+    true,
+    MethodValidator.create(MethodValidatorConfig.of())
+  );
+
+  public static final ELResolver DEFAULT_RESOLVER_READ_WRITE = createDefaultResolver(
+    false,
+    MethodValidator.create(MethodValidatorConfig.of())
+  );
 
   private final JinjavaInterpreter interpreter;
   private final ObjectUnwrapper objectUnwrapper;