mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-06 05:59:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

GP-5348: Fixed a PyGhidra issue that prevented accessing Java

Browse Source 
getters/setters as properties on non-public classes (Closes #7450)
This commit is contained in:
Ryan Kurtz
2025-02-10 08:18:21 -05:00
parent cd15acddf7
commit 84e05008ae
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Ghidra/Features/PyGhidra/src/main/java/ghidra/pyghidra/property/PropertyUtils.java
View File

@@ -20,9 +20,7 @@ import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodHandles.Lookup;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -126,10 +124,26 @@ public class PropertyUtils {
}
private static Stream<Method> getMethods(Class<?> cls) {
// customizations added using JClass._customize are inherited
// therfore we only care about the ones declared by this class
return Arrays.stream(cls.getDeclaredMethods())
if (isPublic(cls)) {
return Arrays.stream(cls.getMethods());
}
Class<?> base = cls;
while (!isPublic(base)) {
base = base.getSuperclass();
}
Stream<Method> head = Arrays.stream(base.getMethods())
.filter(PropertyUtils::methodFilter);
Stream<Method> tail = Stream.concat(
Arrays.stream(base.getInterfaces()),
Arrays.stream(cls.getInterfaces()))
.sorted(Comparator.comparing(Class::getSimpleName))
.distinct()
.map(Class::getDeclaredMethods)
.flatMap(Arrays::stream)
.filter(PropertyUtils::methodFilter);
return Stream.concat(head, tail)
.sorted(Comparator.comparing(Method::toGenericString))
.distinct();
}
private static boolean methodFilter(Method m) {
@@ -192,6 +206,10 @@ public class PropertyUtils {
}
}
private static boolean isPublic(Class<?> cls) {
return Modifier.isPublic(cls.getModifiers());
}
private static boolean isPublic(Method m) {
int mod = m.getModifiers();
return Modifier.isPublic(mod) && !Modifier.isStatic(mod);