[unomi] branch master updated: UNOMI-399: fix the loading of MVEL allowed script pattern from config, and return null during script execution if the script is filtered out (#211)

[shuber]

This is an automated email from the ASF dual-hosted git repository.

shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/master by this push:
     new dbcb2ed  UNOMI-399: fix the loading of MVEL allowed script pattern 
from config, and return null during script execution if the script is filtered 
out (#211)
dbcb2ed is described below

commit dbcb2ed680ba809e46f0d8ae24488c14ac13abba
Author: kevan Jahanshahi <ke...@jahia.com>
AuthorDate: Fri Nov 13 18:48:54 2020 +0100

    UNOMI-399: fix the loading of MVEL allowed script pattern from config, and 
return null during script execution if the script is filtered out (#211)
---
 .../src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java    | 2 +-
 .../apache/unomi/scripting/internal/ExpressionFilterFactoryImpl.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java 
b/scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java
index c247c14..f0fdd51 100644
--- a/scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java
+++ b/scripting/src/main/java/org/apache/unomi/scripting/MvelScriptExecutor.java
@@ -71,7 +71,7 @@ public class MvelScriptExecutor implements ScriptExecutor {
             if (mvelExpressions.containsKey(script) && 
mvelExpressions.get(script) != INVALID_SCRIPT_MARKER) {
                 return MVEL.executeExpression(mvelExpressions.get(script), 
context);
             } else {
-                return script;
+                return null;
             }
         } finally {
             Thread.currentThread().setContextClassLoader(tccl);
diff --git 
a/scripting/src/main/java/org/apache/unomi/scripting/internal/ExpressionFilterFactoryImpl.java
 
b/scripting/src/main/java/org/apache/unomi/scripting/internal/ExpressionFilterFactoryImpl.java
index 02cb028..6278fe3 100644
--- 
a/scripting/src/main/java/org/apache/unomi/scripting/internal/ExpressionFilterFactoryImpl.java
+++ 
b/scripting/src/main/java/org/apache/unomi/scripting/internal/ExpressionFilterFactoryImpl.java
@@ -61,7 +61,7 @@ public class ExpressionFilterFactoryImpl implements 
ExpressionFilterFactory,Bund
                 String systemAllowedPatterns = 
System.getProperty("org.apache.unomi.scripting.filter."+initialFilterCollection+".allow",
 null);
                 if (systemAllowedPatterns != null) {
                     Set<Pattern> collectionAllowedExpressionPatterns = new 
HashSet<>();
-                    if (!"all".equals(systemAllowedPatterns.trim())) {
+                    if ("all".equals(systemAllowedPatterns.trim())) {
                         collectionAllowedExpressionPatterns = null;
                     } else {
                         if (systemAllowedPatterns.trim().length() > 0) {