This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 6fcb50122d381b2f2fe5133a95b5898b58614136
Merge: 80e83616b 002e598b7
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Tue Dec 5 17:36:14 2023 +1100
Merge pull request #806 from apache/WW-5339-astmap-block
WW-5339 Add option to block custom OGNL maps
.../xwork2/config/impl/DefaultConfiguration.java | 2 ++
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 9 +++----
.../xwork2/ognl/OgnlValueStackFactory.java | 13 +++++-----
.../xwork2/ognl/accessor/CompoundRootAccessor.java | 15 +++++++++++-
.../java/org/apache/struts2/StrutsConstants.java | 2 ++
core/src/main/resources/struts-beans.xml | 3 +++
.../com/opensymphony/xwork2/ognl/MyCustomMap.java | 28 ++++++++++++++++++++++
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 12 ++++++++++
8 files changed, 72 insertions(+), 12 deletions(-)
