You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ab...@apache.org on 2026/02/24 10:19:06 UTC
(httpcomponents-core) branch master updated: HTTP/2: validate HEADERS PRIORITY payload length (#635)
This is an automated email from the ASF dual-hosted git repository.
abernal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
The following commit(s) were added to refs/heads/master by this push:
new 31a846aa8 HTTP/2: validate HEADERS PRIORITY payload length (#635)
31a846aa8 is described below
commit 31a846aa8c141dd03c11c46b809a3171a3bd1b6a
Author: Arturo Bernal <ab...@apache.org>
AuthorDate: Tue Feb 24 10:19:00 2026 +0000
HTTP/2: validate HEADERS PRIORITY payload length (#635)
Reject incoming HEADERS frames with the PRIORITY flag set but without the
mandatory 5-byte priority fields, mapping the condition to a
FRAME_SIZE_ERROR instead of allowing a BufferUnderflowException.
---
.../impl/nio/AbstractH2StreamMultiplexer.java | 3 +++
.../impl/nio/TestAbstractH2StreamMultiplexer.java | 26 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java
index 3bb73c7b1..fb9a07795 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java
@@ -1172,6 +1172,9 @@ private void consumeHeaderFrame(final RawFrame frame, final H2Stream stream) thr
}
final ByteBuffer payload = frame.getPayloadContent();
if (frame.isFlagSet(FrameFlag.PRIORITY)) {
+ if (payload == null || payload.remaining() < 5) {
+ throw new H2ConnectionException(H2Error.FRAME_SIZE_ERROR, "Invalid HEADERS priority payload");
+ }
payload.getInt();
payload.get();
}
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestAbstractH2StreamMultiplexer.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestAbstractH2StreamMultiplexer.java
index 58160ae45..5bb59e541 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestAbstractH2StreamMultiplexer.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestAbstractH2StreamMultiplexer.java
@@ -1863,4 +1863,30 @@ void testWindowUpdateZeroIncrementOnStreamIsStreamError() throws Exception {
Assertions.assertEquals(H2Error.PROTOCOL_ERROR, H2Error.getByCode(((H2StreamResetException) cause).getCode()));
}
+ @Test
+ void testHeadersWithPriorityFlagAndShortPayloadRejected() throws Exception {
+ final AbstractH2StreamMultiplexer mux = new H2StreamMultiplexerImpl(
+ protocolIOSession,
+ FRAME_FACTORY,
+ StreamIdGenerator.ODD,
+ httpProcessor,
+ CharCodingConfig.DEFAULT,
+ H2Config.custom().build(),
+ h2StreamListener,
+ () -> streamHandler);
+
+ final RawFrame headers = new RawFrame(
+ FrameType.HEADERS.getValue(),
+ FrameFlag.PRIORITY.getValue() | FrameFlag.END_HEADERS.getValue(),
+ 2,
+ ByteBuffer.allocate(0));
+
+ final H2ConnectionException ex = Assertions.assertThrows(
+ H2ConnectionException.class,
+ () -> mux.onInput(ByteBuffer.wrap(encodeFrame(headers))));
+
+ Assertions.assertEquals(H2Error.FRAME_SIZE_ERROR, H2Error.getByCode(ex.getCode()));
+ }
+
+
}
\ No newline at end of file