This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from 9540ba6a0 Merge pull request #755 from apache/gh-actions-sonar
add 8551a09a6 WW-5340 Introducing OGNL Guard
add 25585617f WW-5340 Fix tests
add f542fde45 WW-5340 Make OgnlGuard a configurable bean
add 91d58d31d WW-5340 Cache OgnlGuard result
add 2bca0147c WW-5340 Add validation to excluded node configuration
add 4ff700e9a WW-5340 Add unit tests
add a4a0d70aa WW-5340 Refactor OgnlGuard to do the parsing
add 11e4dce71 WW-5340 Correct optimisation
add f69364bf6 WW-5340 Rename DefaultOgnlGuard to StrutsOgnlGuard
add a75a87364 WW-5340 Repackage OgnlGuard
add 4c4ec52b3 WW-5340 Rename blocked by OgnlGuard string
add ed5974689 WW-5340 Make excludedNodeTypes protected for subclassing
versatility
add 6f8844eac Merge pull request #747 from apache/WW-5340-ognl-guard
No new revisions were added by this update.
Summary of changes:
.../xwork2/config/impl/DefaultConfiguration.java | 85 ++++++++++++++++---
.../StrutsDefaultConfigurationProvider.java | 3 +
.../com/opensymphony/xwork2/ognl/OgnlCache.java | 16 ++--
.../opensymphony/xwork2/ognl/OgnlDefaultCache.java | 4 +-
.../com/opensymphony/xwork2/ognl/OgnlLRUCache.java | 6 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 74 +++++++---------
.../java/org/apache/struts2/StrutsConstants.java | 5 ++
.../config/StrutsBeanSelectionProvider.java | 19 +++--
.../java/org/apache/struts2/ognl/OgnlGuard.java | 80 ++++++++++++++++++
.../org/apache/struts2/ognl/StrutsOgnlGuard.java | 98 ++++++++++++++++++++++
core/src/main/resources/struts-beans.xml | 2 +
.../src/main/resources/struts-excluded-classes.xml | 1 +
.../xwork2/DefaultActionInvocationTest.java | 6 +-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 26 ++++--
.../apache/struts2/ognl/StrutsOgnlGuardTest.java | 79 +++++++++++++++++
15 files changed, 420 insertions(+), 84 deletions(-)
create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlGuard.java
create mode 100644
core/src/main/java/org/apache/struts2/ognl/StrutsOgnlGuard.java
create mode 100644
core/src/test/java/org/apache/struts2/ognl/StrutsOgnlGuardTest.java
