Skip to content

TTP/2: validate pseudo-headers in inbound request trailers #637

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

Merged
arturobernalg merged 1 commit into from
Feb 24, 2026
Merged

TTP/2: validate pseudo-headers in inbound request trailers #637

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
11 changes: 10 additions & 1 deletion httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerH2StreamHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,16 @@ public void consumeHeader(final List<Header> headers, final boolean endStream) t
}
break;
case BODY:
responseState.set(MessageState.COMPLETE);
if (!endStream) {
throw new H2StreamResetException(H2Error.PROTOCOL_ERROR, "Trailer headers must set END_STREAM");
}
try {
TrailersValidationSupport.verify(headers);
} catch (final ProtocolException ex) {
throw new H2StreamResetException(H2Error.PROTOCOL_ERROR, ex.getMessage());
Comment thread
ok2c marked this conversation as resolved.
}
requestState.set(MessageState.COMPLETE);
Asserts.notNull(exchangeHandler, "Exchange handler");
exchangeHandler.streamEnd(headers);
break;
default:
Expand Down
67 changes: 67 additions & 0 deletions httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/TestServerH2StreamHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,24 @@
package org.apache.hc.core5.http2.impl.nio;

import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.impl.BasicHttpConnectionMetrics;
import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics;
import org.apache.hc.core5.http.message.BasicHeader;
import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler;
import org.apache.hc.core5.http.nio.HandlerFactory;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http2.H2Error;
import org.apache.hc.core5.http2.H2StreamResetException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;

class TestServerH2StreamHandler {
Expand Down Expand Up @@ -81,4 +89,63 @@ void toStringIncludesStates() {
Assertions.assertTrue(text.contains("responseState"));
}

@Test
void consumeTrailersWithPseudoHeaderRejected() throws Exception {
final H2StreamChannel channel = Mockito.mock(H2StreamChannel.class);
final HttpProcessor httpProcessor = Mockito.mock(HttpProcessor.class);
final BasicHttpConnectionMetrics metrics = new BasicHttpConnectionMetrics(
new BasicHttpTransportMetrics(), new BasicHttpTransportMetrics());
final AsyncServerExchangeHandler exchangeHandler = Mockito.mock(AsyncServerExchangeHandler.class);
@SuppressWarnings("unchecked")
final HandlerFactory<AsyncServerExchangeHandler> exchangeHandlerFactory =
(HandlerFactory<AsyncServerExchangeHandler>) Mockito.mock(HandlerFactory.class);
Mockito.when(exchangeHandlerFactory.create(ArgumentMatchers.any(), ArgumentMatchers.any()))
.thenReturn(exchangeHandler);

final ServerH2StreamHandler handler = new ServerH2StreamHandler(
channel, httpProcessor, metrics, exchangeHandlerFactory, HttpCoreContext.create());

final List<Header> requestHeaders = Arrays.asList(
new BasicHeader(":method", "POST"),
new BasicHeader(":scheme", "https"),
new BasicHeader(":authority", "example.test"),
new BasicHeader(":path", "/upload"));
handler.consumeHeader(requestHeaders, false);

final List<Header> trailers = Collections.singletonList(new BasicHeader(":status", "200"));
Assertions.assertThrows(H2StreamResetException.class, () -> handler.consumeHeader(trailers, true));
Mockito.verify(exchangeHandler, Mockito.never()).streamEnd(ArgumentMatchers.anyList());
}

@Test
void consumeTrailersWithoutEndStreamRejected() throws Exception {
final H2StreamChannel channel = Mockito.mock(H2StreamChannel.class);
final HttpProcessor httpProcessor = Mockito.mock(HttpProcessor.class);
final BasicHttpConnectionMetrics metrics = new BasicHttpConnectionMetrics(
new BasicHttpTransportMetrics(), new BasicHttpTransportMetrics());
final AsyncServerExchangeHandler exchangeHandler = Mockito.mock(AsyncServerExchangeHandler.class);
@SuppressWarnings("unchecked")
final HandlerFactory<AsyncServerExchangeHandler> exchangeHandlerFactory =
(HandlerFactory<AsyncServerExchangeHandler>) Mockito.mock(HandlerFactory.class);
Mockito.when(exchangeHandlerFactory.create(ArgumentMatchers.any(), ArgumentMatchers.any()))
.thenReturn(exchangeHandler);

final ServerH2StreamHandler handler = new ServerH2StreamHandler(
channel, httpProcessor, metrics, exchangeHandlerFactory, HttpCoreContext.create());

final List<Header> requestHeaders = Arrays.asList(
new BasicHeader(":method", "POST"),
new BasicHeader(":scheme", "https"),
new BasicHeader(":authority", "example.test"),
new BasicHeader(":path", "/upload"));
handler.consumeHeader(requestHeaders, false);

final List<Header> trailers = Collections.singletonList(new BasicHeader("x-checksum", "abc123"));
final H2StreamResetException ex = Assertions.assertThrows(
H2StreamResetException.class,
() -> handler.consumeHeader(trailers, false));
Assertions.assertEquals(H2Error.PROTOCOL_ERROR, H2Error.getByCode(ex.getCode()));
Mockito.verify(exchangeHandler, Mockito.never()).streamEnd(ArgumentMatchers.anyList());
}

}
Loading