Skip to content

Correct handling of unsigned HTTP/2 SETTINGS values #713

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
+89 −3
Open

Correct handling of unsigned HTTP/2 SETTINGS values #713

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
7 changes: 4 additions & 3 deletions ...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 @@ -1263,17 +1263,18 @@ private void consumeSettingsFrame(final ByteBuffer payload) throws IOException {
final H2Param param = H2Param.valueOf(code);
if (param != null) {
validateSetting(param, value);
final int boundedValue = value < 0 ? Integer.MAX_VALUE : value;
switch (param) {
case HEADER_TABLE_SIZE:
try {
configBuilder.setHeaderTableSize(value);
configBuilder.setHeaderTableSize(boundedValue);
} catch (final IllegalArgumentException ex) {
throw new H2ConnectionException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
break;
case MAX_CONCURRENT_STREAMS:
try {
configBuilder.setMaxConcurrentStreams(value);
configBuilder.setMaxConcurrentStreams(boundedValue);
} catch (final IllegalArgumentException ex) {
throw new H2ConnectionException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
Expand Down Expand Up @@ -1301,7 +1302,7 @@ private void consumeSettingsFrame(final ByteBuffer payload) throws IOException {
break;
case MAX_HEADER_LIST_SIZE:
try {
configBuilder.setMaxHeaderListSize(value);
configBuilder.setMaxHeaderListSize(boundedValue);
} catch (final IllegalArgumentException ex) {
throw new H2ConnectionException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
Expand Down
85 changes: 85 additions & 0 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 @@ -2393,6 +2393,91 @@ void testRemoteHeaderTableSizeChangesRemainLocallyBounded() throws Exception {
}
}


@Test
void testUnsignedHeaderTableSizeSettingAccepted() throws Exception {
final AbstractH2StreamMultiplexer mux = new H2StreamMultiplexerImpl(
protocolIOSession,
FRAME_FACTORY,
StreamIdGenerator.ODD,
httpProcessor,
CharCodingConfig.DEFAULT,
H2Config.custom().build(),
h2StreamListener,
() -> streamHandler);
try {
final ByteBuffer payload = ByteBuffer.allocate(6);
payload.putShort((short) H2Param.HEADER_TABLE_SIZE.getCode());
payload.putInt(-1); // 0xffffffff
payload.flip();

final RawFrame settingsFrame =
new RawFrame(FrameType.SETTINGS.getValue(), 0, 0, payload);

Assertions.assertDoesNotThrow(
() -> mux.onInput(ByteBuffer.wrap(encodeFrame(settingsFrame))));
Assertions.assertEquals(
H2Config.INIT.getHeaderTableSize(),
getHPackEncoder(mux).getMaxTableSize());
} finally {
mux.close();
}
}

@Test
void testUnsignedMaxConcurrentStreamsSettingAccepted() throws Exception {
final AbstractH2StreamMultiplexer mux = new H2StreamMultiplexerImpl(
protocolIOSession,
FRAME_FACTORY,
StreamIdGenerator.ODD,
httpProcessor,
CharCodingConfig.DEFAULT,
H2Config.custom().build(),
h2StreamListener,
() -> streamHandler);
try {
final ByteBuffer payload = ByteBuffer.allocate(6);
payload.putShort((short) H2Param.MAX_CONCURRENT_STREAMS.getCode());
payload.putInt(Integer.MIN_VALUE); // 0x80000000
payload.flip();

final RawFrame settingsFrame =
new RawFrame(FrameType.SETTINGS.getValue(), 0, 0, payload);

Assertions.assertDoesNotThrow(
() -> mux.onInput(ByteBuffer.wrap(encodeFrame(settingsFrame))));
} finally {
mux.close();
}
}

@Test
void testUnsignedMaxHeaderListSizeSettingAccepted() throws Exception {
final AbstractH2StreamMultiplexer mux = new H2StreamMultiplexerImpl(
protocolIOSession,
FRAME_FACTORY,
StreamIdGenerator.ODD,
httpProcessor,
CharCodingConfig.DEFAULT,
H2Config.custom().build(),
h2StreamListener,
() -> streamHandler);
try {
final ByteBuffer payload = ByteBuffer.allocate(6);
payload.putShort((short) H2Param.MAX_HEADER_LIST_SIZE.getCode());
payload.putInt(-1); // 0xffffffff
payload.flip();

final RawFrame settingsFrame =
new RawFrame(FrameType.SETTINGS.getValue(), 0, 0, payload);

Assertions.assertDoesNotThrow(
() -> mux.onInput(ByteBuffer.wrap(encodeFrame(settingsFrame))));
} finally {
mux.close();
}
}

private static HPackEncoder getHPackEncoder(final AbstractH2StreamMultiplexer multiplexer) throws Exception {
final Field field = AbstractH2StreamMultiplexer.class.getDeclaredField("hPackEncoder");
field.setAccessible(true);
Expand Down
Loading