Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix GatewayServiceResource realm boundary security issue

Rich Turner9ada85ba3b2a
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java
index 039fbc58f..789035c50 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java
@@ -467,7 +467,7 @@ public class GatewayConnector {
expectedSyncResponseName = ASSET_READ_EVENT_NAME_INITIAL;
sendMessageToGateway(
new GatewayInitStartEvent(
- gatewayService.getGatewayTunnelInfos(gatewayId),
+ gatewayService.getGatewayTunnelInfos(realm, gatewayId),
VersionInfo.getGatewayApiVersion(),
gatewayService.getTunnelSSHHostname(),
gatewayService.getTunnelSSHPort() > 0 ? gatewayService.getTunnelSSHPort() : null));
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
index ed49abb03..ce09f5edd 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
@@ -572,9 +572,10 @@ public class GatewayService extends RouteBuilder implements ContainerService {
return this.tunnelInfos.values();
}
- public GatewayTunnelInfo[] getGatewayTunnelInfos(String gatewayID) {
+ public GatewayTunnelInfo[] getGatewayTunnelInfos(String realm, String gatewayID) {
return getTunnelInfos().stream()
.filter(tunnel -> tunnel.getGatewayId().equals(gatewayID))
+ .filter(tunnel -> tunnel.getRealm().equals(realm))
.toArray(GatewayTunnelInfo[]::new);
}
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayServiceResourceImpl.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayServiceResourceImpl.java
index 4f4fce394..1cbeaad83 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayServiceResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayServiceResourceImpl.java
@@ -30,6 +30,8 @@ import org.openremote.model.gateway.GatewayTunnelInfo;
import org.openremote.model.http.RequestParams;
import org.openremote.model.util.TextUtil;
+import java.util.Arrays;
+
public class GatewayServiceResourceImpl extends ManagerWebResource
implements GatewayServiceResource {
@@ -84,7 +86,7 @@ public class GatewayServiceResourceImpl extends ManagerWebResource
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- return gatewayService.getGatewayTunnelInfos(gatewayID);
+ return gatewayService.getGatewayTunnelInfos(realm, gatewayID);
}
@Override