Improved H2 connection termination in case of the opposite endpoint failing to send GOAWAY frame

Author: ok2c

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java

@@ -442,6 +442,11 @@ public final void onInput(final ByteBuffer src) throws HttpException, IOExceptio
             for (;;) {
                 final RawFrame frame = inputBuffer.read(src, ioSession);
                 if (frame == null) {
+                    if (inputBuffer.isEndOfStream() && connState == ConnectionHandshake.ACTIVE) {
+                        connState = ConnectionHandshake.SHUTDOWN;
+                        final RawFrame goAway = frameFactory.createGoAway(processedRemoteStreamId, H2Error.NO_ERROR, "Unexpected end of stream");
+                        commitFrame(goAway);
+                    }
                     break;
                 }
                 if (streamListener != null) {

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/FrameInputBuffer.java

@@ -30,7 +30,7 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 
-import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.annotation.Internal;
 import org.apache.hc.core5.http2.H2ConnectionException;
 import org.apache.hc.core5.http2.H2CorruptFrameException;
 import org.apache.hc.core5.http2.H2Error;
@@ -61,6 +61,8 @@ enum State { HEAD_EXPECTED, PAYLOAD_EXPECTED }
     private int flags;
     private int streamId;
 
+    private boolean endOfStream;
+
     FrameInputBuffer(final BasicH2TransportMetrics metrics, final int bufferLen, final int maxFramePayloadSize) {
         Args.notNull(metrics, "HTTP2 transport metrics");
         Args.positive(maxFramePayloadSize, "Maximum payload size");
@@ -70,6 +72,7 @@ enum State { HEAD_EXPECTED, PAYLOAD_EXPECTED }
         this.buffer = ByteBuffer.wrap(bytes);
         this.buffer.flip();
         this.state = State.HEAD_EXPECTED;
+        this.endOfStream = false;
     }
 
     public FrameInputBuffer(final BasicH2TransportMetrics metrics, final int maxFramePayloadSize) {
@@ -174,11 +177,13 @@ public RawFrame read(final ByteBuffer src, final ReadableByteChannel channel) th
             }
             if (bytesRead == 0) {
                 break;
-            } else if (bytesRead < 0) {
+            }
+            if (bytesRead == -1) {
                 if (state != State.HEAD_EXPECTED || buffer.hasRemaining()) {
                     throw new H2CorruptFrameException("Corrupt or incomplete HTTP2 frame");
                 } else {
-                    throw new ConnectionClosedException();
+                    endOfStream = true;
+                    break;
                 }
             }
         }
@@ -199,10 +204,16 @@ public RawFrame read(final ReadableByteChannel channel) throws IOException {
     public void reset() {
         buffer.compact();
         state = State.HEAD_EXPECTED;
+        endOfStream = false;
     }
 
     public H2TransportMetrics getMetrics() {
         return metrics;
     }
 
+    @Internal
+    public boolean isEndOfStream() {
+        return endOfStream;
+    }
+
 }

httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestFrameInOutBuffers.java

@@ -29,7 +29,6 @@
 
 import java.nio.ByteBuffer;
 
-import org.apache.hc.core5.http.ConnectionClosedException;
 import org.apache.hc.core5.http2.H2ConnectionException;
 import org.apache.hc.core5.http2.H2CorruptFrameException;
 import org.apache.hc.core5.http2.ReadableByteChannelMock;
@@ -255,8 +254,11 @@ void testReadFrameConnectionClosed() throws Exception {
         final ReadableByteChannelMock readableChannel = new ReadableByteChannelMock(new byte[] {});
 
         Assertions.assertNull(inBuffer.read(readableChannel));
-        Assertions.assertThrows(ConnectionClosedException.class, () ->
-                inBuffer.read(readableChannel));
+        Assertions.assertFalse(inBuffer.isEndOfStream());
+        Assertions.assertNull(inBuffer.read(readableChannel));
+        Assertions.assertTrue(inBuffer.isEndOfStream());
+        Assertions.assertNull(inBuffer.read(readableChannel));
+        Assertions.assertTrue(inBuffer.isEndOfStream());
     }
 
     @Test