Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vulnerability upgrades backwards compatibility #656

Merged
merged 3 commits into from
Mar 2, 2023
Merged

Vulnerability upgrades backwards compatibility #656

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9e6b12
added backward compatibility option in native forms
junaidwarsivd Jan 5, 2023
4c6314c
made adjustments for the compatibility toggle
junaidwarsivd Jan 5, 2023
39bddf6
made adjustments to toggle the backwards compatibility
junaidwarsivd Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion android-json-form-wizard/src/main/assets/app.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
widget.datepicker.is.numeric=true
widget.value.translated=true
widget.value.translated=true
enable.backward.compatability=true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename this to easy_rule.v3.compatibility

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All changes mentioned are updated according the suggestion @ekigamba

18 changes: 11 additions & 7 deletions android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,11 +1428,12 @@ private Facts getEntries(String[] address, JSONObject object) throws JSONExcepti
formObject.put(RuleConstant.IS_RULE_CHECK, true);
formObject.put(RuleConstant.STEP, formObject.getString(RuleConstant.STEP));

if(Utils.enabledProperty(NativeFormsProperties.KEY.ENABLE_BACKWARD_COMPATIBILITY)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go to Code > Reformat code to automatically fix any spacing eg after the if block to if (Utils...

Facts resultFacts = getValueFromAddressCore(formObject);

Facts resultFacts = getValueFromAddressCore(formObject);

for (Map.Entry<String,Object> factEntry: resultFacts.asMap().entrySet()) {
result.put(factEntry.getKey(),factEntry.getValue());
for (Map.Entry<String, Object> factEntry : resultFacts.asMap().entrySet()) {
result.put(factEntry.getKey(), factEntry.getValue());
}
}

}
Expand Down Expand Up @@ -1939,6 +1940,7 @@ private List<String> getRules(String filename, String fieldKey, boolean readAllR

StringBuilder conditionString = new StringBuilder();
conditionString.append(map.get(RuleConstant.CONDITION).toString());
boolean backwardCompatibility = Utils.enabledProperty(NativeFormsProperties.KEY.ENABLE_BACKWARD_COMPATIBILITY);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename this variable to be more accurate eg jEasyRulesV3Compatible


List<String> fields = (List<String>) map.get(RuleConstant.ACTIONS);
List<String> newFields = new ArrayList<>();
Expand All @@ -1948,12 +1950,14 @@ private List<String> getRules(String filename, String fieldKey, boolean readAllR
field.trim().startsWith(RuleConstant.CONSTRAINT)) {
conditionString.append(" " + field);
}

if(backwardCompatibility)
newFields.add("facts." + field);
}

fields.clear();
fields.addAll(newFields);
if(backwardCompatibility) {
fields.clear();
fields.addAll(newFields);
}
}

actions.addAll(getConditionKeys(conditionString.toString()));
Expand Down
3 changes: 2 additions & 1 deletion android-json-form-wizard/src/main/java/com/vijay/jsonwizard/filesource/AssetsFileSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.vijay.jsonwizard.constants.JsonFormConstants;
import com.vijay.jsonwizard.interfaces.FormFileSource;
import com.vijay.jsonwizard.rules.YamlRuleDefinitionReaderExt;
import com.vijay.jsonwizard.utils.NativeFormsProperties;
import com.vijay.jsonwizard.utils.Utils;

import org.jeasy.rules.api.Rules;
Expand All @@ -26,7 +27,7 @@ public class AssetsFileSource implements FormFileSource {
private MVELRuleFactory mvelRuleFactory;

private AssetsFileSource() {
this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReaderExt());
this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReaderExt());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kindly make this optional by switching to YamlRuleDefinitionReader or YamlRuleDefinitionReaderExt

}

@Override
Expand Down
3 changes: 2 additions & 1 deletion android-json-form-wizard/src/main/java/com/vijay/jsonwizard/filesource/DiskFileSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.vijay.jsonwizard.constants.JsonFormConstants;
import com.vijay.jsonwizard.interfaces.FormFileSource;
import com.vijay.jsonwizard.rules.YamlRuleDefinitionReaderExt;
import com.vijay.jsonwizard.utils.NativeFormsProperties;
import com.vijay.jsonwizard.utils.Utils;

import org.jeasy.rules.api.Rules;
Expand All @@ -31,7 +32,7 @@ public class DiskFileSource implements FormFileSource {
private MVELRuleFactory mvelRuleFactory;

private DiskFileSource() {
this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReaderExt());
this.mvelRuleFactory = new MVELRuleFactory(new YamlRuleDefinitionReaderExt());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kindly make this optional by switching to YamlRuleDefinitionReader or YamlRuleDefinitionReaderExt

}

@Override
Expand Down
34 changes: 21 additions & 13 deletions android-json-form-wizard/src/main/java/com/vijay/jsonwizard/rules/RulesEngineFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.vijay.jsonwizard.activities.JsonFormBaseActivity;
import com.vijay.jsonwizard.constants.JsonFormConstants;
import com.vijay.jsonwizard.factory.FileSourceFactoryHelper;
import com.vijay.jsonwizard.utils.NativeFormsProperties;
import com.vijay.jsonwizard.utils.Utils;

import org.jeasy.rules.api.Facts;
Expand Down Expand Up @@ -43,9 +44,10 @@ public class RulesEngineFactory implements RuleListener {
private RulesEngineHelper rulesEngineHelper;
private Facts globalFacts;
private MVELRuleFactory mvelRuleFactory;

private boolean backwardCompatibility = false;
public RulesEngineFactory(Context context, Map<String, String> globalValues) {
this.context = context;
backwardCompatibility = Utils.enabledProperty(NativeFormsProperties.KEY.ENABLE_BACKWARD_COMPATIBILITY);
RulesEngineParameters parameters = new RulesEngineParameters().skipOnFirstAppliedRule(true);
this.defaultRulesEngine = new DefaultRulesEngine(parameters);
((DefaultRulesEngine) this.defaultRulesEngine).registerRuleListener(this);
Expand Down Expand Up @@ -260,28 +262,34 @@ public void afterEvaluate(Rule rule, Facts facts, boolean evaluationResult) {

@Override
public void beforeExecute(Rule rule, Facts facts) {
Timber.e("Putting facts in beforeExecute");
HashMap<String, Object> myMap = new HashMap<>();
facts.put("facts", myMap);
if(backwardCompatibility) {
Timber.e("Putting facts in beforeExecute");
HashMap<String, Object> myMap = new HashMap<>();
facts.put("facts", myMap);
}
}

@Override
public void onSuccess(Rule rule, Facts facts) {
Timber.e("Putting facts in onSuccess");
HashMap<String, Object> myMap = facts.get("facts");
if(backwardCompatibility) {
Timber.e("Putting facts in onSuccess");
HashMap<String, Object> myMap = facts.get("facts");

for (String key :
myMap.keySet()) {
facts.put(key, myMap.get(key));
}
for (String key :
myMap.keySet()) {
facts.put(key, myMap.get(key));
}

facts.remove("facts");
facts.remove("facts");
}
}

@Override
public void onFailure(Rule rule, Facts facts, Exception exception) {
Timber.e("Putting facts in onFailure");
facts.remove("facts");
if(backwardCompatibility) {
Timber.e("Putting facts in onFailure");
facts.remove("facts");
}
}

public String getRulesFolderPath() {
Expand Down
1 change: 1 addition & 0 deletions android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/NativeFormsProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public final static class KEY {
//Widgets
public static final String WIDGET_DATEPICKER_IS_NUMERIC = "widget.datepicker.is.numeric";
public static final String WIDGET_VALUE_TRANSLATED = "widget.value.translated";
public static final String ENABLE_BACKWARD_COMPATIBILITY = "enable.backward.compatability";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename this constant to EASY_RULES_V3_COMPATIBILITY



}
Expand Down