You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ku...@apache.org on 2023/11/17 04:45:03 UTC
(struts) 04/06: WW-5343 Fix MemberAccess access blocked tests
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5343-sec-extend
in repository https://gitbox.apache.org/repos/asf/struts.git
commit d0d10d9389bd5d80e4ed774a84bb09452569a229
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Fri Nov 17 15:42:20 2023 +1100
WW-5343 Fix MemberAccess access blocked tests
---
.../java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java | 2 +-
.../com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 4f56533ff..c68423014 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -377,7 +377,7 @@ public class SecurityMemberAccess implements MemberAccess {
}
@Inject(value = StrutsConstants.STRUTS_EXCLUDED_CLASSES, required = false)
- protected void useExcludedClasses(String commaDelimitedClasses) {
+ public void useExcludedClasses(String commaDelimitedClasses) {
Set<String> newExcludedClasses = new HashSet<>(toNewClassesSet(excludedClasses, commaDelimitedClasses));
newExcludedClasses.add(Object.class.getName());
if (!allowStaticFieldAccess) {
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index f25ecd30b..70165fcde 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -715,8 +715,8 @@ public class SecurityMemberAccessTest {
sma.useExcludedClasses(MemberAccess.class.getName());
String propertyName = "excludedClasses";
- String setter = "setExcludedClasses";
- Member member = SecurityMemberAccess.class.getMethod(setter, Set.class);
+ String setter = "useExcludedClasses";
+ Member member = SecurityMemberAccess.class.getMethod(setter, String.class);
// when
boolean accessible = sma.isAccessible(context, sma, member, propertyName);
@@ -731,8 +731,8 @@ public class SecurityMemberAccessTest {
sma.useExcludedClasses(SecurityMemberAccess.class.getName());
String propertyName = "excludedClasses";
- String setter = "setExcludedClasses";
- Member member = SecurityMemberAccess.class.getMethod(setter, Set.class);
+ String setter = "useExcludedClasses";
+ Member member = SecurityMemberAccess.class.getMethod(setter, String.class);
// when
boolean accessible = sma.isAccessible(context, sma, member, propertyName);