Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.
/ jdk17 Public archive

Commit

Permalink
8269351: Proxy::newProxyInstance and MethodHandleProxies::asInterface…
Browse files Browse the repository at this point in the history
…Instance should reject sealed interfaces

Reviewed-by: darcy, alanb
  • Loading branch information
Mandy Chung committed Jun 26, 2021
1 parent 824a516 commit 3d0d27c
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ private MethodHandleProxies() { } // do not instantiate
* even though it re-declares the {@code Object.equals} method and also
* declares default methods, such as {@code Comparator.reverse}.
* <p>
* The interface must be public. No additional access checks are performed.
* The interface must be public and not {@linkplain Class#isSealed() sealed}.
* No additional access checks are performed.
* <p>
* The resulting instance of the required type will respond to
* invocation of the type's uniquely named method by calling
Expand Down Expand Up @@ -156,6 +157,8 @@ private MethodHandleProxies() { } // do not instantiate
public static <T> T asInterfaceInstance(final Class<T> intfc, final MethodHandle target) {
if (!intfc.isInterface() || !Modifier.isPublic(intfc.getModifiers()))
throw newIllegalArgumentException("not a public interface", intfc.getName());
if (intfc.isSealed())
throw newIllegalArgumentException("a sealed interface", intfc.getName());
final MethodHandle mh;
if (System.getSecurityManager() != null) {
final Class<?> caller = Reflection.getCallerClass();
Expand Down
7 changes: 6 additions & 1 deletion src/java.base/share/classes/java/lang/reflect/Proxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,10 @@ private static void validateProxyInterfaces(ClassLoader loader,
throw new IllegalArgumentException(intf.getName() + " is a hidden interface");
}

if (intf.isSealed()) {
throw new IllegalArgumentException(intf.getName() + " is a sealed interface");
}

/*
* Verify that the class loader resolves the name of this
* interface to the same Class object.
Expand Down Expand Up @@ -930,7 +934,8 @@ private static Module getDynamicModule(ClassLoader loader) {
* if any of the following restrictions is violated:</a>
* <ul>
* <li>All of {@code Class} objects in the given {@code interfaces} array
* must represent {@linkplain Class#isHidden() non-hidden} interfaces,
* must represent {@linkplain Class#isHidden() non-hidden} and
* {@linkplain Class#isSealed() non-sealed} interfaces,
* not classes or primitive types.
*
* <li>No two elements in the {@code interfaces} array may
Expand Down
24 changes: 22 additions & 2 deletions test/jdk/java/lang/invoke/MethodHandlesProxiesTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand All @@ -22,7 +22,7 @@
*/

/* @test
* @bug 8206955
* @bug 8206955 8269351
* @run testng/othervm -ea -esa test.java.lang.invoke.MethodHandlesProxiesTest
*/

Expand Down Expand Up @@ -99,4 +99,24 @@ public static void testOverriddenDefaultMethods() throws Throwable {
assertEquals(proxy.b(), "OB");
assertEquals(proxy.c(), "OC");
}

public sealed interface Intf permits NonSealedInterface {
String m();
}

public non-sealed interface NonSealedInterface extends Intf {
}

@Test(expectedExceptions = { IllegalArgumentException.class })
public void testSealedInterface() {
MethodHandle target = MethodHandles.constant(String.class, "Sealed");
MethodHandleProxies.asInterfaceInstance(Intf.class, target);
}

@Test
public void testNonSealedInterface() {
MethodHandle target = MethodHandles.constant(String.class, "Non-Sealed");
NonSealedInterface proxy = MethodHandleProxies.asInterfaceInstance(NonSealedInterface.class, target);
assertEquals(proxy.m(), "Non-Sealed");
}
}
69 changes: 69 additions & 0 deletions test/jdk/java/lang/reflect/Proxy/SealedInterfaceTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

/*
* @test
* @bug 8269351
* @run testng SealedInterfaceTest
*/

import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;

import org.testng.annotations.Test;
import static org.testng.Assert.*;

public class SealedInterfaceTest {
sealed interface Intf permits NonSealedInterface {
void m1();
}

non-sealed interface NonSealedInterface extends Intf {
void m2();
}

@Test(expectedExceptions = { IllegalArgumentException.class })
public void testSealedInterface() {
Proxy.newProxyInstance(SealedInterfaceTest.class.getClassLoader(),
new Class<?>[]{ Intf.class },
new InvocationHandler() {
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
return null;
}
});
}

@Test
public void testNonSealedInterface() {
Proxy.newProxyInstance(SealedInterfaceTest.class.getClassLoader(),
new Class<?>[]{ NonSealedInterface.class },
new InvocationHandler() {
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
return null;
}
});
}
}

1 comment on commit 3d0d27c

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.