Match Http2ClientUpgradeCodec to the new upgrade policy
Motivation: We changed Http2ConnectionHandler to expect the upgrade method to be called *after* we send the preface (ie add the handler to the pipeline) but we forgot to change the Http2ClientUpgradeCodec to match the new policy. This meant that client-side h2c upgrades failed. Modifications: Reverse sending the preface and calling the upgrade method to match the new policy. Result: Clients can initiate h2c upgrades successfully.
This commit is contained in:
parent
70c5c48eab
commit
1ff2e1fb5d
@ -100,11 +100,11 @@ public class Http2ClientUpgradeCodec implements HttpClientUpgradeHandler.Upgrade
|
|||||||
@Override
|
@Override
|
||||||
public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse)
|
public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse)
|
||||||
throws Exception {
|
throws Exception {
|
||||||
// Reserve local stream 1 for the response.
|
|
||||||
connectionHandler.onHttpClientUpgrade();
|
|
||||||
|
|
||||||
// Add the handler to the pipeline.
|
// Add the handler to the pipeline.
|
||||||
ctx.pipeline().addAfter(ctx.name(), handlerName, upgradeToHandler);
|
ctx.pipeline().addAfter(ctx.name(), handlerName, upgradeToHandler);
|
||||||
|
|
||||||
|
// Reserve local stream 1 for the response.
|
||||||
|
connectionHandler.onHttpClientUpgrade();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* 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.channel.ChannelHandler;
|
||||||
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
import io.netty.channel.ChannelInboundHandlerAdapter;
|
||||||
|
import io.netty.channel.embedded.EmbeddedChannel;
|
||||||
|
import io.netty.handler.codec.http.DefaultFullHttpRequest;
|
||||||
|
import io.netty.handler.codec.http.FullHttpRequest;
|
||||||
|
import io.netty.handler.codec.http.HttpMethod;
|
||||||
|
import io.netty.handler.codec.http.HttpVersion;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class Http2ClientUpgradeCodecTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpgradeToHttp2ConnectionHandler() throws Exception {
|
||||||
|
testUpgrade(new Http2ConnectionHandlerBuilder().server(false).frameListener(new Http2FrameAdapter()).build());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpgradeToHttp2FrameCodec() throws Exception {
|
||||||
|
testUpgrade(Http2FrameCodecBuilder.forClient().build());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpgradeToHttp2MultiplexCodec() throws Exception {
|
||||||
|
testUpgrade(Http2MultiplexCodecBuilder.forClient(new HttpInboundHandler()).build());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testUpgrade(Http2ConnectionHandler handler) throws Exception {
|
||||||
|
FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.OPTIONS, "*");
|
||||||
|
|
||||||
|
EmbeddedChannel channel = new EmbeddedChannel(new ChannelInboundHandlerAdapter());
|
||||||
|
ChannelHandlerContext ctx = channel.pipeline().firstContext();
|
||||||
|
Http2ClientUpgradeCodec codec = new Http2ClientUpgradeCodec("connectionHandler", handler);
|
||||||
|
codec.setUpgradeHeaders(ctx, request);
|
||||||
|
// Flush the channel to ensure we write out all buffered data
|
||||||
|
channel.flush();
|
||||||
|
|
||||||
|
codec.upgradeTo(ctx, null);
|
||||||
|
assertNotNull(channel.pipeline().get("connectionHandler"));
|
||||||
|
|
||||||
|
assertTrue(channel.finishAndReleaseAll());
|
||||||
|
}
|
||||||
|
|
||||||
|
@ChannelHandler.Sharable
|
||||||
|
private static final class HttpInboundHandler extends ChannelInboundHandlerAdapter { }
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user