Skip to content

Fix H2 stream flow control overflow #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arturobernalg wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −3
Open

Fix H2 stream flow control overflow #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,8 @@ private void consumeFrame(final RawFrame frame) throws HttpException, IOExceptio
try {
updateOutputWindow(streamId, stream.getOutputWindow(), delta);
} catch (final ArithmeticException ex) {
throw new H2ConnectionException(H2Error.FLOW_CONTROL_ERROR, ex.getMessage());
stream.localReset(new H2StreamResetException(H2Error.FLOW_CONTROL_ERROR, ex.getMessage()));
requestSessionOutput();
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions ...-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestAbstractH2StreamMultiplexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,9 +498,13 @@ void testIncrementOverflow() throws Exception {
writableChannel.reset();
final RawFrame incrementFrame2 = FRAME_FACTORY.createWindowUpdate(1, 0x7fffffff - 50);
outBuffer.write(incrementFrame2, writableChannel);
final H2ConnectionException exception = Assertions.assertThrows(H2ConnectionException.class, () ->
Assertions.assertDoesNotThrow(() ->
streamMultiplexer.onInput(ByteBuffer.wrap(writableChannel.toByteArray())));
Assertions.assertEquals(H2Error.FLOW_CONTROL_ERROR, H2Error.getByCode(exception.getCode()));
Mockito.verify(streamHandler).failed(exceptionCaptor.capture());
final Exception exception = exceptionCaptor.getValue();
Assertions.assertInstanceOf(H2StreamResetException.class, exception);
Assertions.assertEquals(H2Error.FLOW_CONTROL_ERROR,
H2Error.getByCode(((H2StreamResetException) exception).getCode()));
}

@Test
Expand Down
Loading