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.

test/jdk/java/net/httpclient/StreamCloseTest.java

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, NTT DATA.
+ *
+ * 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 8257736
+ * @library /test/jdk/java/net/httpclient/lib
+ * @library /test/lib
+ * @build jdk.httpclient.test.lib.common.HttpServerAdapters
+ *        jdk.httpclient.test.lib.http2.Http2TestServer
+ * @run junit/othervm StreamCloseTest
+ */
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.URI;
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class StreamCloseTest {
+
+    private static class TestInputStream extends InputStream {
+        private final boolean exceptionTest;
+        private volatile boolean closeCalled;
+
+        public TestInputStream(boolean exceptionTest) {
+            super();
+            this.exceptionTest = exceptionTest;
+            this.closeCalled = false;
+        }
+
+        @Override
+        public int read() throws IOException {
+            if (exceptionTest) {
+                throw new IOException("test");
+            }
+            return -1;
+        }
+
+        @Override
+        public void close() throws IOException {
+            closeCalled = true;
+            super.close();
+        }
+    }
+
+    private static HttpClient client;
+
+    private static HttpRequest.Builder requestBuilder;
+
+    private static HttpServerAdapters.HttpTestServer httpTestServer;
+
+    @BeforeAll
+    public static void setup() throws Exception {
+        httpTestServer = HttpServerAdapters.HttpTestServer.create(Version.HTTP_1_1);
+        httpTestServer.addHandler(new HttpServerAdapters.HttpTestEchoHandler(), "/");
+        URI uri = URI.create("http://" + httpTestServer.serverAuthority() + "/");
+        httpTestServer.start();
+
+        client = HttpClient.newBuilder()
+                           .version(Version.HTTP_1_1)
+                           .followRedirects(Redirect.ALWAYS)
+                           .build();
+        requestBuilder = HttpRequest.newBuilder(uri);
+    }
+
+    @AfterAll
+    public static void teardown() throws Exception {
+        httpTestServer.stop();
+    }
+
+    @Test
+    public void normallyCloseTest() throws Exception{
+        TestInputStream in = new TestInputStream(false);
+        HttpRequest request = requestBuilder.copy()
+                                            .POST(BodyPublishers.ofInputStream(() -> in))
+                                            .build();
+        client.send(request, BodyHandlers.discarding());
+        Assertions.assertTrue(in.closeCalled, "InputStream was not closed!");
+    }
+
+    @Test
+    public void closeTestOnException() throws Exception{
+        TestInputStream in = new TestInputStream(true);
+        HttpRequest request = requestBuilder.copy()
+                                            .POST(BodyPublishers.ofInputStream(() -> in))
+                                            .build();
+        try {
+            client.send(request, BodyHandlers.discarding());
+        } catch (IOException e) { // expected
+            Assertions.assertTrue(in.closeCalled, "InputStream was not closed!");
+            return;
+        }
+        Assertions.fail("IOException should be occurred!");
+    }
+}