HTTPCLIENT-2242: RoutingSupport fails to copy InetAddress when normalizing HttpHost

ok2c · ok2c · commit 16b2cf467dec · 2022-11-06T11:18:15.000+01:00
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/routing/RoutingSupport.java b/httpclient5/src/main/java/org/apache/hc/client5/http/routing/RoutingSupport.java
@@ -73,7 +73,7 @@ public static HttpHost normalize(final HttpHost host, final SchemePortResolver s
         if (host.getPort() < 0) {
             final int port = (schemePortResolver != null ? schemePortResolver: DefaultSchemePortResolver.INSTANCE).resolve(host);
             if (port > 0) {
-                return new HttpHost(host.getSchemeName(), host.getHostName(), port);
+                return new HttpHost(host.getSchemeName(), host.getAddress(), host.getHostName(), port);
             }
         }
         return host;
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRoutingSupport.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRoutingSupport.java
@@ -29,8 +29,10 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.net.InetAddress;
 import java.net.URI;
 
+import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
 import org.apache.hc.client5.http.routing.RoutingSupport;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -62,4 +64,24 @@ public void testDetermineHostMissingScheme() throws Exception {
                 RoutingSupport.determineHost(request1));
     }
 
+    @Test
+    public void testNormalizeHost() throws Exception {
+        Assertions.assertEquals(new HttpHost("http", "somehost", 80),
+                RoutingSupport.normalize(
+                        new HttpHost("http", "somehost", -1),
+                        DefaultSchemePortResolver.INSTANCE));
+        Assertions.assertEquals(new HttpHost("https", "somehost", 443),
+                RoutingSupport.normalize(
+                        new HttpHost("https", "somehost", -1),
+                        DefaultSchemePortResolver.INSTANCE));
+        Assertions.assertEquals(new HttpHost("http", InetAddress.getLocalHost(), "localhost", 80),
+                RoutingSupport.normalize(
+                        new HttpHost("http", InetAddress.getLocalHost(), "localhost", -1),
+                        DefaultSchemePortResolver.INSTANCE));
+        Assertions.assertEquals(new HttpHost("http", "somehost", 8080),
+                RoutingSupport.normalize(
+                        new HttpHost("http", "somehost", 8080),
+                        DefaultSchemePortResolver.INSTANCE));
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public static HttpHost normalize(final HttpHost host, final SchemePortResolver s`
`73`	`73`	`if (host.getPort() < 0) {`
`74`	`74`	`final int port = (schemePortResolver != null ? schemePortResolver: DefaultSchemePortResolver.INSTANCE).resolve(host);`
`75`	`75`	`if (port > 0) {`
`76`		`- return new HttpHost(host.getSchemeName(), host.getHostName(), port);`
	`76`	`+ return new HttpHost(host.getSchemeName(), host.getAddress(), host.getHostName(), port);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`return host;`