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/io/Console/ModuleSelectionTest.java
+++ b/test/jdk/java/io/Console/ModuleSelectionTest.java
@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2022, 2025, 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 8295803 8299689 8351435 8361613 8366261
+ * @summary Tests System.console() returns correct Console (or null) from the expected
+ *          module.
+ * @library /test/lib
+ * @build jdk.test.lib.Utils
+ *        jdk.test.lib.process.ProcessTools
+ * @run junit ModuleSelectionTest
+ */
+
+import java.io.Console;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static jdk.test.lib.Utils.*;
+
+public class ModuleSelectionTest {
+    private static Stream<Arguments> options() {
+        return Stream.of(
+            Arguments.of("-Djdk.console=foo", "java.base"),
+            Arguments.of("-Djdk.console=java.base", "java.base"),
+            Arguments.of("-Djdk.console=jdk.internal.le", "jdk.internal.le"),
+            Arguments.of("--limit-modules java.base", "java.base")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("options")
+    void testNonTTY(String opts) throws Exception {
+        opts = opts +
+            " --add-opens java.base/java.io=ALL-UNNAMED ModuleSelectionTest null";
+        OutputAnalyzer output = ProcessTools.executeTestJava(opts.split(" "));
+        output.reportDiagnosticSummary();
+        output.shouldHaveExitValue(0);
+    }
+
+    @ParameterizedTest
+    @MethodSource("options")
+    void testTTY(String opts, String expected) throws Exception {
+        // check "expect" command availability
+        var expect = Paths.get("/usr/bin/expect");
+        Assumptions.assumeTrue(Files.exists(expect) && Files.isExecutable(expect),
+            "'" + expect + "' not found. Test ignored.");
+
+        opts = "expect -n " + TEST_SRC + "/moduleSelection.exp " +
+            TEST_CLASSES + " " +
+            expected + " " +
+            TEST_JDK + "/bin/java" +
+            " --add-opens java.base/java.io=ALL-UNNAMED "
+            + opts;
+        // invoking "expect" command
+        OutputAnalyzer output = ProcessTools.executeProcess(opts.split(" "));
+        output.reportDiagnosticSummary();
+        output.shouldHaveExitValue(0);
+    }
+
+    public static void main(String... args) throws Throwable {
+        var con = System.console();
+        var pc = Class.forName("java.io.ProxyingConsole");
+        var jdkc = Class.forName("jdk.internal.io.JdkConsole");
+        var lookup = MethodHandles.privateLookupIn(Console.class, MethodHandles.lookup());
+        var istty = (boolean)lookup.findStatic(Console.class, "isStdinTty", MethodType.methodType(boolean.class))
+                        .invoke() &&
+                   (boolean)lookup.findStatic(Console.class, "isStdoutTty", MethodType.methodType(boolean.class))
+                        .invoke();
+
+        var impl = con != null ? MethodHandles.privateLookupIn(pc, MethodHandles.lookup())
+                .findGetter(pc, "delegate", jdkc)
+                .invoke(con) : null;
+
+        var expected = args[0];
+        var actual = con == null ? "null" : impl.getClass().getModule().getName();
+
+        if (!actual.equals(expected)) {
+            throw new RuntimeException("""
+                Console implementation is not the expected one.
+                Expected: %s
+                Actual: %s
+                """.formatted(expected, actual));
+        } else {
+            System.out.printf("%s is the expected implementation. (tty: %s)\n", actual, istty);
+        }
+    }
+}