Update JEASY MVEL dependencies to fix security vulnerabilities

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java

@@ -1941,14 +1941,19 @@ private List<String> getRules(String filename, String fieldKey, boolean readAllR
                     conditionString.append(map.get(RuleConstant.CONDITION).toString());
 
                     List<String> fields = (List<String>) map.get(RuleConstant.ACTIONS);
+                    List<String> newFields = new ArrayList<>();
                     if (fields != null) {
                         for (String field : fields) {
                             if (field.trim().startsWith(RuleConstant.CALCULATION) ||
                                     field.trim().startsWith(RuleConstant.CONSTRAINT)) {
                                 conditionString.append(" " + field);
                             }
+
+                            newFields.add("facts." + field);
                         }
 
+                        fields.clear();
+                        fields.addAll(newFields);
                     }
 
                     actions.addAll(getConditionKeys(conditionString.toString()));

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/filesource/AssetsFileSource.java

@@ -4,6 +4,7 @@
 
 import com.vijay.jsonwizard.constants.JsonFormConstants;
 import com.vijay.jsonwizard.interfaces.FormFileSource;
+import com.vijay.jsonwizard.rules.YamlRuleDefinitionReaderExt;
 import com.vijay.jsonwizard.utils.Utils;
 
 import org.jeasy.rules.api.Rules;
@@ -25,7 +26,7 @@ public class AssetsFileSource implements FormFileSource {
     private MVELRuleFactory mvelRuleFactory;
 
     private AssetsFileSource() {
-        this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReader());
+        this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReaderExt());
     }
 
     @Override

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/filesource/DiskFileSource.java

@@ -6,6 +6,7 @@
 
 import com.vijay.jsonwizard.constants.JsonFormConstants;
 import com.vijay.jsonwizard.interfaces.FormFileSource;
+import com.vijay.jsonwizard.rules.YamlRuleDefinitionReaderExt;
 import com.vijay.jsonwizard.utils.Utils;
 
 import org.jeasy.rules.api.Rules;
@@ -30,7 +31,7 @@ public class DiskFileSource implements FormFileSource {
     private MVELRuleFactory mvelRuleFactory;
 
     private DiskFileSource() {
-        this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReader());
+        this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReaderExt());
     }
 
     @Override

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineFactory.java

@@ -52,7 +52,7 @@ public RulesEngineFactory(Context context, Map<String, String> globalValues) {
         this.ruleMap = new HashMap<>();
         gson = new Gson();
         this.rulesEngineHelper = new RulesEngineHelper();
-        this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReader());
+        this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReaderExt());
 
 
         if (globalValues != null) {
@@ -257,19 +257,31 @@ public void afterEvaluate(Rule rule, Facts facts, boolean evaluationResult) {
         //Overriden
     }
 
+
     @Override
     public void beforeExecute(Rule rule, Facts facts) {
-        //Overriden
+        Timber.e("Putting facts in beforeExecute");
+        HashMap<String, Object> myMap = new HashMap<>();
+        facts.put("facts", myMap);
     }
 
     @Override
     public void onSuccess(Rule rule, Facts facts) {
-        //Overriden
+        Timber.e("Putting facts in onSuccess");
+        HashMap<String, Object> myMap = facts.get("facts");
+
+        for (String key :
+                myMap.keySet()) {
+            facts.put(key, myMap.get(key));
+        }
+
+        facts.remove("facts");
     }
 
     @Override
     public void onFailure(Rule rule, Facts facts, Exception exception) {
-        //Overriden
+        Timber.e("Putting facts in onFailure");
+        facts.remove("facts");
     }
 
     public String getRulesFolderPath() {

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/YamlRuleDefinitionReaderExt.java

@@ -0,0 +1,32 @@
+package com.vijay.jsonwizard.rules;
+
+import org.jeasy.rules.support.RuleDefinition;
+import org.jeasy.rules.support.reader.YamlRuleDefinitionReader;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Ephraim Kigamba - nek.eam@gmail.com on 22-11-2022.
+ */
+public class YamlRuleDefinitionReaderExt extends YamlRuleDefinitionReader {
+
+
+    @Override
+    protected RuleDefinition createRuleDefinition(Map<String, Object> map) {
+        RuleDefinition ruleDefinition = super.createRuleDefinition(map);
+
+        List<String> actionList = ruleDefinition.getActions();
+        List<String> newActionList = new ArrayList<>();
+
+        for (int i = 0; i < actionList.size(); i++) {
+            newActionList.add("facts." + actionList.get(i));
+        }
+
+        actionList.clear();
+        actionList.addAll(newActionList);
+
+        return ruleDefinition;
+    }
+}

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=3.1.2-SNAPSHOT
+VERSION_NAME=3.1.5-LOCAL-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard