Skip to content

HTTP/2: Correct pushed response message handling #714

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
Open

HTTP/2: Correct pushed response message handling #714

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
17 changes: 17 additions & 0 deletions httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushH2StreamHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.impl.BasicHttpConnectionMetrics;
Expand Down Expand Up @@ -140,6 +141,14 @@ public void consumeHeader(final List<Header> headers, final boolean endStream) t
Asserts.notNull(exchangeHandler, "Exchange handler");

final HttpResponse response = DefaultH2ResponseConverter.INSTANCE.convert(headers);
final int status = response.getCode();

if (status < HttpStatus.SC_SUCCESS) {
if (endStream) {
throw new ProtocolException("Informational response must not set END_STREAM");
}
return;
}

if (MessageSupport.canResponseHaveBody(response)) {
declaredContentLen = MessageSupport.getContentLength(response);
Expand All @@ -161,6 +170,14 @@ public void consumeHeader(final List<Header> headers, final boolean endStream) t
} else {
responseState = MessageState.BODY;
}
} else if (responseState == MessageState.BODY) {
if (!endStream) {
throw new ProtocolException("Trailer headers must set END_STREAM");
}
TrailersValidationSupport.verify(headers);
validateContentLength();
responseState = MessageState.COMPLETE;
exchangeHandler.streamEnd(headers);
} else {
throw new ProtocolException("Unexpected message headers");
}
Expand Down
96 changes: 96 additions & 0 deletions ...e5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestClientPushH2StreamHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,100 @@ void contentLengthInvalidNoBody() throws Exception {
handler.consumeHeader(responseHeaders, true));
}


@Test
void informationalPushResponseBeforeFinalResponseAccepted() throws Exception {
Mockito.when(pushHandlerFactory.create(Mockito.any(), Mockito.any())).thenReturn(pushConsumer);
handler.consumePromise(Arrays.asList(
new BasicHeader(":method", "GET"),
new BasicHeader(":scheme", "https"),
new BasicHeader(":authority", "example.com"),
new BasicHeader(":path", "/")));

handler.consumeHeader(Arrays.asList(
new BasicHeader(":status", "103")), false);

Mockito.verify(pushConsumer, Mockito.never()).consumePromise(
Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());

handler.consumeHeader(Arrays.asList(
new BasicHeader(":status", "200")), true);

Mockito.verify(pushConsumer).consumePromise(
Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
Mockito.verify(pushConsumer).streamEnd(null);
}

@Test
void informationalPushResponseWithEndStreamRejected() throws Exception {
Mockito.when(pushHandlerFactory.create(Mockito.any(), Mockito.any())).thenReturn(pushConsumer);
handler.consumePromise(Arrays.asList(
new BasicHeader(":method", "GET"),
new BasicHeader(":scheme", "https"),
new BasicHeader(":authority", "example.com"),
new BasicHeader(":path", "/")));

Assertions.assertThrows(ProtocolException.class, () ->
handler.consumeHeader(Arrays.asList(
new BasicHeader(":status", "103")), true));
}

@Test
void pushResponseTrailersAccepted() throws Exception {
Mockito.when(pushHandlerFactory.create(Mockito.any(), Mockito.any())).thenReturn(pushConsumer);
handler.consumePromise(Arrays.asList(
new BasicHeader(":method", "GET"),
new BasicHeader(":scheme", "https"),
new BasicHeader(":authority", "example.com"),
new BasicHeader(":path", "/")));

handler.consumeHeader(Arrays.asList(
new BasicHeader(":status", "200"),
new BasicHeader("content-length", "2")), false);
handler.consumeData(ByteBuffer.wrap(new byte[] { 0, 1 }), false);

final List<Header> trailers = Arrays.asList(
new BasicHeader("x-checksum", "abc123"));
handler.consumeHeader(trailers, true);

Mockito.verify(pushConsumer).streamEnd(trailers);
}

@Test
void pushResponseTrailersWithoutEndStreamRejected() throws Exception {
Mockito.when(pushHandlerFactory.create(Mockito.any(), Mockito.any())).thenReturn(pushConsumer);
handler.consumePromise(Arrays.asList(
new BasicHeader(":method", "GET"),
new BasicHeader(":scheme", "https"),
new BasicHeader(":authority", "example.com"),
new BasicHeader(":path", "/")));

handler.consumeHeader(Arrays.asList(
new BasicHeader(":status", "200")), false);

Assertions.assertThrows(ProtocolException.class, () ->
handler.consumeHeader(Arrays.asList(
new BasicHeader("x-checksum", "abc123")), false));
}

@Test
void pushResponseContentLengthMismatchWithTrailersRejected() throws Exception {
Mockito.when(pushHandlerFactory.create(Mockito.any(), Mockito.any())).thenReturn(pushConsumer);
handler.consumePromise(Arrays.asList(
new BasicHeader(":method", "GET"),
new BasicHeader(":scheme", "https"),
new BasicHeader(":authority", "example.com"),
new BasicHeader(":path", "/")));

handler.consumeHeader(Arrays.asList(
new BasicHeader(":status", "200"),
new BasicHeader("content-length", "3")), false);
handler.consumeData(ByteBuffer.wrap(new byte[] { 0, 1 }), false);

Assertions.assertThrows(ProtocolException.class, () ->
handler.consumeHeader(Arrays.asList(
new BasicHeader("x-checksum", "abc123")), true));
}


}
Loading