diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 15bd60ea1..c761b7ff6 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -47,11 +47,6 @@ java.lang.ClassLoader, java.lang.Shutdown, java.lang.ProcessBuilder, - ognl.OgnlContext, - ognl.ClassResolver, - ognl.TypeConverter, - ognl.MemberAccess, - ognl.DefaultMemberAccess, com.opensymphony.xwork2.ActionContext" /> @@ -66,10 +61,12 @@ freemarker.core., freemarker.template., freemarker.ext.rhino., + freemarker.ext.beans., sun.reflect., javassist., com.opensymphony.xwork2.ognl., - com.opensymphony.xwork2.security." /> + com.opensymphony.xwork2.security., + com.opensymphony.xwork2.util." /> diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java index 4d2ebcb06..013b6c5ec 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java @@ -153,8 +153,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess { memberPackageName = memberPackageName + "."; for (String packageName: excludedPackageNames) { - if (targetPackageName.startsWith(packageName) || targetPackageName.equals(packageName) - || memberPackageName.startsWith(packageName) || memberPackageName.equals(packageName)) { + if (targetPackageName.startsWith(packageName) || memberPackageName.startsWith(packageName)) { return true; } }