540c26bb56
Motivation: The responsibility for retaining the settings values and enforcing the settings constraints is spread out in different areas of the code and may be initialized with different values than the default specified in the RFC. This should not be allowed by default and interfaces which are responsible for maintaining/enforcing settings state should clearly indicate the restrictions that they should only be set by the codec upon receipt of a SETTINGS ACK frame. Modifications: - Encoder, Decoder, and the Headers Encoder/Decoder no longer expose public constructors that allow the default settings to be changed. - Http2HeadersDecoder#maxHeaderSize() exists to provide some bound when headers/continuation frames are being aggregated. However this is roughly the same as SETTINGS_MAX_HEADER_LIST_SIZE (besides the 32 byte octet for each header field) and can be used instead of attempting to keep the two independent values in sync. - Encoding headers now enforces SETTINGS_MAX_HEADER_LIST_SIZE at the octect level. Previously the header encoder compared the number of header key/value pairs against SETTINGS_MAX_HEADER_LIST_SIZE instead of the number of octets (plus 32 bytes overhead). - DefaultHttp2ConnectionDecoder#onData calls shouldIgnoreHeadersOrDataFrame but may swallow exceptions from this method. This means a STREAM_RST frame may not be sent when it should for an unknown stream and thus violate the RFC. The exception is no longer swallowed. Result: Default settings state is enforced and interfaces related to settings state are clarified.
107 lines
3.6 KiB
Java
107 lines
3.6 KiB
Java
/*
|
|
* Copyright 2014 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 org.junit.Before;
|
|
import org.junit.Test;
|
|
|
|
import static io.netty.handler.codec.http2.Http2CodecUtil.MAX_FRAME_SIZE_UPPER_BOUND;
|
|
import static io.netty.handler.codec.http2.Http2CodecUtil.MAX_UNSIGNED_INT;
|
|
import static org.junit.Assert.assertEquals;
|
|
import static org.junit.Assert.assertNull;
|
|
import static org.junit.Assert.assertTrue;
|
|
|
|
/**
|
|
* Tests for {@link Http2Settings}.
|
|
*/
|
|
public class Http2SettingsTest {
|
|
|
|
private Http2Settings settings;
|
|
|
|
@Before
|
|
public void setup() {
|
|
settings = new Http2Settings();
|
|
}
|
|
|
|
@Test
|
|
public void standardSettingsShouldBeNotSet() {
|
|
assertEquals(0, settings.size());
|
|
assertNull(settings.headerTableSize());
|
|
assertNull(settings.initialWindowSize());
|
|
assertNull(settings.maxConcurrentStreams());
|
|
assertNull(settings.pushEnabled());
|
|
assertNull(settings.maxFrameSize());
|
|
assertNull(settings.maxHeaderListSize());
|
|
}
|
|
|
|
@Test
|
|
public void standardSettingsShouldBeSet() {
|
|
settings.initialWindowSize(1);
|
|
settings.maxConcurrentStreams(2);
|
|
settings.pushEnabled(true);
|
|
settings.headerTableSize(3);
|
|
settings.maxFrameSize(MAX_FRAME_SIZE_UPPER_BOUND);
|
|
settings.maxHeaderListSize(4);
|
|
assertEquals(1, (int) settings.initialWindowSize());
|
|
assertEquals(2L, (long) settings.maxConcurrentStreams());
|
|
assertTrue(settings.pushEnabled());
|
|
assertEquals(3L, (long) settings.headerTableSize());
|
|
assertEquals(MAX_FRAME_SIZE_UPPER_BOUND, (int) settings.maxFrameSize());
|
|
assertEquals(4L, (long) settings.maxHeaderListSize());
|
|
}
|
|
|
|
@Test
|
|
public void nonStandardSettingsShouldBeSet() {
|
|
char key = 0;
|
|
settings.put(key, (Long) 123L);
|
|
assertEquals(123L, (long) settings.get(key));
|
|
}
|
|
|
|
@Test
|
|
public void settingsShouldSupportUnsignedShort() {
|
|
char key = (char) (Short.MAX_VALUE + 1);
|
|
settings.put(key, (Long) 123L);
|
|
assertEquals(123L, (long) settings.get(key));
|
|
}
|
|
|
|
@Test
|
|
public void headerListSizeUnsignedInt() {
|
|
settings.maxHeaderListSize(MAX_UNSIGNED_INT);
|
|
assertEquals(MAX_UNSIGNED_INT, (long) settings.maxHeaderListSize());
|
|
}
|
|
|
|
@Test(expected = IllegalArgumentException.class)
|
|
public void headerListSizeBoundCheck() {
|
|
settings.maxHeaderListSize(Long.MAX_VALUE);
|
|
}
|
|
|
|
@Test
|
|
public void headerTableSizeUnsignedInt() {
|
|
settings.put(Http2CodecUtil.SETTINGS_HEADER_TABLE_SIZE, (Long) MAX_UNSIGNED_INT);
|
|
assertEquals(MAX_UNSIGNED_INT, (long) settings.get(Http2CodecUtil.SETTINGS_HEADER_TABLE_SIZE));
|
|
}
|
|
|
|
@Test(expected = IllegalArgumentException.class)
|
|
public void headerTableSizeBoundCheck() {
|
|
settings.put(Http2CodecUtil.SETTINGS_HEADER_TABLE_SIZE, (Long) Long.MAX_VALUE);
|
|
}
|
|
|
|
@Test(expected = IllegalArgumentException.class)
|
|
public void headerTableSizeBoundCheck2() {
|
|
settings.put(Http2CodecUtil.SETTINGS_HEADER_TABLE_SIZE, Long.valueOf(-1L));
|
|
}
|
|
}
|