andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix h2spec test 4.3 about invalid header block

Browse Source 
Motivation:

HPackDecoder works on entire header block, we shouldn't encounter
incomplete header fields. If we do we should treat it as
a decoding error and according to the specification:

A decoding error in a header block MUST be treated as
a connection error (Section 5.4.1) of type COMPRESSION_ERROR.

Modifications:

* Check final state in HpackDecoder once we've decoded all the data.

Result:

* Throw a connection error if we receive incomplete header fields
* H2spec 4.3 tests all passes
This commit is contained in:
Julien Hoarau 2018-01-19 06:01:20 +11:00 committed by Scott Mitchell
parent 1740f366eb
commit 61dba95091
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-http2/src/main/java/io/netty/handler/codec/http2/HpackDecoder.java
View File

@ -303,6 +303,10 @@ final class HpackDecoder {
if (headersLength > maxHeaderListSize) {
headerListSizeExceeded(streamId, maxHeaderListSize, true);
}
if (state != READ_HEADER_REPRESENTATION) {
throw connectionError(COMPRESSION_ERROR, "Incomplete header block fragment.");
}
}
/**

13
codec-http2/src/test/java/io/netty/handler/codec/http2/HpackDecoderTest.java
View File

@ -512,4 +512,17 @@ public class HpackDecoderTest {
in.release();
}
}
@Test
public void testIncompleteHeaderFieldRepresentation() throws Http2Exception {
// Incomplete Literal Header Field with Incremental Indexing
byte[] input = {(byte) 0x40};
ByteBuf in = Unpooled.wrappedBuffer(input);
try {
expectedException.expect(Http2Exception.class);
hpackDecoder.decode(0, in, mockHeaders);
} finally {
in.release();
}
}
}

1
testsuite-http2/pom.xml
View File

@ -67,7 +67,6 @@
<excludeSpecs>
<excludeSpec>3.8 - Sends a GOAWAY frame</excludeSpec>
<excludeSpec>4.2 - Sends a dynamic table size update at the end of header block</excludeSpec>
<excludeSpec>4.3 - Sends invalid header block fragment</excludeSpec>
<excludeSpec>5.1 - idle: Sends a DATA frame</excludeSpec>
<excludeSpec>5.1 - closed: Sends a DATA frame</excludeSpec>
<excludeSpec>5.1 - closed: Sends a HEADERS frame</excludeSpec>