mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 23:04:50 +02:00
8269351: Proxy::newProxyInstance and MethodHandleProxies::asInterfaceInstance should reject sealed interfaces
Reviewed-by: darcy, alanb
This commit is contained in:
parent
824a51693e
commit
3d0d27ce57
4 changed files with 101 additions and 4 deletions
|
@ -59,7 +59,8 @@ public class MethodHandleProxies {
|
||||||
* even though it re-declares the {@code Object.equals} method and also
|
* even though it re-declares the {@code Object.equals} method and also
|
||||||
* declares default methods, such as {@code Comparator.reverse}.
|
* declares default methods, such as {@code Comparator.reverse}.
|
||||||
* <p>
|
* <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>
|
* <p>
|
||||||
* The resulting instance of the required type will respond to
|
* The resulting instance of the required type will respond to
|
||||||
* invocation of the type's uniquely named method by calling
|
* invocation of the type's uniquely named method by calling
|
||||||
|
@ -156,6 +157,8 @@ public class MethodHandleProxies {
|
||||||
public static <T> T asInterfaceInstance(final Class<T> intfc, final MethodHandle target) {
|
public static <T> T asInterfaceInstance(final Class<T> intfc, final MethodHandle target) {
|
||||||
if (!intfc.isInterface() || !Modifier.isPublic(intfc.getModifiers()))
|
if (!intfc.isInterface() || !Modifier.isPublic(intfc.getModifiers()))
|
||||||
throw newIllegalArgumentException("not a public interface", intfc.getName());
|
throw newIllegalArgumentException("not a public interface", intfc.getName());
|
||||||
|
if (intfc.isSealed())
|
||||||
|
throw newIllegalArgumentException("a sealed interface", intfc.getName());
|
||||||
final MethodHandle mh;
|
final MethodHandle mh;
|
||||||
if (System.getSecurityManager() != null) {
|
if (System.getSecurityManager() != null) {
|
||||||
final Class<?> caller = Reflection.getCallerClass();
|
final Class<?> caller = Reflection.getCallerClass();
|
||||||
|
|
|
@ -710,6 +710,10 @@ public class Proxy implements java.io.Serializable {
|
||||||
throw new IllegalArgumentException(intf.getName() + " is a hidden interface");
|
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
|
* Verify that the class loader resolves the name of this
|
||||||
* interface to the same Class object.
|
* interface to the same Class object.
|
||||||
|
@ -930,7 +934,8 @@ public class Proxy implements java.io.Serializable {
|
||||||
* if any of the following restrictions is violated:</a>
|
* if any of the following restrictions is violated:</a>
|
||||||
* <ul>
|
* <ul>
|
||||||
* <li>All of {@code Class} objects in the given {@code interfaces} array
|
* <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.
|
* not classes or primitive types.
|
||||||
*
|
*
|
||||||
* <li>No two elements in the {@code interfaces} array may
|
* <li>No two elements in the {@code interfaces} array may
|
||||||
|
|
|
@ -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.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* @test
|
/* @test
|
||||||
* @bug 8206955
|
* @bug 8206955 8269351
|
||||||
* @run testng/othervm -ea -esa test.java.lang.invoke.MethodHandlesProxiesTest
|
* @run testng/othervm -ea -esa test.java.lang.invoke.MethodHandlesProxiesTest
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -99,4 +99,24 @@ public class MethodHandlesProxiesTest {
|
||||||
assertEquals(proxy.b(), "OB");
|
assertEquals(proxy.b(), "OB");
|
||||||
assertEquals(proxy.c(), "OC");
|
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
test/jdk/java/lang/reflect/Proxy/SealedInterfaceTest.java
Normal file
69
test/jdk/java/lang/reflect/Proxy/SealedInterfaceTest.java
Normal file
|
@ -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;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue