This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch WW-5340-ognl-guard in repository https://gitbox.apache.org/repos/asf/struts.git
commit a75a873646e760a51e72d854ad261e6c3d7fc54a Author: Kusal Kithul-Godage <[email protected]> AuthorDate: Wed Sep 27 21:59:58 2023 +1000 WW-5340 Repackage OgnlGuard --- .../com/opensymphony/xwork2/config/impl/DefaultConfiguration.java | 4 ++-- .../xwork2/config/providers/StrutsDefaultConfigurationProvider.java | 4 ++-- core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 4 +++- .../java/org/apache/struts2/config/StrutsBeanSelectionProvider.java | 2 +- .../opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlGuard.java | 3 ++- .../xwork2 => org/apache/struts2}/ognl/StrutsOgnlGuard.java | 2 +- core/src/main/resources/struts-beans.xml | 4 ++-- core/src/main/resources/struts-excluded-classes.xml | 1 + .../java/com/opensymphony/xwork2/DefaultActionInvocationTest.java | 2 +- core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 1 + .../xwork2 => org/apache/struts2}/ognl/StrutsOgnlGuardTest.java | 2 +- 11 files changed, 17 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java index c7b65be82..3deda2c81 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java @@ -80,9 +80,7 @@ import com.opensymphony.xwork2.inject.Scope; import com.opensymphony.xwork2.ognl.BeanInfoCacheFactory; import com.opensymphony.xwork2.ognl.DefaultOgnlBeanInfoCacheFactory; import com.opensymphony.xwork2.ognl.DefaultOgnlExpressionCacheFactory; -import com.opensymphony.xwork2.ognl.StrutsOgnlGuard; import com.opensymphony.xwork2.ognl.ExpressionCacheFactory; -import com.opensymphony.xwork2.ognl.OgnlGuard; import com.opensymphony.xwork2.ognl.OgnlReflectionProvider; import com.opensymphony.xwork2.ognl.OgnlUtil; import com.opensymphony.xwork2.ognl.OgnlValueStackFactory; @@ -106,6 +104,8 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.conversion.StrutsConversionPropertiesProcessor; import org.apache.struts2.conversion.StrutsTypeConverterCreator; import org.apache.struts2.conversion.StrutsTypeConverterHolder; +import org.apache.struts2.ognl.OgnlGuard; +import org.apache.struts2.ognl.StrutsOgnlGuard; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java index aa25d6022..576922856 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java @@ -68,10 +68,8 @@ import com.opensymphony.xwork2.inject.Scope; import com.opensymphony.xwork2.ognl.BeanInfoCacheFactory; import com.opensymphony.xwork2.ognl.DefaultOgnlBeanInfoCacheFactory; import com.opensymphony.xwork2.ognl.DefaultOgnlExpressionCacheFactory; -import com.opensymphony.xwork2.ognl.StrutsOgnlGuard; import com.opensymphony.xwork2.ognl.ExpressionCacheFactory; import com.opensymphony.xwork2.ognl.ObjectProxy; -import com.opensymphony.xwork2.ognl.OgnlGuard; import com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory; import com.opensymphony.xwork2.ognl.OgnlReflectionProvider; import com.opensymphony.xwork2.ognl.OgnlUtil; @@ -122,6 +120,8 @@ import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.Parameter; import org.apache.struts2.interceptor.exec.ExecutorProvider; import org.apache.struts2.interceptor.exec.StrutsExecutorProvider; +import org.apache.struts2.ognl.OgnlGuard; +import org.apache.struts2.ognl.StrutsOgnlGuard; import org.apache.struts2.url.QueryStringBuilder; import org.apache.struts2.url.QueryStringParser; import org.apache.struts2.url.StrutsQueryStringBuilder; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java index 83383a692..dfbc1c498 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java +++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java @@ -36,6 +36,8 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; +import org.apache.struts2.ognl.OgnlGuard; +import org.apache.struts2.ognl.StrutsOgnlGuard; import java.beans.BeanInfo; import java.beans.IntrospectionException; @@ -51,13 +53,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import static com.opensymphony.xwork2.ognl.OgnlGuard.GUARD_BLOCKED; import static com.opensymphony.xwork2.util.TextParseUtil.commaDelimitedStringToSet; import static java.util.Collections.emptySet; import static java.util.Collections.unmodifiableSet; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toSet; import static org.apache.commons.lang3.StringUtils.strip; +import static org.apache.struts2.ognl.OgnlGuard.GUARD_BLOCKED; /** diff --git a/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java index 64feac83b..70cc85135 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java @@ -49,7 +49,6 @@ import com.opensymphony.xwork2.inject.ContainerBuilder; import com.opensymphony.xwork2.inject.Scope; import com.opensymphony.xwork2.ognl.BeanInfoCacheFactory; import com.opensymphony.xwork2.ognl.ExpressionCacheFactory; -import com.opensymphony.xwork2.ognl.OgnlGuard; import com.opensymphony.xwork2.security.AcceptedPatternsChecker; import com.opensymphony.xwork2.security.ExcludedPatternsChecker; import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker; @@ -68,6 +67,7 @@ import org.apache.struts2.dispatcher.StaticContentLoader; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.multipart.MultiPartRequest; import org.apache.struts2.interceptor.exec.ExecutorProvider; +import org.apache.struts2.ognl.OgnlGuard; import org.apache.struts2.url.QueryStringBuilder; import org.apache.struts2.url.QueryStringParser; import org.apache.struts2.url.UrlDecoder; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlGuard.java b/core/src/main/java/org/apache/struts2/ognl/OgnlGuard.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlGuard.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlGuard.java index 697caad3f..5a0e35989 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlGuard.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlGuard.java @@ -16,8 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; +import com.opensymphony.xwork2.ognl.OgnlUtil; import ognl.Ognl; import ognl.OgnlException; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/StrutsOgnlGuard.java b/core/src/main/java/org/apache/struts2/ognl/StrutsOgnlGuard.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ognl/StrutsOgnlGuard.java rename to core/src/main/java/org/apache/struts2/ognl/StrutsOgnlGuard.java index bbf866280..da924008d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/StrutsOgnlGuard.java +++ b/core/src/main/java/org/apache/struts2/ognl/StrutsOgnlGuard.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; import com.opensymphony.xwork2.config.ConfigurationException; import com.opensymphony.xwork2.inject.Inject; diff --git a/core/src/main/resources/struts-beans.xml b/core/src/main/resources/struts-beans.xml index f2707b38f..3dcd60197 100644 --- a/core/src/main/resources/struts-beans.xml +++ b/core/src/main/resources/struts-beans.xml @@ -166,8 +166,8 @@ class="com.opensymphony.xwork2.validator.DefaultValidatorFileParser"/> <bean class="com.opensymphony.xwork2.ognl.OgnlUtil"/> - <bean type="com.opensymphony.xwork2.ognl.OgnlGuard" name="struts" - class="com.opensymphony.xwork2.ognl.StrutsOgnlGuard" /> + <bean type="org.apache.struts2.ognl.OgnlGuard" name="struts" + class="org.apache.struts2.ognl.StrutsOgnlGuard" /> <bean type="com.opensymphony.xwork2.util.TextParser" name="struts" class="com.opensymphony.xwork2.util.OgnlTextParser" scope="singleton"/> diff --git a/core/src/main/resources/struts-excluded-classes.xml b/core/src/main/resources/struts-excluded-classes.xml index 72df88c89..226f064bb 100644 --- a/core/src/main/resources/struts-excluded-classes.xml +++ b/core/src/main/resources/struts-excluded-classes.xml @@ -77,6 +77,7 @@ com.opensymphony.xwork2.ognl, com.opensymphony.xwork2.security, com.opensymphony.xwork2.util, + org.apache.struts2.ognl, org.apache.tomcat, org.apache.catalina.core, org.wildfly.extension.undertow.deployment"/> diff --git a/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java b/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java index 63d24233e..e099a060a 100644 --- a/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java @@ -28,12 +28,12 @@ import com.opensymphony.xwork2.mock.MockInterceptor; import com.opensymphony.xwork2.mock.MockResult; import com.opensymphony.xwork2.ognl.DefaultOgnlBeanInfoCacheFactory; import com.opensymphony.xwork2.ognl.DefaultOgnlExpressionCacheFactory; -import com.opensymphony.xwork2.ognl.StrutsOgnlGuard; import com.opensymphony.xwork2.ognl.OgnlUtil; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; import org.apache.struts2.config.StrutsXmlConfigurationProvider; import org.apache.struts2.dispatcher.HttpParameters; +import org.apache.struts2.ognl.StrutsOgnlGuard; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java index f873a323c..eb8aef83c 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java @@ -46,6 +46,7 @@ import ognl.OgnlRuntime; import ognl.SimpleNode; import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsException; +import org.apache.struts2.ognl.StrutsOgnlGuard; import java.beans.BeanInfo; import java.beans.IntrospectionException; diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/StrutsOgnlGuardTest.java b/core/src/test/java/org/apache/struts2/ognl/StrutsOgnlGuardTest.java similarity index 98% rename from core/src/test/java/com/opensymphony/xwork2/ognl/StrutsOgnlGuardTest.java rename to core/src/test/java/org/apache/struts2/ognl/StrutsOgnlGuardTest.java index 72c194e09..2252134da 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ognl/StrutsOgnlGuardTest.java +++ b/core/src/test/java/org/apache/struts2/ognl/StrutsOgnlGuardTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; import com.opensymphony.xwork2.config.ConfigurationException; import org.junit.Before;
