Also allow {% if obj[missing] %} checks in SANE strictVariablesMode

Previously, only "obj.missing" was allowed.
bkiers · Dec 27, 2023 · 6f40bda · 6f40bda
1 parent 9afde46
commit 6f40bda
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/src/main/java/liqp/nodes/LookupNode.java b/src/main/java/liqp/nodes/LookupNode.java
@@ -28,7 +28,10 @@ public void add(Indexable indexable) {
 
     @Override
     public Object render(TemplateContext context) {
+        return render(context, false);
+    }
 
+    public Object render(TemplateContext context, boolean okIfMissing) {
         Object value = null;
 
         String realId;
@@ -51,13 +54,14 @@ public Object render(TemplateContext context) {
             }
         }
 
-        boolean foundAllButLastOne = false;
+        boolean foundAllButLastOne = okIfMissing;
         for (Iterator<Indexable> it = indexes.iterator(); it.hasNext();) {
             Indexable index = it.next();
             if (it.hasNext()) {
                 value = index.get(value, context, found);
                 if (value == null) {
                     found.set(false);
+                    foundAllButLastOne = false;
                     break;
                 }
             } else {
@@ -212,7 +216,11 @@ public Object get(Object value, TemplateContext context, AtomicBoolean found) {
                 return null;
             }
 
-            key = expression.render(context);
+            if (expression instanceof LookupNode) {
+                key = ((LookupNode)expression).render(context, true);
+            } else {
+                key = expression.render(context);
+            }
 
             if (key instanceof Number) {
                 int index = ((Number)key).intValue();

diff --git a/src/test/java/liqp/blocks/IfTest.java b/src/test/java/liqp/blocks/IfTest.java
@@ -427,23 +427,50 @@ public void strictVariablesTest() throws RecognitionException {
                 "{% if obj.missing %}true{% else %}false{% endif %}").render(Collections.singletonMap(
                     "obj", Collections.singletonMap("var", "val")));
         });
+        assertThrows(VariableNotExistException.class, () -> {
+            new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.STRICT).build().parse(
+                "{% if obj.nested.missing %}true{% else %}false{% endif %}").render(Collections.singletonMap(
+                    "obj", Collections.singletonMap("var", "val")));
+        });
+        assertThrows(VariableNotExistException.class, () -> {
+            new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.STRICT).build().parse(
+                "{% if obj[missing] %}true{% else %}false{% endif %}").render(Collections.singletonMap(
+                    "obj", Collections.singletonMap("var", "val")));
+        });
 
         assertThat(new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.SANE).build()
             .parse("{% if obj.missing %}true{% else %}false{% endif %}").render(Collections.singletonMap(
                 "obj", Collections.singletonMap("var", "val"))), is("false"));
-
+        assertThat(new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.SANE).build()
+            .parse("{% if obj[missing] %}true{% else %}false{% endif %}").render(Collections.singletonMap(
+                "obj", Collections.singletonMap("var", "val"))), is("false"));
         assertThrows(VariableNotExistException.class, () -> {
             new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.SANE).build().parse(
                 "{% if obj.nested.missing %}true{% else %}false{% endif %}").render(Collections
                     .singletonMap("obj", Collections.singletonMap("var", "val")));
         });
+        assertThrows(VariableNotExistException.class, () -> {
+            new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.SANE).build().parse(
+                "{% if obj[nested].missing %}true{% else %}false{% endif %}").render(Collections
+                    .singletonMap("obj", Collections.singletonMap("var", "val")));
+        });
+        assertThrows(VariableNotExistException.class, () -> {
+            new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.SANE).build().parse(
+                "{% if obj[nested][missing] %}true{% else %}false{% endif %}").render(Collections
+                    .singletonMap("obj", Collections.singletonMap("var", "val")));
+        });
 
         assertThat(new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.OFF).build()
             .parse("{% if obj.missing %}true{% else %}false{% endif %}").render(Collections.singletonMap(
                 "obj", Collections.singletonMap("var", "val"))), is("false"));
-
         assertThat(new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.OFF).build()
             .parse("{% if obj.nested.missing %}true{% else %}false{% endif %}").render(Collections
                 .singletonMap("obj", Collections.singletonMap("var", "val"))), is("false"));
+        assertThat(new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.OFF).build()
+            .parse("{% if obj[nested].missing %}true{% else %}false{% endif %}").render(Collections
+                .singletonMap("obj", Collections.singletonMap("var", "val"))), is("false"));
+        assertThat(new TemplateParser.Builder().withStrictVariables(StrictVariablesMode.OFF).build()
+            .parse("{% if obj[nested][missing] %}true{% else %}false{% endif %}").render(Collections
+                .singletonMap("obj", Collections.singletonMap("var", "val"))), is("false"));
     }
 }