8257736: InputStream from BodyPublishers.ofInputStream() leaks when IOE happens

Reviewed-by: dfuchs, chegar

src/java.net.http/share/classes/jdk/internal/net/http/RequestPublishers.java

@@ -398,7 +398,7 @@ public final class RequestPublishers {
 //            return error;
 //        }
 
-        private int read() {
+        private int read() throws IOException {
             if (eof)
                 return -1;
             nextBuffer = bufSupplier.get();
@@ -406,30 +406,46 @@ public final class RequestPublishers {
             byte[] buf = nextBuffer.array();
             int offset = nextBuffer.arrayOffset();
             int cap = nextBuffer.capacity();
-            try {
-                int n = is.read(buf, offset, cap);
-                if (n == -1) {
-                    eof = true;
-                    is.close();
-                    return -1;
-                }
-                //flip
-                nextBuffer.limit(n);
-                nextBuffer.position(0);
-                return n;
-            } catch (IOException ex) {
+            int n = is.read(buf, offset, cap);
+            if (n == -1) {
+                eof = true;
                 return -1;
             }
+            //flip
+            nextBuffer.limit(n);
+            nextBuffer.position(0);
+            return n;
+        }
+
+        /**
+         * Close stream in this instance.
+         * UncheckedIOException may be thrown if IOE happens at InputStream::close.
+         */
+        private void closeStream() {
+            try {
+                is.close();
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
         }
 
         @Override
         public synchronized boolean hasNext() {
             if (need2Read) {
-                haveNext = read() != -1;
-                if (haveNext) {
+                try {
+                    haveNext = read() != -1;
+                    if (haveNext) {
+                        need2Read = false;
+                    }
+                } catch (IOException e) {
+                    haveNext = false;
                     need2Read = false;
+                    throw new UncheckedIOException(e);
+                } finally {
+                    if (!haveNext) {
+                        closeStream();
+                    }
                 }
-                return haveNext;
             }
             return haveNext;
         }

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

@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2021, 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
+ * @modules java.net.http
+ *          java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @library http2/server
+ * @build Http2TestServer Http2TestExchange
+ * @compile HttpServerAdapters.java
+ * @run testng/othervm StreamCloseTest
+ */
+
+import com.sun.net.httpserver.HttpServer;
+
+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.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.testng.Assert;
+
+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;
+
+    @BeforeTest
+    public void setup() throws Exception {
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpServerAdapters.HttpTestServer.of(HttpServer.create(sa, 0));
+        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);
+    }
+
+    @AfterTest
+    public 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());
+        Assert.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
+            Assert.assertTrue(in.closeCalled, "InputStream was not closed!");
+            return;
+        }
+        Assert.fail("IOException should be occurred!");
+    }
+}