From eb149c8cd40cdd86e24e70ad934d2cbb05d0ad05 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 6 Sep 2021 11:50:26 +0200 Subject: Support 'X-Forwarded-Host' --- .../src/main/java/com/yahoo/restapi/RestApiImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'container-core/src/main/java/com/yahoo/restapi') 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) { -- cgit v1.2.3