Support 'X-Forwarded-Host'

1 files changed, 9 insertions, 2 deletions

diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
index 68459cdb89d..bba79dbfad4 100644
--- a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
+++ b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
@@ -400,9 +400,16 @@ class RestApiImpl implements RestApi {
         @Override public ObjectMapper jacksonJsonMapper() { return jacksonJsonMapper; }
         @Override public UriBuilder uriBuilder() {
             URI uri = request.getUri();
+            // Reconstruct the URI used by the client to access the API.
+            // This is needed for producing URIs in the response that links to other parts of the Rest API.
+            // request.getUri() cannot be used as its port is the local listen port (as it's intended for request routing).
             StringBuilder sb = new StringBuilder(uri.getScheme()).append("://");
-            if (request.getHeader("Host") != null) {
-                sb.append(request.getHeader("Host"));
+            String hostHeader = request.getHeader("X-Forwarded-Host");
+            if (hostHeader == null || hostHeader.isBlank()) {
+                hostHeader = request.getHeader("Host");
+            }
+            if (hostHeader != null && !hostHeader.isBlank()) {
+                sb.append(hostHeader);
             } else {
                 sb.append(uri.getHost());
                 if (uri.getPort() > 0) {