Adds additional blocked classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d92654da Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d92654da Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d92654da Branch: refs/heads/struts-2-3-24-2 Commit: d92654daf3dfe36082995b713484de92041afaea Parents: 47da9c9 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Apr 18 20:38:49 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Apr 18 21:51:01 2016 +0200 ---------------------------------------------------------------------- core/src/main/resources/struts-default.xml | 3 +++ core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/d92654da/core/src/main/resources/struts-default.xml ---------------------------------------------------------------------- diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index f9c9ff4..56621a7 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -50,6 +50,9 @@ ognl.MemberAccess, ognl.ClassResolver, ognl.TypeConverter, + ognl.MemberAccess, + ognl.DefaultMemberAccess, + com.opensymphony.xwork2.ognl.SecurityMemberAccess, com.opensymphony.xwork2.ActionContext" /> <!-- this must be valid regex, each '.' in package name must be escaped! --> <constant name="struts.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" /> http://git-wip-us.apache.org/repos/asf/struts/blob/d92654da/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java index 50bf576..6c141aa 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java @@ -657,8 +657,7 @@ public class URLTagTest extends AbstractUITagTest { tag.doEndTag(); Object allowMethodAccess = stack.findValue("\u0023_memberAccess['allowStaticMethodAccess']"); - assertNotNull(allowMethodAccess); - assertEquals(Boolean.FALSE, allowMethodAccess); + assertNull(allowMethodAccess); assertNull(session.get("foo"));
