100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Fixes for Request URI with proxy
Rich Turner3d8083e9dbca
diff --git a/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java b/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.javaindex 925c5c94e..d28302df7 100644--- a/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java@@ -41,16 +41,16 @@ public class MapResourceImpl extends WebResource implements MapResource {@Overridepublic ObjectValue getSettings(RequestParams requestParams) {return mapService.getMapSettings(- getRequestRealm(),- requestParams.uriInfo.getRequestUriBuilder()+ getRequestRealm(),+ requestParams.getRequestBaseUri());}@Overridepublic ObjectValue getSettingsJs(RequestParams requestParams) {return mapService.getMapSettingsJs(- getAuthenticatedRealm(),- requestParams.uriInfo.getRequestUriBuilder()+ getAuthenticatedRealm(),+ requestParams.getRequestBaseUri());}diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex eb16346c3..c053c4cd0 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -293,7 +293,6 @@ public class MapService implements ContainerService {ArrayValue tilesArray = Values.createArray();String tileUrl = baseUriBuilder.clone().replacePath(API_PATH).path(realm).path("map/tile").build().toString() + "/{z}/{x}/{y}";- //String tileUrl = UriBuilder.fromPath("/").path(API_PATH).path(realm).path("map/tile").build().toString() + "/{z}/{x}/{y}";tilesArray.set(0, tileUrl);vectorTilesObj.put("tiles", tilesArray);diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.javaindex e4ef20b36..e5ec5f303 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java@@ -26,6 +26,8 @@ import org.openremote.model.util.Pair;import javax.ws.rs.BeanParam;import javax.ws.rs.core.Response;+import javax.ws.rs.core.UriBuilder;+import java.net.URI;import java.time.Instant;import java.util.Collections;import java.util.List;@@ -63,11 +65,15 @@ public class SyslogResourceImpl extends WebResource implements SyslogResource {long lastPage = (result.key / perPage) + 1L;Response.ResponseBuilder rb = Response.ok(result.value.toArray(new SyslogEvent[0]));+ URI requestBaseUri = requestParams.getRequestBaseUri().build(); // This gives request base from in front of proxy+ UriBuilder requestUriBuilder = requestParams.uriInfo.getRequestUriBuilder();+ requestUriBuilder.scheme(requestBaseUri.getScheme()).host(requestBaseUri.getHost()).port(requestBaseUri.getPort());+if (page != lastPage) {- rb.link(requestParams.uriInfo.getRequestUriBuilder().replaceQueryParam("page", page + 1).build(), "next");+ rb.link(requestUriBuilder.replaceQueryParam("page", page + 1).build(), "next");}- rb.link(requestParams.uriInfo.getRequestUriBuilder().replaceQueryParam("page", lastPage).build(), "last");+ rb.link(requestUriBuilder.replaceQueryParam("page", lastPage).build(), "last");return rb.build();}diff --git a/model/src/main/java/org/openremote/model/http/RequestParams.java b/model/src/main/java/org/openremote/model/http/RequestParams.javaindex 68b8be40b..372bd2218 100644--- a/model/src/main/java/org/openremote/model/http/RequestParams.java+++ b/model/src/main/java/org/openremote/model/http/RequestParams.java@@ -24,12 +24,11 @@ import jsinterop.annotations.JsIgnore;import jsinterop.annotations.JsProperty;import jsinterop.annotations.JsType;import org.openremote.model.interop.Function;+import org.openremote.model.util.TextUtil;import javax.ws.rs.HeaderParam;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.UriInfo;+import javax.ws.rs.core.*;+import java.net.URI;@JsTypepublic class RequestParams<IN, OUT> {@@ -38,6 +37,15 @@ public class RequestParams<IN, OUT> {@JsProperty(name = HttpHeaders.AUTHORIZATION)public String authorization;+ @HeaderParam("X-Forwarded-Proto")+ public String forwardedProtoHeader;++ @HeaderParam("X-Forwarded-Host")+ public String forwardedHostHeader;++ @HeaderParam("X-Forwarded-Port")+ public Integer forwardedPortHeader;+@JsIgnore@Context@GwtIncompatible@@ -94,6 +102,18 @@ public class RequestParams<IN, OUT> {return authorization.split(" ")[1];}+ /**+ * Handles reverse proxying and returns the request base URI+ */+ @JsIgnore+ public UriBuilder getRequestBaseUri() {+ URI uri = this.uriInfo.getRequestUri();+ String scheme = TextUtil.isNullOrEmpty(this.forwardedProtoHeader) ? uri.getScheme() : this.forwardedProtoHeader;+ int port = this.forwardedPortHeader == null ? uri.getPort() : this.forwardedPortHeader;+ String host = TextUtil.isNullOrEmpty(this.forwardedHostHeader) ? uri.getHost() : this.forwardedHostHeader;+ return this.uriInfo.getBaseUriBuilder().scheme(scheme).host(host).port(port);+ }+public RequestParams<IN, OUT> setEntity(String entity) {this.entity = entity;return this;diff --git a/proxy/haproxy.cfg b/proxy/haproxy.cfgindex 4100f6b7b..0a4714147 100644--- a/proxy/haproxy.cfg+++ b/proxy/haproxy.cfg@@ -62,6 +62,7 @@ frontend httpsbind :443 ssl crt "${CERT_FILE}" no-sslv3 no-tls-tickets no-tlsv10 no-tlsv11http-request add-header X-Forwarded-Proto https+ http-request set-header X-Forwarded-Host %[req.hdr(Host)]http-request add-header X-Forwarded-Port %fphttp-request add-header Strict-Transport-Security max-age=15768000