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
Fix gateway websocket realm boundary issue
Rich Turner2145c21995e6
diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.javaindex 1bc6202d4..00c414433 100644--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java@@ -163,6 +163,10 @@ public class ClientEventService extends RouteBuilder implements ContainerServicereturn null;}+ public static String getRealm(Exchange exchange) {+ return exchange.getIn().getHeader(REALM_PARAM_NAME, String.class);+ }+@Overridepublic int getPriority() {return PRIORITY;@@ -488,7 +492,7 @@ public class ClientEventService extends RouteBuilder implements ContainerServiceWebSocketChannel webSocketChannel =exchange.getIn().getHeader(UndertowConstants.CHANNEL, WebSocketChannel.class);AuthContext authContext = exchange.getIn().getHeader(AUTH_CONTEXT, AuthContext.class);- String realm = exchange.getIn().getHeader(REALM_PARAM_NAME, String.class);+ String realm = getRealm(exchange);if (webSocketChannel != null) {if (authContext == null) {diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.javaindex c0171ddb6..039fbc58f 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java@@ -189,6 +189,7 @@ public class GatewayConnector {}requestDisconnect.run();+ requestDisconnect = null;LOG.info("Disconnected: " + getGatewayIdString());if (syncProcessorFuture != null) {LOG.finest("Aborting active sync process: " + getGatewayIdString());diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex 5453129f8..ed49abb03 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -373,6 +373,7 @@ public class GatewayService extends RouteBuilder implements ContainerService {*/protected void onGatewayMessageIntercept(Exchange exchange) {String clientId = ClientEventService.getClientId(exchange);+ String realm = ClientEventService.getRealm(exchange);if (!isGatewayClientId(clientId)) {return;@@ -380,13 +381,13 @@ public class GatewayService extends RouteBuilder implements ContainerService {if (header(SESSION_OPEN).matches(exchange)) {String sessionKey = ClientEventService.getSessionKey(exchange);- processGatewayConnected(clientId, sessionKey);+ processGatewayConnected(realm, clientId, sessionKey);return;}if (or(header(SESSION_CLOSE), header(SESSION_CLOSE_ERROR)).matches(exchange)) {String sessionKey = ClientEventService.getSessionKey(exchange);- processGatewayDisconnected(clientId, sessionKey);+ processGatewayDisconnected(realm, clientId, sessionKey);return;}@@ -395,7 +396,7 @@ public class GatewayService extends RouteBuilder implements ContainerService {exchange.setRouteStop(true);String sessionKey = ClientEventService.getSessionKey(exchange);String gatewayId = getGatewayIdFromClientId(clientId);- processGatewayMessage(gatewayId, sessionKey, exchange.getIn().getBody(SharedEvent.class));+ processGatewayMessage(realm, gatewayId, sessionKey, exchange.getIn().getBody(SharedEvent.class));}}@@ -762,7 +763,7 @@ public class GatewayService extends RouteBuilder implements ContainerService {return null;}- protected void processGatewayConnected(String gatewayClientId, String sessionId) {+ protected void processGatewayConnected(String realm, String gatewayClientId, String sessionId) {String gatewayId = getGatewayIdFromClientId(gatewayClientId);GatewayConnector connector = gatewayConnectorMap.get(gatewayId.toLowerCase(Locale.ROOT));@@ -775,6 +776,14 @@ public class GatewayService extends RouteBuilder implements ContainerService {return;}+ if (!Objects.equals(realm, connector.getRealm())) {+ LOG.warning("Gateway connected with incorrect realm: GatewayID=" + gatewayId);+ clientEventService.sendToWebsocketSession(+ sessionId, new GatewayDisconnectEvent(GatewayDisconnectEvent.Reason.UNRECOGNISED));+ clientEventService.closeWebsocketSession(sessionId);+ return;+ }+if (connector.isDisabled()) {LOG.warning("Gateway is currently disabled so will be ignored: GatewayID=" + gatewayId);clientEventService.sendToWebsocketSession(@@ -794,12 +803,19 @@ public class GatewayService extends RouteBuilder implements ContainerService {});}- protected void processGatewayDisconnected(String gatewayClientId, String sessionId) {+ protected void processGatewayDisconnected(String realm, String gatewayClientId, String sessionId) {String gatewayId = getGatewayIdFromClientId(gatewayClientId);GatewayConnector connector = gatewayConnectorMap.get(gatewayId.toLowerCase(Locale.ROOT));try {if (connector != null) {++ // If a client is trying to cross realm boundaries do nothing+ if (!Objects.equals(realm, connector.getRealm())) {+ LOG.warning("Gateway disconnected with incorrect realm: GatewayID=" + gatewayId);+ return;+ }+connector.disconnected(sessionId);}} finally {@@ -817,9 +833,9 @@ public class GatewayService extends RouteBuilder implements ContainerService {}}- protected void processGatewayMessage(String gatewayId, String sessionId, SharedEvent event) {+ protected void processGatewayMessage(String realm, String gatewayId, String sessionId, SharedEvent event) {GatewayConnector connector = gatewayConnectorMap.get(gatewayId.toLowerCase(Locale.ROOT));- if (connector == null) {+ if (connector == null || !Objects.equals(realm, connector.getRealm())) {return;}if (!connector.isConnected() || !sessionId.equals(connector.getSessionId())) {