Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 11:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5341 Refactor SecurityMemberAccess methods for reuse

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2023-08-28 13:43:18 +10:00
parent 32e42b3ecd
commit 699786e190
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+10 -16
View File
@@ -220,34 +220,32 @@ public class SecurityMemberAccess implements MemberAccess {
"Parameters should never be null - if member is static, targetClass should be the same as memberClass.");
}
Set<Class<?>> classesToCheck = new HashSet<>();
classesToCheck.add(targetClass);
classesToCheck.add(memberClass);
List<Class<?>> classesToCheck = Arrays.asList(targetClass, memberClass);
for (Class<?> clazz : classesToCheck) {
if (!isExcludedPackageExempt(clazz) && (isExcludedPackageNamePatterns(clazz) || isExcludedPackageNames(clazz))) {
if (!excludedPackageExemptClasses.contains(clazz) && (isExcludedPackageNames(clazz) || isExcludedPackageNamePatterns(clazz))) {
return true;
}
}
return false;
}
protected String toPackageName(Class<?> clazz) {
public static String toPackageName(Class<?> clazz) {
if (clazz.getPackage() == null) {
return "";
} else {
return clazz.getPackage().getName();
}
return clazz.getPackage().getName();
}
protected boolean isExcludedPackageNamePatterns(Class<?> clazz) {
String packageName = toPackageName(clazz);
return excludedPackageNamePatterns.stream().anyMatch(pattern -> pattern.matcher(packageName).matches());
return excludedPackageNamePatterns.stream().anyMatch(pattern -> pattern.matcher(toPackageName(clazz)).matches());
}
protected boolean isExcludedPackageNames(Class<?> clazz) {
String packageName = toPackageName(clazz);
List<String> packageParts = Arrays.asList(packageName.split("\\."));
return isExcludedPackageNamesStatic(clazz, excludedPackageNames);
}
public static boolean isExcludedPackageNamesStatic(Class<?> clazz, Set<String> excludedPackageNames) {
List<String> packageParts = Arrays.asList(toPackageName(clazz).split("\\."));
for (int i = 0; i < packageParts.size(); i++) {
String parentPackage = String.join(".", packageParts.subList(0, i + 1));
if (excludedPackageNames.contains(parentPackage)) {
@@ -261,10 +259,6 @@ public class SecurityMemberAccess implements MemberAccess {
return excludedClasses.contains(clazz);
}
protected boolean isExcludedPackageExempt(Class<?> clazz) {
return excludedPackageExemptClasses.contains(clazz);
}
protected boolean isAcceptableProperty(String name) {
return name == null || ((!isExcluded(name)) && isAccepted(name));
}