Upgrade to jexl 3.3

neuland · Oct 11, 2023 · 45074f0 · 45074f0
1 parent 8ddf3a9
commit 45074f0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -228,7 +228,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-jexl3</artifactId>
-            <version>3.2.1</version>
+            <version>3.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/src/main/java/de/neuland/pug4j/expression/JexlExpressionHandler.java b/src/main/java/de/neuland/pug4j/expression/JexlExpressionHandler.java
@@ -7,6 +7,7 @@
 
 import de.neuland.pug4j.exceptions.ExpressionException;
 import de.neuland.pug4j.model.PugModel;
+import org.apache.commons.jexl3.introspection.JexlPermissions;
 import org.apache.commons.jexl3.introspection.JexlUberspect;
 import org.apache.commons.logging.LogFactory;
 
@@ -34,7 +35,8 @@ public class JexlExpressionHandler extends AbstractExpressionHandler {
 			} else {
 				return op == null && obj instanceof Map ? JexlUberspect.MAP : JexlUberspect.POJO;
 			}
-		}
+		},
+		JexlPermissions.UNRESTRICTED
 	);
 
 	private final PugJexlArithmetic pugJexlArithmetic = new PugJexlArithmetic(false);

diff --git a/src/main/java/de/neuland/pug4j/jexl3/internal/introspection/PugUberspect.java b/src/main/java/de/neuland/pug4j/jexl3/internal/introspection/PugUberspect.java
@@ -1,11 +1,16 @@
 package de.neuland.pug4j.jexl3.internal.introspection;
 
 import org.apache.commons.jexl3.internal.introspection.Uberspect;
+import org.apache.commons.jexl3.introspection.JexlPermissions;
 import org.apache.commons.logging.Log;
 
 
 public class PugUberspect extends Uberspect {
     public PugUberspect(Log runtimeLogger, ResolverStrategy sty) {
         super(runtimeLogger, sty);
     }
+
+    public PugUberspect(final Log runtimeLogger, final ResolverStrategy sty, final JexlPermissions perms) {
+        super(runtimeLogger, sty, perms);
+    }
 }
diff --git a/src/test/java/de/neuland/pug4j/expression/JexlExpressionHandlerTest.java b/src/test/java/de/neuland/pug4j/expression/JexlExpressionHandlerTest.java
@@ -94,7 +94,7 @@ public void testReturn() throws ExpressionException  {
 
     @Test
     public void testInt() throws ExpressionException  {
-        jexlExpressionHandler.evaluateExpression("var count = 5", pugModel);
+        jexlExpressionHandler.evaluateExpression("var count = 5; var count2 = 6;", pugModel);
         int count = (int) pugModel.get("count");
         assertEquals(5,count);
 

diff --git a/src/test/resources/compiler/exceptions/error.html b/src/test/resources/compiler/exceptions/error.html
@@ -125,7 +125,7 @@
   </head>
   <body>
     <h1>Pug Compiler Exception</h1>
-    <p id="detail">unable to evaluate [non.existing.query()] - JexlException de.neuland.pug4j.expression.JexlExpressionHandler.evaluateExpression@149 JEXL error : attempting to call method on null</p>
+    <p id="detail">unable to evaluate [non.existing.query()] - JexlException de.neuland.pug4j.expression.JexlExpressionHandler.evaluateExpression@153:1 JEXL error : attempting to call method on null</p>
     <h2>In error.jade at line 9, column 0.</h2>
     <div>
       <pre><span class="line">5</span><span class="code">    body {</span></pre>