-
Notifications
You must be signed in to change notification settings - Fork 563
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HTTP2-Settings needs to be encoded/decoded to Base64 with url dialect #…
…8399 (#8845) (#8853) Signed-off-by: Daniel Kec <daniel.kec@oracle.com> Co-authored-by: Daniel Kec <daniel.kec@oracle.com>
- Loading branch information
Showing
4 changed files
with
133 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
webserver/http2/src/test/java/io/helidon/webserver/http2/UpgradeSettingsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * Copyright (c) 2024 Oracle and/or its affiliates. | ||
| * | ||
| * Licensed 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.helidon.webserver.http2; | ||
|
|
||
| import java.util.Base64; | ||
|
|
||
| import io.helidon.common.buffers.BufferData; | ||
| import io.helidon.common.buffers.DataWriter; | ||
| import io.helidon.http.HeaderValues; | ||
| import io.helidon.http.HttpPrologue; | ||
| import io.helidon.http.Method; | ||
| import io.helidon.http.WritableHeaders; | ||
| import io.helidon.http.http2.Http2Flag; | ||
| import io.helidon.http.http2.Http2Settings; | ||
| import io.helidon.webserver.ConnectionContext; | ||
| import io.helidon.webserver.ListenerContext; | ||
| import io.helidon.webserver.Router; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static io.helidon.http.http2.Http2Setting.ENABLE_PUSH; | ||
| import static io.helidon.http.http2.Http2Setting.HEADER_TABLE_SIZE; | ||
| import static io.helidon.http.http2.Http2Setting.INITIAL_WINDOW_SIZE; | ||
| import static io.helidon.http.http2.Http2Setting.MAX_CONCURRENT_STREAMS; | ||
| import static io.helidon.http.http2.Http2Setting.MAX_FRAME_SIZE; | ||
| import static io.helidon.http.http2.Http2Setting.MAX_HEADER_LIST_SIZE; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| class UpgradeSettingsTest { | ||
|
|
||
| static final long MAX_UNSIGNED_INT = 0xFFFFFFFFL; | ||
|
|
||
| private final ConnectionContext ctx; | ||
| private final HttpPrologue prologue; | ||
|
|
||
| public UpgradeSettingsTest() { | ||
| ctx = mock(ConnectionContext.class); | ||
| prologue = HttpPrologue.create("http/1.1", | ||
| "http", | ||
| "1.1", | ||
| Method.GET, | ||
| "/resource.txt", | ||
| false); | ||
| DataWriter dataWriter = mock(DataWriter.class); | ||
| when(ctx.router()).thenReturn(Router.empty()); | ||
| when(ctx.listenerContext()).thenReturn(mock(ListenerContext.class)); | ||
| when(ctx.dataWriter()).thenReturn(dataWriter); | ||
| } | ||
|
|
||
| @Test | ||
| void urlEncodedSettingsGH8399() { | ||
| Http2Settings s = upgrade("AAEAABAAAAIAAAABAAN_____AAQAAP__AAUAAEAAAAYAACAA"); | ||
| assertThat(s.presentValue(HEADER_TABLE_SIZE).orElseThrow(), is(4096L)); | ||
| assertThat(s.presentValue(ENABLE_PUSH).orElseThrow(), is(true)); | ||
| assertThat(s.presentValue(MAX_CONCURRENT_STREAMS).orElseThrow(), is(MAX_UNSIGNED_INT / 2)); | ||
| assertThat(s.presentValue(INITIAL_WINDOW_SIZE).orElseThrow(), is(65_535L)); | ||
| assertThat(s.presentValue(MAX_FRAME_SIZE).orElseThrow(), is(16_384L)); | ||
| assertThat(s.presentValue(MAX_HEADER_LIST_SIZE).orElseThrow(), is(8192L)); | ||
| } | ||
|
|
||
| @Test | ||
| void urlEncodedSettings() { | ||
| Http2Settings settings2 = Http2Settings.builder() | ||
| .add(HEADER_TABLE_SIZE, 4096L) | ||
| .add(ENABLE_PUSH, false) | ||
| .add(MAX_CONCURRENT_STREAMS, MAX_UNSIGNED_INT - 5) | ||
| .add(INITIAL_WINDOW_SIZE, 65535L) | ||
| .add(MAX_FRAME_SIZE, 16384L) | ||
| .add(MAX_HEADER_LIST_SIZE, 256L) | ||
| .build(); | ||
| String encSett = Base64.getUrlEncoder().encodeToString(settingsToBytes(settings2)); | ||
| Http2Settings s = upgrade(encSett); | ||
| assertThat(s.presentValue(MAX_CONCURRENT_STREAMS).orElseThrow(), is(MAX_UNSIGNED_INT - 5)); | ||
| assertThat(s.presentValue(MAX_HEADER_LIST_SIZE).orElseThrow(), is(256L)); | ||
| } | ||
|
|
||
| Http2Settings upgrade(String http2Settings) { | ||
| WritableHeaders<?> headers = WritableHeaders.create().add(HeaderValues.create("HTTP2-Settings", http2Settings)); | ||
| Http2Upgrader http2Upgrader = Http2Upgrader.create(Http2Config.create()); | ||
| Http2Connection connection = (Http2Connection) http2Upgrader.upgrade(ctx, prologue, headers); | ||
| return connection.clientSettings(); | ||
| } | ||
|
|
||
| byte[] settingsToBytes(Http2Settings settings) { | ||
| BufferData settingsFrameData = | ||
| settings.toFrameData(null, 0, Http2Flag.SettingsFlags.create(0)).data(); | ||
| byte[] b = new byte[settingsFrameData.available()]; | ||
| settingsFrameData.read(b); | ||
| return b; | ||
| } | ||
| } |