Skip to content

UNOMI-399: fix the loading of MVEL allowed script pattern from config…#211

Merged
sergehuber merged 1 commit intomasterfrom
fixLoadingOfMVELAllowedScripts
Nov 13, 2020
Merged

UNOMI-399: fix the loading of MVEL allowed script pattern from config…#211
sergehuber merged 1 commit intomasterfrom
fixLoadingOfMVELAllowedScripts

Conversation

@jkevan
Copy link
Contributor

@jkevan jkevan commented Nov 13, 2020

…, and return null during script execution if the script is filtered out

…, and return null during script execution if the script is filtered out
Copy link
Contributor

@sergehuber sergehuber left a comment

Choose a reason for hiding this comment

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

Thanks a lot for the PR, looks good to me will merge.

@sergehuber sergehuber merged commit dbcb2ed into master Nov 13, 2020
@sergehuber sergehuber deleted the fixLoadingOfMVELAllowedScripts branch November 13, 2020 17:48
asfgit pushed a commit that referenced this pull request Nov 13, 2020
…, and return null during script execution if the script is filtered out (#211)

(cherry picked from commit dbcb2ed)
asfgit pushed a commit that referenced this pull request Nov 13, 2020
…, and return null during script execution if the script is filtered out (#211)

(cherry picked from commit dbcb2ed)
sergehuber pushed a commit to Jahia/unomi that referenced this pull request Nov 13, 2020
…, and return null during script execution if the script is filtered out (apache#211)

(cherry picked from commit dbcb2ed)
giladw pushed a commit to YotpoLtd/unomi-releases that referenced this pull request Dec 1, 2020
* master: (26 commits)
  Fix typos &
  Fix Jenkins files
  Add branch information in main README
  UNOMI-400 Update documentation to reflect the latest config changes (apache#221)
  UNOMI-400 Fix class hierarchy lookup for property condition evaluator (apache#220)
  Return error to the client when exception is thrown from Elasticsearch impl (apache#202)
  UNOMI-366: Implement increment interest event type & action (apache#201)
  UNOMI-400 Refactoring of hardcoded property accessors (apache#218)
  UNOMI-401 Fix missing base class in SecureFilteringClassLoader (apache#219)
  UNOMI-399: Provide doc inside the custom.system.properties for scripting allow/forbid mechanism (apache#217)
  UNOMI-400 Fix typo bug in PropertyConditionEvaluator & improve unit test (apache#216)
  UNOMI-400 More complete hardcoded property accessor implementation (apache#214)
  UNOMI-401: correctly set ClassLoader before MVEL script execute (apache#215)
  UNOMI-399: load allow/forbid script from files instead of configuration property to avoid script code conflicting with property value parsing (apache#213)
  UNOMI-399: fix the loading of MVEL allowed script pattern from config, and return null during script execution if the script is filtered out (apache#211)
  Add documentation to new security configuration parameters.
  Add documentation to new security configuration parameters.
  Remove eslint & dependencies as it is not used.
  UNOMI-379_support_addValues (apache#207)
  feat(geo location condition): add support for getting location path f… (#61) (apache#210)
  ...

# Conflicts:
#	persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
#	persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
#	persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg
#	services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments