88f0586a7e
Motivation: When a sender sends too large of headers it should not unnecessarily kill the connection, as killing the connection is a heavy-handed solution while SETTINGS_MAX_HEADER_LIST_SIZE is advisory and may be ignored. The maxHeaderListSizeGoAway limit in HpackDecoder is unnecessary because any headers causing the list to exceeding the max size can simply be thrown away. In addition, DefaultHttp2FrameReader.HeadersBlockBuilder limits the entire block to maxHeaderListSizeGoAway. Thus individual literals are limited to maxHeaderListSizeGoAway. (Technically, literals are limited to 1.6x maxHeaderListSizeGoAway, since the canonical Huffman code has a maximum compression ratio of .625. However, the "unnecessary" limit in HpackDecoder was also being applied to compressed sizes.) Modifications: Remove maxHeaderListSizeGoAway checking in HpackDecoder and instead eagerly throw away any headers causing the list to exceed maxHeaderListSize. Result: Fewer large header cases will trigger connection-killing. DefaultHttp2FrameReader.HeadersBlockBuilder will still kill the connection when maxHeaderListSizeGoAway is exceeded, however. Fixes #7887
102 lines
3.7 KiB
Java
102 lines
3.7 KiB
Java
/*
|
|
* Copyright 2017 The Netty Project
|
|
*
|
|
* The Netty Project licenses this file to you under the Apache License,
|
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
package io.netty.handler.codec.http2;
|
|
|
|
import io.netty.buffer.ByteBuf;
|
|
import io.netty.buffer.Unpooled;
|
|
import org.junit.Before;
|
|
import org.junit.Test;
|
|
|
|
import static io.netty.handler.codec.http2.Http2CodecUtil.DEFAULT_HEADER_LIST_SIZE;
|
|
import static io.netty.handler.codec.http2.Http2CodecUtil.MAX_HEADER_TABLE_SIZE;
|
|
import static org.junit.Assert.assertEquals;
|
|
import static org.mockito.Mockito.mock;
|
|
|
|
public class HpackEncoderTest {
|
|
private HpackDecoder hpackDecoder;
|
|
private HpackEncoder hpackEncoder;
|
|
private Http2Headers mockHeaders;
|
|
|
|
@Before
|
|
public void setUp() {
|
|
hpackEncoder = new HpackEncoder();
|
|
hpackDecoder = new HpackDecoder(DEFAULT_HEADER_LIST_SIZE, 32);
|
|
mockHeaders = mock(Http2Headers.class);
|
|
}
|
|
|
|
@Test
|
|
public void testSetMaxHeaderTableSizeToMaxValue() throws Http2Exception {
|
|
ByteBuf buf = Unpooled.buffer();
|
|
hpackEncoder.setMaxHeaderTableSize(buf, MAX_HEADER_TABLE_SIZE);
|
|
hpackDecoder.setMaxHeaderTableSize(MAX_HEADER_TABLE_SIZE);
|
|
hpackDecoder.decode(0, buf, mockHeaders, true);
|
|
assertEquals(MAX_HEADER_TABLE_SIZE, hpackDecoder.getMaxHeaderTableSize());
|
|
buf.release();
|
|
}
|
|
|
|
@Test(expected = Http2Exception.class)
|
|
public void testSetMaxHeaderTableSizeOverflow() throws Http2Exception {
|
|
ByteBuf buf = Unpooled.buffer();
|
|
try {
|
|
hpackEncoder.setMaxHeaderTableSize(buf, MAX_HEADER_TABLE_SIZE + 1);
|
|
} finally {
|
|
buf.release();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The encoder should not impose an arbitrary limit on the header size if
|
|
* the server has not specified any limit.
|
|
* @throws Http2Exception
|
|
*/
|
|
@Test
|
|
public void testWillEncode16MBHeaderByDefault() throws Http2Exception {
|
|
ByteBuf buf = Unpooled.buffer();
|
|
String bigHeaderName = "x-big-header";
|
|
int bigHeaderSize = 1024 * 1024 * 16;
|
|
String bigHeaderVal = new String(new char[bigHeaderSize]).replace('\0', 'X');
|
|
Http2Headers headersIn = new DefaultHttp2Headers().add(
|
|
"x-big-header", bigHeaderVal);
|
|
Http2Headers headersOut = new DefaultHttp2Headers();
|
|
|
|
try {
|
|
hpackEncoder.encodeHeaders(0, buf, headersIn, Http2HeadersEncoder.NEVER_SENSITIVE);
|
|
hpackDecoder.setMaxHeaderListSize(bigHeaderSize + 1024);
|
|
hpackDecoder.decode(0, buf, headersOut, false);
|
|
} finally {
|
|
buf.release();
|
|
}
|
|
assertEquals(headersOut.get(bigHeaderName).toString(), bigHeaderVal);
|
|
}
|
|
|
|
@Test(expected = Http2Exception.class)
|
|
public void testSetMaxHeaderListSizeEnforcedAfterSet() throws Http2Exception {
|
|
ByteBuf buf = Unpooled.buffer();
|
|
Http2Headers headers = new DefaultHttp2Headers().add(
|
|
"x-big-header",
|
|
new String(new char[1024 * 16]).replace('\0', 'X')
|
|
);
|
|
|
|
hpackEncoder.setMaxHeaderListSize(1000);
|
|
|
|
try {
|
|
hpackEncoder.encodeHeaders(0, buf, headers, Http2HeadersEncoder.NEVER_SENSITIVE);
|
|
} finally {
|
|
buf.release();
|
|
}
|
|
}
|
|
}
|