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
172
test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java
Normal file
172
test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
/*
|
||||
* Copyright (c) 2024, 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
|
||||
* @library /test/lib
|
||||
* @library /javax/net/ssl/templates
|
||||
* @bug 8242008
|
||||
* @summary Verifies multiple PSKs are used by JSSE
|
||||
* @run main/othervm MultiNSTClient -Djdk.tls.client.protocols=TLSv1.3 -Djdk.tls.server.newSessionTicketCount=1
|
||||
* @run main/othervm MultiNSTClient -Djdk.tls.client.protocols=TLSv1.3 -Djdk.tls.server.newSessionTicketCount=3
|
||||
* @run main/othervm MultiNSTClient -Djdk.tls.client.protocols=TLSv1.3 -Djdk.tls.server.newSessionTicketCount=10
|
||||
* @run main/othervm MultiNSTClient -Djdk.tls.client.protocols=TLSv1.3 -Djdk.tls.server.enableSessionTicketExtension=true -Djdk.tls.client.enableSessionTicketExtension=true
|
||||
* @run main/othervm MultiNSTClient -Djdk.tls.client.protocols=TLSv1.3 -Djdk.tls.server.enableSessionTicketExtension=false -Djdk.tls.client.enableSessionTicketExtension=true
|
||||
* @run main/othervm MultiNSTClient -Djdk.tls.client.protocols=TLSv1.3 -Djdk.tls.server.enableSessionTicketExtension=true -Djdk.tls.client.enableSessionTicketExtension=false
|
||||
* @run main/othervm MultiNSTClient -Djdk.tls.client.protocols=TLSv1.3 -Djdk.tls.server.enableSessionTicketExtension=false -Djdk.tls.client.enableSessionTicketExtension=false
|
||||
* @run main/othervm MultiNSTClient -Djdk.tls.client.protocols=TLSv1.2 -Djdk.tls.server.enableSessionTicketExtension=true -Djdk.tls.client.enableSessionTicketExtension=true
|
||||
*/
|
||||
|
||||
import jdk.test.lib.process.OutputAnalyzer;
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
|
||||
import javax.net.ssl.SSLSession;
|
||||
import java.util.Arrays;
|
||||
import java.util.HexFormat;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* This test verifies that multiple NSTs and PSKs are sent by a JSSE server.
|
||||
* Then JSSE client is able to store them all and resume the connection. It
|
||||
* requires specific text in the TLS debugging to verify the success.
|
||||
*/
|
||||
|
||||
public class MultiNSTClient {
|
||||
|
||||
static HexFormat hex = HexFormat.of();
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
if (!args[0].equalsIgnoreCase("p")) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
Arrays.stream(args).forEach(a -> {
|
||||
sb.append(a);
|
||||
sb.append(" ");
|
||||
});
|
||||
String params = sb.toString();
|
||||
System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
|
||||
" -Dtest.src=" + System.getProperty("test.src") +
|
||||
" -Dtest.jdk=" + System.getProperty("test.jdk") +
|
||||
" -Dtest.root=" + System.getProperty("test.root") +
|
||||
" -Djavax.net.debug=ssl,handshake " + params
|
||||
);
|
||||
|
||||
boolean TLS13 = args[0].contains("1.3");
|
||||
|
||||
System.out.println("test.java.opts: " +
|
||||
System.getProperty("test.java.opts"));
|
||||
|
||||
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("MultiNSTClient", "p");
|
||||
|
||||
OutputAnalyzer output = ProcessTools.executeProcess(pb);
|
||||
boolean pass = true;
|
||||
try {
|
||||
List<String> list = output.stderrShouldContain("MultiNST PSK").
|
||||
asLines().stream().filter(s ->
|
||||
s.contains("MultiNST PSK")).toList();
|
||||
List<String> serverPSK = list.stream().filter(s ->
|
||||
s.contains("MultiNST PSK (Server)")).toList();
|
||||
List<String> clientPSK = list.stream().filter(s ->
|
||||
s.contains("MultiNST PSK (Client)")).toList();
|
||||
System.out.println("found list: " + list.size());
|
||||
System.out.println("found server: " + serverPSK.size());
|
||||
serverPSK.stream().forEach(s -> System.out.println("\t" + s));
|
||||
System.out.println("found client: " + clientPSK.size());
|
||||
clientPSK.stream().forEach(s -> System.out.println("\t" + s));
|
||||
for (int i = 0; i < 2; i++) {
|
||||
String svr = serverPSK.getFirst();
|
||||
String cli = clientPSK.getFirst();
|
||||
if (svr.regionMatches(svr.length() - 16, cli,
|
||||
cli.length() - 16, 16)) {
|
||||
System.out.println("entry " + (i + 1) + " match.");
|
||||
} else {
|
||||
System.out.println("entry " + (i + 1) +
|
||||
" server and client PSK didn't match:");
|
||||
System.out.println(" server: " + svr);
|
||||
System.out.println(" client: " + cli);
|
||||
pass = false;
|
||||
}
|
||||
}
|
||||
} catch (RuntimeException e) {
|
||||
System.out.println("No MultiNST PSK found.");
|
||||
pass = false;
|
||||
}
|
||||
|
||||
if (TLS13) {
|
||||
if (!pass) {
|
||||
throw new Exception("Test failed: " + params);
|
||||
}
|
||||
} else {
|
||||
if (pass) {
|
||||
throw new Exception("Test failed: " + params);
|
||||
}
|
||||
}
|
||||
System.out.println("Test Passed");
|
||||
return;
|
||||
}
|
||||
|
||||
TLSBase.Server server = new TLSBase.Server();
|
||||
server.serverLatch.await();
|
||||
System.out.println("------ Server ready, starting original client.");
|
||||
TLSBase.Client initial = new TLSBase.Client();
|
||||
SSLSession initialSession = initial.connect().getSession();
|
||||
System.out.println("id = " + hex.formatHex(initialSession.getId()));
|
||||
System.out.println("session = " + initialSession);
|
||||
|
||||
System.out.println("------ getNewSession from original client");
|
||||
TLSBase.Client resumClient = new TLSBase.Client(initial);
|
||||
SSLSession resumption = resumClient.connect().getSession();
|
||||
System.out.println("id = " + hex.formatHex(resumption.getId()));
|
||||
System.out.println("session = " + resumption);
|
||||
if (!initialSession.toString().equalsIgnoreCase(resumption.toString())) {
|
||||
throw new Exception("Resumed session did not match");
|
||||
}
|
||||
|
||||
System.out.println("------ Second getNewSession from original client");
|
||||
TLSBase.Client resumClient2 = new TLSBase.Client(initial);
|
||||
resumption = resumClient2.connect().getSession();
|
||||
System.out.println("id = " + hex.formatHex(resumption.getId()));
|
||||
System.out.println("session = " + resumption);
|
||||
if (!initialSession.toString().equalsIgnoreCase(resumption.toString())) {
|
||||
throw new Exception("Resumed session did not match");
|
||||
}
|
||||
|
||||
System.out.println("------ New client connection");
|
||||
TLSBase.Client newConnection = new TLSBase.Client();
|
||||
SSLSession newSession = newConnection.connect().getSession();
|
||||
System.out.println("id = " + hex.formatHex(newSession.getId()));
|
||||
System.out.println("session = " + newSession);
|
||||
if (initialSession.toString().equalsIgnoreCase(newSession.toString())) {
|
||||
throw new Exception("new session is the same as the initial.");
|
||||
}
|
||||
|
||||
System.out.println("------ Closing connections");
|
||||
initial.close();
|
||||
resumClient.close();
|
||||
resumClient2.close();
|
||||
newConnection.close();
|
||||
server.close();
|
||||
System.out.println("------ End");
|
||||
System.exit(0);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue