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

Fix HTTP version and Host header in HttpProxyHandler

Browse Source 
Motivation:

  The current implementation does not comply with RFC2817 on two points:

  - The HTTP version required to support the CONNECT method is 1.1,
    but the current implementation specifies 1.0.

  - The HOST header should hold the name or address of the Target Host,
    but the current implementation uses the proxy address instead.

Modifications:

  - Specify HTTP version 1.1,
  - The HOST header is now set using the Target Host's name (or address,
    if it is resolved).

Result:

  The CONNECT request is RFC2817-compliant.
This commit is contained in:
Franck Chevassu 2016-06-22 13:58:14 +02:00 committed by Norman Maurer
parent b4d4c0034d
commit f52b07dede
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
handler-proxy/src/main/java/io/netty/handler/proxy/HttpProxyHandler.java
View File

@ -119,16 +119,13 @@ public final class HttpProxyHandler extends ProxyHandler {
rhost = raddr.getAddress().getHostAddress(); rhost = raddr.getAddress().getHostAddress();
} }
final String host = rhost + ':' + raddr.getPort();
FullHttpRequest req = new DefaultFullHttpRequest( FullHttpRequest req = new DefaultFullHttpRequest(
HttpVersion.HTTP_1_0, HttpMethod.CONNECT, HttpVersion.HTTP_1_1, HttpMethod.CONNECT,
rhost + ':' + raddr.getPort(), host,
Unpooled.EMPTY_BUFFER, false); Unpooled.EMPTY_BUFFER, false);
SocketAddress proxyAddress = proxyAddress(); req.headers().set(HttpHeaderNames.HOST, host);
if (proxyAddress instanceof InetSocketAddress) {
InetSocketAddress hostAddr = (InetSocketAddress) proxyAddress;
req.headers().set(HttpHeaderNames.HOST, hostAddr.getHostString() + ':' + hostAddr.getPort());
}
if (authorization != null) { if (authorization != null) {
req.headers().set(HttpHeaderNames.PROXY_AUTHORIZATION, authorization); req.headers().set(HttpHeaderNames.PROXY_AUTHORIZATION, authorization);