store autoEscape flag in context outside of user-editable properties

amannm · Dec 4, 2015 · ff2bea9 · ff2bea9
1 parent 22f028d
commit ff2bea9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@
 ### Version 2.1.2 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.hubspot.jinjava%22%20AND%20v%3A%222.1.2%22)) ###
 
 * Use resolved path value in include tag cycle detection
+* Store autoEscape flag in context outside of user-scoped properties
 
 ### Version 2.1.1 ([Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.hubspot.jinjava%22%20AND%20v%3A%222.1.1%22)) ###
 

diff --git a/src/main/java/com/hubspot/jinjava/interpret/Context.java b/src/main/java/com/hubspot/jinjava/interpret/Context.java
@@ -53,6 +53,8 @@ public class Context extends ScopeMap<String, Object> {
 
   private final Context parent;
 
+  private Boolean autoEscape;
+
   public Context() {
     this(null);
   }
@@ -111,6 +113,22 @@ public boolean isGlobalMacro(String identifier) {
     return getGlobalMacro(identifier) != null;
   }
 
+  public boolean isAutoEscape() {
+    if (autoEscape != null) {
+      return autoEscape;
+    }
+
+    if (parent != null) {
+      return parent.isAutoEscape();
+    }
+
+    return false;
+  }
+
+  public void setAutoEscape(Boolean autoEscape) {
+    this.autoEscape = autoEscape;
+  }
+
   @SafeVarargs
   @SuppressWarnings("unchecked")
   public final void registerClasses(Class<? extends Importable>... classes) {

diff --git a/src/main/java/com/hubspot/jinjava/lib/tag/AutoEscapeTag.java b/src/main/java/com/hubspot/jinjava/lib/tag/AutoEscapeTag.java
@@ -20,7 +20,6 @@
                 "{% endautoescape %}")
     })
 public class AutoEscapeTag implements Tag {
-  public static final String AUTOESCAPE_CONTEXT_VAR = "__auto3sc@pe__";
   private static final long serialVersionUID = 786006577642541285L;
 
   @Override
@@ -38,7 +37,7 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
     try (InterpreterScopeClosable c = interpreter.enterScope()) {
       String boolFlagStr = StringUtils.trim(tagNode.getHelpers());
       boolean escapeFlag = BooleanUtils.toBoolean(StringUtils.isNotBlank(boolFlagStr) ? boolFlagStr : "true");
-      interpreter.getContext().put(AUTOESCAPE_CONTEXT_VAR, escapeFlag);
+      interpreter.getContext().setAutoEscape(escapeFlag);
 
       StringBuilder result = new StringBuilder();
 

diff --git a/src/main/java/com/hubspot/jinjava/tree/ExpressionNode.java b/src/main/java/com/hubspot/jinjava/tree/ExpressionNode.java
@@ -21,7 +21,6 @@
 
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.lib.filter.EscapeFilter;
-import com.hubspot.jinjava.lib.tag.AutoEscapeTag;
 import com.hubspot.jinjava.tree.output.OutputNode;
 import com.hubspot.jinjava.tree.output.RenderedOutputNode;
 import com.hubspot.jinjava.tree.parse.ExpressionToken;
@@ -51,7 +50,7 @@ public OutputNode render(JinjavaInterpreter interpreter) {
       }
     }
 
-    if (interpreter.getContext().get(AutoEscapeTag.AUTOESCAPE_CONTEXT_VAR, Boolean.FALSE).equals(Boolean.TRUE)) {
+    if (interpreter.getContext().isAutoEscape()) {
       result = EscapeFilter.escapeHtmlEntities(result);
     }
 

diff --git a/src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java b/src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java
@@ -12,7 +12,6 @@
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
-import com.hubspot.jinjava.lib.tag.AutoEscapeTag;
 
 public class ExpressionNodeTest {
 
@@ -60,7 +59,7 @@ public void itEscapesValueWhenContextSet() throws Exception {
     context.put("a", "foo < bar");
     assertThat(val("{{ a }}")).isEqualTo("foo < bar");
 
-    context.put(AutoEscapeTag.AUTOESCAPE_CONTEXT_VAR, Boolean.TRUE);
+    context.setAutoEscape(true);
     assertThat(val("{{ a }}")).isEqualTo("foo &lt; bar");
   }