Skip to content

Avoid binding unreadable modules' classes #8996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 2 commits into from
Sep 9, 2025
Merged

Avoid binding unreadable modules' classes #8996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a11a45
Add module readability to JI class binding test
headius Sep 5, 2025
8579650
Don't attempt to add reads while binding methods
headius Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/src/main/java/org/jruby/Ruby.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5362,6 +5362,8 @@ public interface RecursiveFunctionEx<T> extends ThreadContext.RecursiveFunctionE
private JavaSupport javaSupport;
private final JRubyClassLoader jrubyClassLoader;

public static final Module JRUBY_MODULE = Ruby.class.getModule();

// Object Specializer
private final RubyObjectSpecializer objectSpecializer;

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/javasupport/binding/MethodGatherer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,13 @@ static Map<String, List<Method>> getMethods(final Class<?> javaClass) {
}

public static void eachAccessibleMethod(final Class<?> javaClass, Predicate<Method[]> classProcessor, Predicate<Method[]> interfaceProcessor) {
boolean isPublic = Modifier.isPublic(javaClass.getModifiers());
boolean isPublic = Ruby.JRUBY_MODULE.canRead(javaClass.getModule()) && Modifier.isPublic(javaClass.getModifiers());

// we scan all superclasses, but avoid adding superclass methods with
// same name+signature as subclass methods (see JRUBY-3130)
for ( Class<?> klass = javaClass; klass != null; klass = klass.getSuperclass() ) {
// only add if target class is public or source class is public, and package is exported
if ((isPublic || Modifier.isPublic(klass.getModifiers())) && Modules.isExported(klass, Java.class)) {
if ((isPublic || (Ruby.JRUBY_MODULE.canRead(klass.getModule()) && Modifier.isPublic(klass.getModifiers()))) && Modules.isExported(klass, Java.class)) {
// for each class, scan declared methods for new signatures
try {
// add methods, including static if this is the actual class,
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/org/jruby/runtime/invokedynamic/InvokeDynamicSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ public static RubyClass pollAndGetClass(ThreadContext context, IRubyObject self)

public static MethodHandle findStatic(Class target, String name, MethodType type) {
try {
JRUBY_MODULE.addReads(target.getModule());
return LOOKUP.findStatic(target, name, type);
} catch (NoSuchMethodException|IllegalAccessException ex) {
throw new RuntimeException(ex);
Expand All @@ -84,7 +83,6 @@ public static MethodHandle findStatic(Class target, String name, MethodType type

public static MethodHandle findVirtual(Class target, String name, MethodType type) {
try {
JRUBY_MODULE.addReads(target.getModule());
return LOOKUP.findVirtual(target, name, type);
} catch (NoSuchMethodException|IllegalAccessException ex) {
throw new RuntimeException(ex);
Expand Down