andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't replace all 'connection' headers when sending h2c upgrade request (#7824)

Browse Source 
Motivation:

There may be meaningful 'connection' headers that exist on a request
that is used to attempt a HTTP/1.x upgrade request that will be
clobbered.

Modifications:

HttpClientUpgradeHandler uses the `HttpHeaders.add` instead of
`HttpHeaders.set` when adding the 'upgrade' field.

Result:

Fixes #7823, existing 'connection' headers are preserved.
This commit is contained in:
Bryce Anderson 2018-04-01 11:59:30 -06:00 committed by Norman Maurer
parent 602ee5444d
commit 741602050f
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec-http/src/main/java/io/netty/handler/codec/http/HttpClientUpgradeHandler.java
View File

@ -277,6 +277,6 @@ public class HttpClientUpgradeHandler extends HttpObjectAggregator implements Ch
builder.append(','); builder.append(',');
} }
builder.append(HttpHeaderValues.UPGRADE); builder.append(HttpHeaderValues.UPGRADE);
request.headers().set(HttpHeaderNames.CONNECTION, builder.toString()); request.headers().add(HttpHeaderNames.CONNECTION, builder.toString());
} }
} }

22
codec-http/src/test/java/io/netty/handler/codec/http/HttpClientUpgradeHandlerTest.java
View File

@ -21,6 +21,7 @@ import io.netty.channel.embedded.EmbeddedChannel;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import org.junit.Test; import org.junit.Test;
@ -174,4 +175,25 @@ public class HttpClientUpgradeHandlerTest {
assertEquals(HttpResponseStatus.OK, response.status()); assertEquals(HttpResponseStatus.OK, response.status());
assertFalse(channel.finish()); assertFalse(channel.finish());
} }
@Test
public void dontStripConnectionHeaders() {
HttpClientUpgradeHandler.SourceCodec sourceCodec = new FakeSourceCodec();
HttpClientUpgradeHandler.UpgradeCodec upgradeCodec = new FakeUpgradeCodec();
HttpClientUpgradeHandler handler = new HttpClientUpgradeHandler(sourceCodec, upgradeCodec, 1024);
UserEventCatcher catcher = new UserEventCatcher();
EmbeddedChannel channel = new EmbeddedChannel(catcher);
channel.pipeline().addFirst("upgrade", handler);
DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "netty.io");
request.headers().add("connection", "extra");
request.headers().add("extra", "value");
assertTrue(channel.writeOutbound(request));
FullHttpRequest readRequest = channel.readOutbound();
List<String> connectionHeaders = readRequest.headers().getAll("connection");
assertTrue(connectionHeaders.contains("extra"));
assertTrue(readRequest.release());
assertFalse(channel.finish());
}
} }