Only append port to forwarded header in not already there.

spencergibb · spencergibb · commit b504042ca46b · 2025-10-23T22:22:31.000-04:00
diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/ForwardedRequestHeadersFilter.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/ForwardedRequestHeadersFilter.java
@@ -162,7 +162,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest request) {
 				return;
 			}
 			int port = remoteAddress.getPort();
-			if (port >= 0) {
+			if (port >= 0 && !forValue.endsWith(":" + port)) {
 				forValue = forValue + ":" + port;
 			}
 			forwarded.put("for", forValue);

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest request) {`
`162`	`162`	`return;`
`163`	`163`	`}`
`164`	`164`	`int port = remoteAddress.getPort();`
`165`		`- if (port >= 0) {`
	`165`	`+ if (port >= 0 && !forValue.endsWith(":" + port)) {`
`166`	`166`	`forValue = forValue + ":" + port;`
`167`	`167`	`}`
`168`	`168`	`forwarded.put("for", forValue);`