undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
|
|
@ -0,0 +1,146 @@
|
|||
/*
|
||||
* Copyright (c) 2001, 2017, 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 4308492
|
||||
* @summary In addition to keeping the VM alive (with a non-daeman thread)
|
||||
* while there are remote objects exported, the RMI runtime should also
|
||||
* keep it alive while there remain calls in progress (to remote objects
|
||||
* the have presumably been unexported), so that a remote object can more
|
||||
* conveniently implement a graceful remote shutdown method (that unexports
|
||||
* the object).
|
||||
* @author Peter Jones
|
||||
*
|
||||
* @library ../../../testlibrary
|
||||
* @modules java.rmi/sun.rmi.registry
|
||||
* java.rmi/sun.rmi.server
|
||||
* java.rmi/sun.rmi.transport
|
||||
* java.rmi/sun.rmi.transport.tcp
|
||||
* @build TestLibrary JavaVM KeepAliveDuringCall_Stub
|
||||
* ShutdownMonitor Shutdown ShutdownImpl ShutdownImpl_Stub
|
||||
* @run main/othervm KeepAliveDuringCall
|
||||
*/
|
||||
|
||||
import java.rmi.Remote;
|
||||
import java.rmi.RemoteException;
|
||||
import java.rmi.registry.LocateRegistry;
|
||||
import java.rmi.registry.Registry;
|
||||
import java.rmi.server.UnicastRemoteObject;
|
||||
|
||||
public class KeepAliveDuringCall implements ShutdownMonitor {
|
||||
|
||||
public static final String BINDING = "KeepAliveDuringCall";
|
||||
private static final int TIMEOUT = 20000;
|
||||
|
||||
private Object lock = new Object();
|
||||
private Shutdown shutdown = null;
|
||||
private boolean stillAlive = false;
|
||||
|
||||
public void submitShutdown(Shutdown shutdown) {
|
||||
synchronized (lock) {
|
||||
this.shutdown = shutdown;
|
||||
lock.notifyAll();
|
||||
}
|
||||
}
|
||||
|
||||
public void declareStillAlive() {
|
||||
synchronized (lock) {
|
||||
stillAlive = true;
|
||||
lock.notifyAll();
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
System.err.println("\nRegression test for bug 4308492\n");
|
||||
|
||||
KeepAliveDuringCall obj = new KeepAliveDuringCall();
|
||||
JavaVM jvm = null;
|
||||
|
||||
try {
|
||||
UnicastRemoteObject.exportObject(obj);
|
||||
System.err.println("exported shutdown monitor");
|
||||
|
||||
Registry localRegistry = TestLibrary.createRegistryOnEphemeralPort();
|
||||
int registryPort = TestLibrary.getRegistryPort(localRegistry);
|
||||
System.err.println("created local registry");
|
||||
|
||||
localRegistry.bind(BINDING, obj);
|
||||
System.err.println("bound shutdown monitor in local registry");
|
||||
|
||||
System.err.println("starting remote ShutdownImpl VM...");
|
||||
jvm = new JavaVM("ShutdownImpl",
|
||||
"-Drmi.registry.port=" +
|
||||
registryPort, "");
|
||||
jvm.start();
|
||||
|
||||
Shutdown s;
|
||||
synchronized (obj.lock) {
|
||||
System.err.println(
|
||||
"waiting for submission of object to shutdown...");
|
||||
while ((s = obj.shutdown) == null) {
|
||||
obj.lock.wait(TIMEOUT);
|
||||
}
|
||||
if (s == null) {
|
||||
throw new RuntimeException(
|
||||
"TEST FAILED: timeout waiting for shutdown object " +
|
||||
"to make initial contact");
|
||||
}
|
||||
System.err.println("shutdown object submitted: " + s);
|
||||
}
|
||||
|
||||
try {
|
||||
s.shutdown();
|
||||
} catch (RemoteException e) {
|
||||
throw new RuntimeException(
|
||||
"TEST FAILED: shutdown method threw remote exception", e);
|
||||
}
|
||||
|
||||
synchronized (obj.lock) {
|
||||
if (!obj.stillAlive) {
|
||||
throw new RuntimeException("TEST FAILED: " +
|
||||
"shutdown object not detected alive after unexport");
|
||||
}
|
||||
}
|
||||
|
||||
System.err.println("TEST PASSED: " +
|
||||
"shutdown object detected still alive after unexport");
|
||||
|
||||
} catch (Exception e) {
|
||||
if (e instanceof RuntimeException) {
|
||||
throw (RuntimeException) e;
|
||||
} else {
|
||||
throw new RuntimeException(
|
||||
"TEST FAILED: unexpected exception", e);
|
||||
}
|
||||
} finally {
|
||||
if (jvm != null) {
|
||||
jvm.destroy();
|
||||
}
|
||||
try {
|
||||
UnicastRemoteObject.unexportObject(obj, true);
|
||||
} catch (RemoteException e) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
/*
|
||||
* Copyright (c) 2001, 2008, 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.
|
||||
*/
|
||||
|
||||
// Stub class generated by rmic, do not edit.
|
||||
// Contents subject to change without notice.
|
||||
|
||||
public final class KeepAliveDuringCall_Stub
|
||||
extends java.rmi.server.RemoteStub
|
||||
implements ShutdownMonitor
|
||||
{
|
||||
private static final long serialVersionUID = 2;
|
||||
|
||||
private static java.lang.reflect.Method $method_declareStillAlive_0;
|
||||
private static java.lang.reflect.Method $method_submitShutdown_1;
|
||||
|
||||
static {
|
||||
try {
|
||||
$method_declareStillAlive_0 = ShutdownMonitor.class.getMethod("declareStillAlive", new java.lang.Class[] {});
|
||||
$method_submitShutdown_1 = ShutdownMonitor.class.getMethod("submitShutdown", new java.lang.Class[] {Shutdown.class});
|
||||
} catch (java.lang.NoSuchMethodException e) {
|
||||
throw new java.lang.NoSuchMethodError(
|
||||
"stub class initialization failed");
|
||||
}
|
||||
}
|
||||
|
||||
// constructors
|
||||
public KeepAliveDuringCall_Stub(java.rmi.server.RemoteRef ref) {
|
||||
super(ref);
|
||||
}
|
||||
|
||||
// methods from remote interfaces
|
||||
|
||||
// implementation of declareStillAlive()
|
||||
public void declareStillAlive()
|
||||
throws java.rmi.RemoteException
|
||||
{
|
||||
try {
|
||||
ref.invoke(this, $method_declareStillAlive_0, null, -1562228924246272634L);
|
||||
} catch (java.lang.RuntimeException e) {
|
||||
throw e;
|
||||
} catch (java.rmi.RemoteException e) {
|
||||
throw e;
|
||||
} catch (java.lang.Exception e) {
|
||||
throw new java.rmi.UnexpectedException("undeclared checked exception", e);
|
||||
}
|
||||
}
|
||||
|
||||
// implementation of submitShutdown(Shutdown)
|
||||
public void submitShutdown(Shutdown $param_Shutdown_1)
|
||||
throws java.rmi.RemoteException
|
||||
{
|
||||
try {
|
||||
ref.invoke(this, $method_submitShutdown_1, new java.lang.Object[] {$param_Shutdown_1}, 7574258166120515108L);
|
||||
} catch (java.lang.RuntimeException e) {
|
||||
throw e;
|
||||
} catch (java.rmi.RemoteException e) {
|
||||
throw e;
|
||||
} catch (java.lang.Exception e) {
|
||||
throw new java.rmi.UnexpectedException("undeclared checked exception", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
/*
|
||||
* Copyright (c) 2001, 2008, 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 java.rmi.Remote;
|
||||
import java.rmi.RemoteException;
|
||||
|
||||
public interface Shutdown extends Remote {
|
||||
void shutdown() throws RemoteException;
|
||||
}
|
||||
|
|
@ -0,0 +1,90 @@
|
|||
/*
|
||||
* Copyright (c) 2001, 2012, 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 java.rmi.Remote;
|
||||
import java.rmi.registry.LocateRegistry;
|
||||
import java.rmi.registry.Registry;
|
||||
import java.rmi.server.UnicastRemoteObject;
|
||||
|
||||
public class ShutdownImpl implements Shutdown {
|
||||
|
||||
private static Remote impl; // rooted here to prevent GC
|
||||
|
||||
private final ShutdownMonitor monitor;
|
||||
|
||||
private ShutdownImpl(ShutdownMonitor monitor) {
|
||||
this.monitor = monitor;
|
||||
}
|
||||
|
||||
public void shutdown() {
|
||||
try {
|
||||
System.err.println(
|
||||
"(ShutdownImpl.shutdown) shutdown method invoked:");
|
||||
|
||||
UnicastRemoteObject.unexportObject(this, true);
|
||||
System.err.println(
|
||||
"(ShutdownImpl.shutdown) shutdown object unexported");
|
||||
|
||||
Thread.sleep(500);
|
||||
System.err.println("(ShutDownImpl.shutdown) FEE");
|
||||
Thread.sleep(500);
|
||||
System.err.println("(ShutDownImpl.shutdown) FIE");
|
||||
Thread.sleep(500);
|
||||
System.err.println("(ShutDownImpl.shutdown) FOE");
|
||||
Thread.sleep(500);
|
||||
System.err.println("(ShutDownImpl.shutdown) FOO");
|
||||
|
||||
monitor.declareStillAlive();
|
||||
System.err.println("(ShutDownImpl.shutdown) still alive!");
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(
|
||||
"unexpected exception occurred in shutdown method", e);
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
int registryPort = Integer.parseInt(System.getProperty("rmi.registry.port"));
|
||||
Registry registry =
|
||||
LocateRegistry.getRegistry("", registryPort);
|
||||
ShutdownMonitor monitor = (ShutdownMonitor)
|
||||
registry.lookup(KeepAliveDuringCall.BINDING);
|
||||
System.err.println("(ShutdownImpl) retrieved shutdown monitor");
|
||||
|
||||
impl = new ShutdownImpl(monitor);
|
||||
Shutdown stub = (Shutdown) UnicastRemoteObject.exportObject(impl);
|
||||
System.err.println("(ShutdownImpl) exported shutdown object");
|
||||
|
||||
monitor.submitShutdown(stub);
|
||||
System.err.println("(ShutdownImpl) submitted shutdown object");
|
||||
|
||||
} catch (Exception e) {
|
||||
System.err.println("(ShutdownImpl) TEST SUBPROCESS FAILURE:");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
/*
|
||||
* Copyright (c) 2001, 2008, 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.
|
||||
*/
|
||||
|
||||
// Stub class generated by rmic, do not edit.
|
||||
// Contents subject to change without notice.
|
||||
|
||||
public final class ShutdownImpl_Stub
|
||||
extends java.rmi.server.RemoteStub
|
||||
implements Shutdown
|
||||
{
|
||||
private static final long serialVersionUID = 2;
|
||||
|
||||
private static java.lang.reflect.Method $method_shutdown_0;
|
||||
|
||||
static {
|
||||
try {
|
||||
$method_shutdown_0 = Shutdown.class.getMethod("shutdown", new java.lang.Class[] {});
|
||||
} catch (java.lang.NoSuchMethodException e) {
|
||||
throw new java.lang.NoSuchMethodError(
|
||||
"stub class initialization failed");
|
||||
}
|
||||
}
|
||||
|
||||
// constructors
|
||||
public ShutdownImpl_Stub(java.rmi.server.RemoteRef ref) {
|
||||
super(ref);
|
||||
}
|
||||
|
||||
// methods from remote interfaces
|
||||
|
||||
// implementation of shutdown()
|
||||
public void shutdown()
|
||||
throws java.rmi.RemoteException
|
||||
{
|
||||
try {
|
||||
ref.invoke(this, $method_shutdown_0, null, -7207851917985848402L);
|
||||
} catch (java.lang.RuntimeException e) {
|
||||
throw e;
|
||||
} catch (java.rmi.RemoteException e) {
|
||||
throw e;
|
||||
} catch (java.lang.Exception e) {
|
||||
throw new java.rmi.UnexpectedException("undeclared checked exception", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
/*
|
||||
* Copyright (c) 2001, 2008, 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 java.rmi.Remote;
|
||||
import java.rmi.RemoteException;
|
||||
|
||||
public interface ShutdownMonitor extends Remote {
|
||||
void submitShutdown(Shutdown shutdown) throws RemoteException;
|
||||
void declareStillAlive() throws RemoteException;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue