stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8218453: More dynamic RMI interactions

Browse Source 
Reviewed-by: ahgross, skoivu, smarks
This commit is contained in:
Roger Riggs 2019-02-06 11:39:57 -05:00
parent 724120457a
commit 8d6e8618a9
3 changed files with 202 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2019, 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
@ -58,8 +58,24 @@ public final class RegistryImpl_Skel
public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall call, int opnum, long hash)
throws java.lang.Exception {
if (hash != interfaceHash)
throw new java.rmi.server.SkeletonMismatchException("interface hash mismatch");
if (opnum < 0) {
if (hash == 7583982177005850366L) {
opnum = 0;
} else if (hash == 2571371476350237748L) {
opnum = 1;
} else if (hash == -7538657168040752697L) {
opnum = 2;
} else if (hash == -8381844669958460146L) {
opnum = 3;
} else if (hash == 7305022919901907578L) {
opnum = 4;
} else {
throw new java.rmi.UnmarshalException("invalid method hash");
}
} else {
if (hash != interfaceHash)
throw new java.rmi.server.SkeletonMismatchException("interface hash mismatch");
}
sun.rmi.registry.RegistryImpl server = (sun.rmi.registry.RegistryImpl) obj;
switch (opnum) {

23
src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, 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
@ -40,6 +40,7 @@ import java.rmi.ServerError;
import java.rmi.ServerException;
import java.rmi.UnmarshalException;
import java.rmi.server.ExportException;
import java.rmi.server.Operation;
import java.rmi.server.RemoteCall;
import java.rmi.server.RemoteRef;
import java.rmi.server.RemoteStub;
@ -292,15 +293,14 @@ public class UnicastServerRef extends UnicastRef
throw new UnmarshalException("error unmarshalling call header",
readEx);
}
if (num >= 0) {
if (skel != null) {
if (skel != null) {
// If there is a skeleton, use it
oldDispatch(obj, call, num);
return;
} else {
throw new UnmarshalException(
"skeleton class not found but required " +
"for client version");
}
} else if (num >= 0){
throw new UnmarshalException(
"skeleton class not found but required for client version");
}
try {
op = in.readLong();
@ -428,8 +428,8 @@ public class UnicastServerRef extends UnicastRef
/**
* Handle server-side dispatch using the RMI 1.1 stub/skeleton
* protocol, given a non-negative operation number that has
* already been read from the call stream.
* protocol, given a non-negative operation number or negative method hash
* that has already been read from the call stream.
* Exceptions are handled by the caller to be sent to the remote client.
*
* @param obj the target remote object for the call
@ -461,7 +461,8 @@ public class UnicastServerRef extends UnicastRef
}
// if calls are being logged, write out object id and operation
logCall(obj, skel.getOperations()[op]);
Operation[] operations = skel.getOperations();
logCall(obj, op >= 0 && op < operations.length ? operations[op] : "op: " + op);
unmarshalCustomCallData(in);
// dispatch to skeleton for remote object
skel.dispatch(obj, call, op, hash);

171
test/jdk/java/rmi/registry/nonLocalRegistry/NonLocalSkeletonTest.java Normal file
View File

@ -0,0 +1,171 @@
/*
* Copyright (c) 2017, 2019, 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.
*/
import sun.rmi.server.UnicastRef;
import sun.rmi.transport.LiveRef;
import sun.rmi.transport.tcp.TCPEndpoint;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.net.InetAddress;
import java.rmi.AccessException;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.rmi.server.ObjID;
import java.rmi.server.RemoteObjectInvocationHandler;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Set;
/* @test
* @bug 8218453
* @library ../../testlibrary
* @modules java.rmi/sun.rmi.registry:+open java.rmi/sun.rmi.server:+open
* java.rmi/sun.rmi.transport:+open java.rmi/sun.rmi.transport.tcp:+open
* @summary Verify that Registry rejects non-local access for bind, unbind, rebind.
* The test is manual because the (non-local) host running rmiregistry must be supplied as a property.
* @run main/othervm -Dregistry.host=localhost NonLocalSkeletonTest
*/
/*
* @test
* @library ../../testlibrary
* @modules java.rmi/sun.rmi.registry:+open java.rmi/sun.rmi.server:+open
* java.rmi/sun.rmi.transport:+open java.rmi/sun.rmi.transport.tcp:+open
* @summary Verify that Registry rejects non-local access for bind, unbind, rebind.
* The test is manual because the (non-local) host running rmiregistry must be supplied as a property.
* @run main/othervm/manual -Dregistry.host=rmi-registry-host NonLocalSkeletonTest
*/
/**
* Verify that access checks for Registry.bind(), .rebind(), and .unbind()
* are prevented on remote access to the registry.
*
* This test is a manual test and uses a standard rmiregistry running
* on a *different* host.
* The test verifies that the access check is performed *before* the object to be
* bound or rebound is deserialized.
*
* Login or ssh to the different host and invoke {@code $JDK_HOME/bin/rmiregistry}.
* It will not show any output.
*
* On the first host modify the @run command above to replace "rmi-registry-host"
* with the hostname or IP address of the different host and run the test with jtreg.
*/
public class NonLocalSkeletonTest {
public static void main(String[] args) throws Exception {
String host = System.getProperty("registry.host");
if (host == null || host.isEmpty()) {
throw new RuntimeException("supply a remote host with -Dregistry.host=hostname");
}
// Check if running the test on a local system; it only applies to remote
String myHostName = InetAddress.getLocalHost().getHostName();
Set<InetAddress> myAddrs = Set.of(InetAddress.getAllByName(myHostName));
Set<InetAddress> hostAddrs = Set.of(InetAddress.getAllByName(host));
boolean isLocal = (hostAddrs.stream().anyMatch(i -> myAddrs.contains(i))
|| hostAddrs.stream().anyMatch(h -> h.isLoopbackAddress()));
int port;
if (isLocal) {
// Create a local Registry to use for the test
port = TestLibrary.getUnusedRandomPort();
Registry registry = LocateRegistry.createRegistry(port);
System.out.printf("local registry port: %s%n", registry);
} else {
// Use regular rmi registry for non-local test
port = Registry.REGISTRY_PORT;
}
try {
Registry r = nonStaticRegistryProxy(host, port);
System.out.printf("RegistryRef: %s%n", r);
r.rebind("anyRef", r);
if (!isLocal) {
throw new RuntimeException("non-local bind should have failed to host: " + host);
} else {
System.out.printf("local rebind succeeded%n");
}
} catch (RemoteException rex) {
if (!isLocal) {
assertIsAccessException(rex);
} else {
throw rex;
}
}
}
/* Returns a non-static proxy for the registry.
* Follows the form of sun.rmi.server.Util.createProxy.
* @param implClass the RegistryImpl
* @param clientRef the registry reference
**/
static Registry nonStaticRegistryProxy(String host, int port) {
final ClassLoader loader = Registry.class.getClassLoader();
final Class<?>[] interfaces = new Class<?>[]{Registry.class};
LiveRef liveRef = new LiveRef(new ObjID(ObjID.REGISTRY_ID),
new TCPEndpoint(host, port, null, null),
false);
final InvocationHandler handler = new RemoteObjectInvocationHandler(new UnicastRef(liveRef));
PrivilegedAction<Registry> action = () -> (Registry) Proxy.newProxyInstance(loader,
interfaces, handler);
return AccessController.doPrivileged(action);
}
/**
* Check the exception chain for the expected AccessException and message.
* @param ex the exception from the remote invocation.
*/
private static void assertIsAccessException(Throwable ex) {
Throwable t = ex;
while (!(t instanceof AccessException) && t.getCause() != null) {
t = t.getCause();
}
if (t instanceof AccessException) {
String msg = t.getMessage();
int asIndex = msg.indexOf("Registry");
int rrIndex = msg.indexOf("Registry.Registry"); // Obsolete error text
int disallowIndex = msg.indexOf("disallowed");
int nonLocalHostIndex = msg.indexOf("non-local host");
if (asIndex < 0 ||
rrIndex != -1 ||
disallowIndex < 0 ||
nonLocalHostIndex < 0 ) {
throw new RuntimeException("exception message is malformed", t);
}
System.out.printf("Found expected AccessException: %s%n%n", t);
} else {
throw new RuntimeException("AccessException did not occur when expected", ex);
}
}
}