Prevent double port assignment within ApacheProxyStrategy

Resolves: hapifhir#2856
ZuSe · Aug 6, 2021 · 638c2a3 · 638c2a3
1 parent 67682a8
commit 638c2a3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java
@@ -115,8 +115,9 @@ private String forwardedServerBase(String originalServerBase,
  LOG.debug("request header: {}", headers);
 
  String host = protocol(headers) + ":https://" + forwardedHost;
- String hostWithOptionalPort = port(headers).map(p -> (host + ":" + p))
- .orElse(host);
+ String hostWithOptionalPort = port(headers).map(p ->
+ host.contains(":" + p) ? host : (host + ":" + p))
+ .orElse(host);
 
  String path = forwardedPrefix
  .orElseGet(() -> pathFrom(originalServerBase));