Skip to content

Treat interleaved non-CONTINUATION frame on same stream as PROTOCOL_ERROR #1132

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: main
Choose a base branch
from
Open

Treat interleaved non-CONTINUATION frame on same stream as PROTOCOL_ERROR #1132

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
2 changes: 1 addition & 1 deletion java/org/apache/coyote/http2/Http2Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ protected void validateFrame(FrameType expected, FrameType frameType, int stream
// NO-OP: RST is OK here
} else if (frameType != FrameType.CONTINUATION) {
throw new ConnectionException(sm.getString("http2Parser.headers.wrongFrameType", connectionId,
Integer.toString(headersCurrentStream), frameType), Http2Error.COMPRESSION_ERROR);
Integer.toString(headersCurrentStream), frameType), Http2Error.PROTOCOL_ERROR);
}
}

Expand Down
21 changes: 21 additions & 0 deletions test/org/apache/coyote/http2/TestHttp2Section_4_3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,25 @@ public void testHeaderContinuationNonContiguous() throws Exception {

handleGoAwayResponse(3, Http2Error.COMPRESSION_ERROR);
}


@Test
public void testHeaderContinuationInterleavedDataSameStream() throws Exception {
// HTTP2 upgrade
http2Connect();

// Start header block on stream 3 without END_HEADERS
byte[] frameHeader = new byte[9];
ByteBuffer headersPayload = ByteBuffer.allocate(128);
buildSimpleGetRequestPart1(frameHeader, headersPayload, 3);
writeFrame(frameHeader, headersPayload);

// Send a DATA frame on the same stream while the header block is open.
// RFC 9113, section 4.3: any frame other than CONTINUATION interleaved
// in a header block MUST be treated as a connection error of type
// PROTOCOL_ERROR.
sendData(3, new byte[0]);

handleGoAwayResponse(3, Http2Error.PROTOCOL_ERROR);
}
}
Loading