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.
2026-03-26 17:11:57 -04:00 · 2026-03-26 17:11:57 -04:00 · 0a580b313d
commit 0a580b313d
70422 changed files with 17213626 additions and 0 deletions
--- a/test/jdk/java/rmi/transport/handshakeFailure/HandshakeFailure.java
+++ b/test/jdk/java/rmi/transport/handshakeFailure/HandshakeFailure.java
@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2001, 2016, 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 4485966
+ * @summary Whan an RMI (JRMP) connection is made to a TCP address that is
+ * listening, so the connection is accepted, but the server responds with
+ * invalid JRMP protocol (such as because a non-JRMP server is currently
+ * listening at that address), the client application should receive a
+ * java.rmi.ConnectException or ConnectIOException, not a MarshalException.
+ * @author Peter Jones
+ *
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
+ * @run main/othervm HandshakeFailure
+ */
+
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.rmi.ConnectException;
+import java.rmi.ConnectIOException;
+import java.rmi.MarshalException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+
+public class HandshakeFailure {
+
+    private static final int TIMEOUT = 10000;
+
+    public static void main(String[] args) throws Exception {
+
+        /*
+         * Listen on port...
+         */
+        ServerSocket serverSocket = new ServerSocket(0);
+        int port = serverSocket.getLocalPort();
+
+        /*
+         * (Attempt RMI call to port in separate thread.)
+         */
+        Registry registry = LocateRegistry.getRegistry(port);
+        Connector connector = new Connector(registry);
+        Thread t = new Thread(connector);
+        t.setDaemon(true);
+        t.start();
+
+        /*
+         * ...accept one connection from port and send non-JRMP data.
+         */
+        Socket socket = serverSocket.accept();
+        socket.getOutputStream().write("Wrong way".getBytes());
+        socket.close();
+
+        /*
+         * Wait for call attempt to finish, and analyze result.
+         */
+        t.join(TIMEOUT);
+        synchronized (connector) {
+            if (connector.success) {
+                throw new RuntimeException(
+                    "TEST FAILED: remote call succeeded??");
+            }
+            if (connector.exception == null) {
+                throw new RuntimeException(
+                    "TEST FAILED: remote call did not time out");
+            } else {
+                System.err.println("remote call failed with exception:");
+                connector.exception.printStackTrace();
+                System.err.println();
+
+                if (connector.exception instanceof MarshalException) {
+                    throw new RuntimeException(
+                        "TEST FAILED: MarshalException thrown, expecting " +
+                        "java.rmi.ConnectException or ConnectIOException");
+                } else if (connector.exception instanceof ConnectException ||
+                           connector.exception instanceof ConnectIOException)
+                {
+                    System.err.println(
+                        "TEST PASSED: java.rmi.ConnectException or " +
+                        "ConnectIOException thrown");
+                } else {
+                    throw new RuntimeException(
+                        "TEST FAILED: unexpected Exception thrown",
+                        connector.exception);
+                }
+            }
+        }
+    }
+
+    private static class Connector implements Runnable {
+
+        private final Registry registry;
+
+        boolean success = false;
+        Exception exception = null;
+
+        Connector(Registry registry) {
+            this.registry = registry;
+        }
+
+        public void run() {
+            try {
+                registry.lookup("Dale Cooper");
+                synchronized (this) {
+                    success = true;
+                }
+            } catch (Exception e) {
+                synchronized (this) {
+                    exception = e;
+                }
+            }
+        }
+    }
+}