fix: support custom host header on request proto change (#237)

monkeyWie · Oct 27, 2022 · b3fd35e · b3fd35e
1 parent df84eff
commit b3fd35e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 28 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Proxyee is a JAVA written HTTP proxy server library that supports HTTP, HTTPS, W
 <dependency>
     <groupId>com.github.monkeywie</groupId>
     <artifactId>proxyee</artifactId>
-    <version>1.6.9</version>
+    <version>1.7.0</version>
 </dependency>
 ```
 

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -25,7 +25,7 @@ Proxyee 是一个 JAVA 编写的 HTTP 代理服务器类库，支持 HTTP、HTTP
 <dependency>
     <groupId>com.github.monkeywie</groupId>
     <artifactId>proxyee</artifactId>
-    <version>1.6.9</version>
+    <version>1.7.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.monkeywie</groupId>
     <artifactId>proxyee</artifactId>
-    <version>1.6.9</version>
+    <version>1.7.0</version>
 
     <packaging>jar</packaging>
 

diff --git a/src/main/java/com/github/monkeywie/proxyee/handler/HttpProxyServerHandler.java b/src/main/java/com/github/monkeywie/proxyee/handler/HttpProxyServerHandler.java
@@ -287,13 +287,6 @@ private void handleProxyData(Channel channel, Object msg, boolean isHttp) throws
             RequestProto newRP = ProtoUtil.getRequestProto(httpRequest);
             if (!newRP.equals(pipeRp)) {
                 isChangeRp = true;
-                // 更新Host请求头
-                if ((pipeRp.getSsl() && pipeRp.getPort() == 443)
-                        || (!pipeRp.getSsl() && pipeRp.getPort() == 80)) {
-                    httpRequest.headers().set(HttpHeaderNames.HOST, pipeRp.getHost());
-                } else {
-                    httpRequest.headers().set(HttpHeaderNames.HOST, pipeRp.getHost() + ":" + pipeRp.getPort());
-                }
             }
         }
 

diff --git a/src/test/java/com/github/monkeywie/proxyee/InterceptForwardHttpProxyServer.java b/src/test/java/com/github/monkeywie/proxyee/InterceptForwardHttpProxyServer.java
@@ -8,6 +8,7 @@
 import com.github.monkeywie.proxyee.server.HttpProxyServerConfig;
 import com.github.monkeywie.proxyee.util.HttpUtil;
 import io.netty.channel.Channel;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpRequest;
 
 /**
@@ -37,6 +38,7 @@ public void beforeRequest(Channel clientChannel, HttpRequest httpRequest,
                                     pipeline.getRequestProto().setHost("www.taobao.com");
                                     pipeline.getRequestProto().setPort(443);
                                     pipeline.getRequestProto().setSsl(true);
+                                    httpRequest.headers().set(HttpHeaderNames.HOST, "www.taobao.com");
                                 }
                                 pipeline.beforeRequest(clientChannel, httpRequest);
                             }