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
322
test/jdk/java/net/httpclient/AbstractNoBody.java
Normal file
322
test/jdk/java/net/httpclient/AbstractNoBody.java
Normal file
|
|
@ -0,0 +1,322 @@
|
|||
/*
|
||||
* Copyright (c) 2015, 2026, 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.io.Closeable;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient.Version;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.net.http.HttpResponse;
|
||||
import java.net.http.HttpResponse.BodyHandlers;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.net.http.HttpClient;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
import javax.net.ssl.SSLContext;
|
||||
|
||||
import jdk.httpclient.test.lib.common.HttpServerAdapters;
|
||||
import jdk.httpclient.test.lib.http3.Http3TestServer;
|
||||
import jdk.test.lib.net.SimpleSSLContext;
|
||||
|
||||
import static java.lang.System.err;
|
||||
import static java.lang.System.out;
|
||||
import static java.net.http.HttpClient.Builder.NO_PROXY;
|
||||
import static java.net.http.HttpClient.Version.HTTP_1_1;
|
||||
import static java.net.http.HttpClient.Version.HTTP_2;
|
||||
import static java.net.http.HttpClient.Version.HTTP_3;
|
||||
import static java.net.http.HttpOption.H3_DISCOVERY;
|
||||
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
|
||||
// Use TestInstance.Lifecycle.PER_CLASS because we need access
|
||||
// to this.getClass() in methods that are called from
|
||||
// @BeforeAll and @AfterAll
|
||||
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
|
||||
public abstract class AbstractNoBody implements HttpServerAdapters {
|
||||
|
||||
private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
|
||||
HttpTestServer httpTestServer; // HTTP/1.1 [ 4 servers ]
|
||||
HttpTestServer httpsTestServer; // HTTPS/1.1
|
||||
HttpTestServer http2TestServer; // HTTP/2 ( h2c )
|
||||
HttpTestServer https2TestServer; // HTTP/2 ( h2 )
|
||||
HttpTestServer http3TestServer; // HTTP/3 ( h3 )
|
||||
String httpURI_fixed;
|
||||
String httpURI_chunk;
|
||||
String httpsURI_fixed;
|
||||
String httpsURI_chunk;
|
||||
String http2URI_fixed;
|
||||
String http2URI_chunk;
|
||||
String https2URI_fixed;
|
||||
String https2URI_chunk;
|
||||
String http3URI_fixed;
|
||||
String http3URI_chunk;
|
||||
String http3URI_head;
|
||||
|
||||
static final String SIMPLE_STRING = "Hello world. Goodbye world";
|
||||
static final int ITERATION_COUNT = 3;
|
||||
// a shared executor helps reduce the amount of threads created by the test
|
||||
static final ExecutorService executor = Executors.newFixedThreadPool(ITERATION_COUNT * 2);
|
||||
static final ExecutorService serverExecutor = Executors.newFixedThreadPool(ITERATION_COUNT * 4);
|
||||
static final AtomicLong clientCount = new AtomicLong();
|
||||
static final long start = System.nanoTime();
|
||||
public static String now() {
|
||||
long now = System.nanoTime() - start;
|
||||
long secs = now / 1000_000_000;
|
||||
long mill = (now % 1000_000_000) / 1000_000;
|
||||
long nan = now % 1000_000;
|
||||
return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
|
||||
}
|
||||
|
||||
public Object[][] variants() {
|
||||
return new Object[][]{
|
||||
{ http3URI_fixed, false,},
|
||||
{ http3URI_chunk, false },
|
||||
{ http3URI_fixed, true,},
|
||||
{ http3URI_chunk, true },
|
||||
|
||||
{ httpURI_fixed, false },
|
||||
{ httpURI_chunk, false },
|
||||
{ httpsURI_fixed, false },
|
||||
{ httpsURI_chunk, false },
|
||||
{ http2URI_fixed, false },
|
||||
{ http2URI_chunk, false },
|
||||
{ https2URI_fixed, false,},
|
||||
{ https2URI_chunk, false },
|
||||
|
||||
{ httpURI_fixed, true },
|
||||
{ httpURI_chunk, true },
|
||||
{ httpsURI_fixed, true },
|
||||
{ httpsURI_chunk, true },
|
||||
{ http2URI_fixed, true },
|
||||
{ http2URI_chunk, true },
|
||||
{ https2URI_fixed, true,},
|
||||
{ https2URI_chunk, true },
|
||||
};
|
||||
}
|
||||
|
||||
private volatile HttpClient sharedClient;
|
||||
|
||||
static Version version(String uri) {
|
||||
if (uri.contains("/http1/") || uri.contains("/https1/"))
|
||||
return HTTP_1_1;
|
||||
if (uri.contains("/http2/") || uri.contains("/https2/"))
|
||||
return HTTP_2;
|
||||
if (uri.contains("/http3/"))
|
||||
return HTTP_3;
|
||||
return null;
|
||||
}
|
||||
|
||||
HttpRequest.Builder newRequestBuilder(String uri) {
|
||||
var builder = HttpRequest.newBuilder(URI.create(uri));
|
||||
if (version(uri) == HTTP_3) {
|
||||
builder.version(HTTP_3);
|
||||
builder.setOption(H3_DISCOVERY, http3TestServer.h3DiscoveryConfig());
|
||||
}
|
||||
return builder;
|
||||
}
|
||||
|
||||
HttpResponse<String> headRequest(HttpClient client)
|
||||
throws IOException, InterruptedException
|
||||
{
|
||||
out.println("\n" + now() + "--- Sending HEAD request ----\n");
|
||||
err.println("\n" + now() + "--- Sending HEAD request ----\n");
|
||||
|
||||
var request = newRequestBuilder(http3URI_head)
|
||||
.HEAD().version(HTTP_2).build();
|
||||
var response = client.send(request, BodyHandlers.ofString());
|
||||
assertEquals(200, response.statusCode());
|
||||
assertEquals(HTTP_2, response.version());
|
||||
out.println("\n" + now() + "--- HEAD request succeeded ----\n");
|
||||
err.println("\n" + now() + "--- HEAD request succeeded ----\n");
|
||||
return response;
|
||||
}
|
||||
|
||||
private HttpClient makeNewClient() {
|
||||
clientCount.incrementAndGet();
|
||||
return newClientBuilderForH3()
|
||||
.executor(executor)
|
||||
.proxy(NO_PROXY)
|
||||
.sslContext(sslContext)
|
||||
.build();
|
||||
}
|
||||
|
||||
HttpClient newHttpClient(boolean share) {
|
||||
if (!share) return makeNewClient();
|
||||
HttpClient shared = sharedClient;
|
||||
if (shared != null) return shared;
|
||||
synchronized (this) {
|
||||
shared = sharedClient;
|
||||
if (shared == null) {
|
||||
shared = sharedClient = makeNewClient();
|
||||
}
|
||||
return shared;
|
||||
}
|
||||
}
|
||||
|
||||
record CloseableClient(HttpClient client, boolean shared)
|
||||
implements Closeable {
|
||||
public void close() {
|
||||
if (shared) return;
|
||||
client.close();
|
||||
}
|
||||
}
|
||||
|
||||
@BeforeAll
|
||||
public void setup() throws Exception {
|
||||
printStamp(START, "setup");
|
||||
HttpServerAdapters.enableServerLogging();
|
||||
|
||||
// HTTP/1.1
|
||||
HttpTestHandler h1_fixedLengthNoBodyHandler = new FixedLengthNoBodyHandler();
|
||||
HttpTestHandler h1_chunkNoBodyHandler = new ChunkedNoBodyHandler();
|
||||
|
||||
httpTestServer = HttpTestServer.create(HTTP_1_1, null, serverExecutor);
|
||||
httpTestServer.addHandler(h1_fixedLengthNoBodyHandler,"/http1/noBodyFixed");
|
||||
httpTestServer.addHandler(h1_chunkNoBodyHandler, "/http1/noBodyChunk");
|
||||
httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/noBodyFixed";
|
||||
httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/noBodyChunk";
|
||||
|
||||
httpsTestServer = HttpTestServer.create(HTTP_1_1, sslContext, serverExecutor);
|
||||
httpsTestServer.addHandler(h1_fixedLengthNoBodyHandler,"/https1/noBodyFixed");
|
||||
httpsTestServer.addHandler(h1_chunkNoBodyHandler, "/https1/noBodyChunk");
|
||||
httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/noBodyFixed";
|
||||
httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/noBodyChunk";
|
||||
|
||||
// HTTP/2
|
||||
HttpTestHandler h2_fixedLengthNoBodyHandler = new FixedLengthNoBodyHandler();
|
||||
HttpTestHandler h2_chunkedNoBodyHandler = new ChunkedNoBodyHandler();
|
||||
|
||||
http2TestServer = HttpTestServer.create(HTTP_2, null, serverExecutor);
|
||||
http2TestServer.addHandler(h2_fixedLengthNoBodyHandler, "/http2/noBodyFixed");
|
||||
http2TestServer.addHandler(h2_chunkedNoBodyHandler, "/http2/noBodyChunk");
|
||||
http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/noBodyFixed";
|
||||
http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/noBodyChunk";
|
||||
|
||||
https2TestServer = HttpTestServer.create(HTTP_2, sslContext, serverExecutor);
|
||||
https2TestServer.addHandler(h2_fixedLengthNoBodyHandler, "/https2/noBodyFixed");
|
||||
https2TestServer.addHandler(h2_chunkedNoBodyHandler, "/https2/noBodyChunk");
|
||||
https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/noBodyFixed";
|
||||
https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/noBodyChunk";
|
||||
|
||||
// HTTP/3
|
||||
HttpTestHandler h3_fixedLengthHandler = new FixedLengthNoBodyHandler();
|
||||
HttpTestHandler h3_chunkedHandler = new ChunkedNoBodyHandler();
|
||||
http3TestServer = HttpTestServer.create(HTTP_3, sslContext);
|
||||
http3TestServer.addHandler(h3_fixedLengthHandler, "/http3/noBodyFixed");
|
||||
http3TestServer.addHandler(h3_chunkedHandler, "/http3/noBodyChunk");
|
||||
http3TestServer.addHandler(new HttpHeadOrGetHandler(), "/http3/noBodyHead");
|
||||
http3URI_fixed = "https://" + http3TestServer.serverAuthority() + "/http3/noBodyFixed";
|
||||
http3URI_chunk = "https://" + http3TestServer.serverAuthority() + "/http3/noBodyChunk";
|
||||
http3URI_head = "https://" + http3TestServer.serverAuthority() + "/http3/noBodyHead";
|
||||
|
||||
httpTestServer.start();
|
||||
httpsTestServer.start();
|
||||
http2TestServer.start();
|
||||
https2TestServer.start();
|
||||
http3TestServer.start();
|
||||
|
||||
var shared = newHttpClient(true);
|
||||
|
||||
out.println("HTTP/1.1 server (http) listening at: " + httpTestServer.serverAuthority());
|
||||
out.println("HTTP/1.1 server (TLS) listening at: " + httpsTestServer.serverAuthority());
|
||||
out.println("HTTP/2 server (h2c) listening at: " + http2TestServer.serverAuthority());
|
||||
out.println("HTTP/2 server (h2) listening at: " + https2TestServer.serverAuthority());
|
||||
out.println("HTTP/3 server (h2) listening at: " + http3TestServer.serverAuthority());
|
||||
out.println(" + alt endpoint (h3) listening at: " + http3TestServer.getH3AltService()
|
||||
.map(Http3TestServer::getAddress));
|
||||
out.println("Shared client is: " + shared);
|
||||
|
||||
headRequest(shared);
|
||||
|
||||
printStamp(END,"setup");
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
public void teardown() throws Exception {
|
||||
printStamp(START, "teardown");
|
||||
sharedClient.close();
|
||||
httpTestServer.stop();
|
||||
httpsTestServer.stop();
|
||||
http2TestServer.stop();
|
||||
https2TestServer.stop();
|
||||
http3TestServer.stop();
|
||||
executor.close();
|
||||
serverExecutor.close();
|
||||
printStamp(END, "teardown");
|
||||
}
|
||||
|
||||
static final String START = "start";
|
||||
static final String END = "end ";
|
||||
void printStamp(String what, String fmt, Object... args) {
|
||||
System.out.printf("%s: %s \t [%s]\t %s%n",
|
||||
getClass().getSimpleName(), what, now(), String.format(fmt,args));
|
||||
}
|
||||
|
||||
|
||||
static class FixedLengthNoBodyHandler implements HttpTestHandler {
|
||||
@Override
|
||||
public void handle(HttpTestExchange t) throws IOException {
|
||||
//out.println("NoBodyHandler received request to " + t.getRequestURI());
|
||||
boolean echo = "echo".equals(t.getRequestURI().getRawQuery());
|
||||
byte[] reqbytes;
|
||||
try (InputStream is = t.getRequestBody()) {
|
||||
reqbytes = is.readAllBytes();
|
||||
}
|
||||
if (echo) {
|
||||
t.sendResponseHeaders(200, reqbytes.length);
|
||||
if (reqbytes.length > 0) {
|
||||
try (var os = t.getResponseBody()) {
|
||||
os.write(reqbytes);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
t.sendResponseHeaders(200, 0); // no body
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static class ChunkedNoBodyHandler implements HttpTestHandler {
|
||||
@Override
|
||||
public void handle(HttpTestExchange t) throws IOException {
|
||||
//out.println("NoBodyHandler received request to " + t.getRequestURI());
|
||||
boolean echo = "echo".equals(t.getRequestURI().getRawQuery());
|
||||
byte[] reqbytes;
|
||||
try (InputStream is = t.getRequestBody()) {
|
||||
reqbytes = is.readAllBytes();
|
||||
}
|
||||
if (echo) {
|
||||
t.sendResponseHeaders(200, -1);
|
||||
try (var os = t.getResponseBody()) {
|
||||
os.write(reqbytes);
|
||||
}
|
||||
} else {
|
||||
t.sendResponseHeaders(200, -1); // chunked
|
||||
t.getResponseBody().close(); // write nothing
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue