Merge #2712 into 1.1.4

Author: violetagg

reactor-netty-http/src/main/java/reactor/netty/http/server/DefaultHttpForwardedHeaderHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2020-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,8 +89,10 @@ private ConnectionInfo parseXForwardedInfo(ConnectionInfo connectionInfo, HttpRe
 		}
 		String hostHeader = request.headers().get(X_FORWARDED_HOST_HEADER);
 		if (hostHeader != null) {
-			String portHeader = request.headers().get(X_FORWARDED_PORT_HEADER);
 			int port = connectionInfo.getHostAddress().getPort();
+			connectionInfo = connectionInfo.withHostAddress(
+					AddressUtils.parseAddress(hostHeader.split(",", 2)[0].trim(), port, DEFAULT_FORWARDED_HEADER_VALIDATION));
+			String portHeader = request.headers().get(X_FORWARDED_PORT_HEADER);
 			if (portHeader != null && !portHeader.isEmpty()) {
 				String portStr = portHeader.split(",", 2)[0].trim();
 				if (portStr.chars().allMatch(Character::isDigit)) {
@@ -99,9 +101,9 @@ private ConnectionInfo parseXForwardedInfo(ConnectionInfo connectionInfo, HttpRe
 				else if (DEFAULT_FORWARDED_HEADER_VALIDATION) {
 					throw new IllegalArgumentException("Failed to parse a port from " + portHeader);
 				}
+				connectionInfo = connectionInfo.withHostAddress(
+						AddressUtils.createUnresolved(connectionInfo.getHostAddress().getHostString(), port));
 			}
-			connectionInfo = connectionInfo.withHostAddress(
-					AddressUtils.createUnresolved(hostHeader.split(",", 2)[0].trim(), port));
 		}
 		String protoHeader = request.headers().get(X_FORWARDED_PROTO_HEADER);
 		if (protoHeader != null) {

reactor-netty-http/src/test/java/reactor/netty/http/server/ConnectionInfoTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2018-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,6 +126,17 @@ void xForwardedHost() {
 				});
 	}
 
+	@Test
+	void xForwardedHostPortIncluded() {
+		testClientRequest(
+				clientRequestHeaders -> clientRequestHeaders.add("X-Forwarded-Host",
+						"[1abc:2abc:3abc::5ABC:6abc]:9090, 192.168.0.1"),
+				serverRequest -> {
+					Assertions.assertThat(serverRequest.hostAddress().getHostString()).isEqualTo("1abc:2abc:3abc:0:0:0:5abc:6abc");
+					Assertions.assertThat(serverRequest.hostAddress().getPort()).isEqualTo(9090);
+				});
+	}
+
 	@Test
 	void xForwardedHostAndPort() {
 		testClientRequest(
@@ -139,6 +150,19 @@ void xForwardedHostAndPort() {
 				});
 	}
 
+	@Test
+	void xForwardedHostPortIncludedAndXForwardedPort() {
+		testClientRequest(
+				clientRequestHeaders -> {
+					clientRequestHeaders.add("X-Forwarded-Host", "192.168.0.1:9090");
+					clientRequestHeaders.add("X-Forwarded-Port", "8080");
+				},
+				serverRequest -> {
+					Assertions.assertThat(serverRequest.hostAddress().getHostString()).isEqualTo("192.168.0.1");
+					Assertions.assertThat(serverRequest.hostAddress().getPort()).isEqualTo(8080);
+				});
+	}
+
 	@Test
 	void xForwardedMultipleHeaders() {
 		testClientRequest(