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
Improved security on assets in KeycloakAuthorizatorPolicy
Michael Rademaker95b847ec4ee8
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.javaindex a243f4081..6cef80af8 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java@@ -84,6 +84,20 @@ public class KeycloakAuthorizatorPolicy implements IAuthorizatorPolicy {return false;}+ Token token = topic.getTokens().get(1);+ Asset asset = assetStorageService.find(token.toString());+ if(asset == null) {+ LOG.log(Level.INFO, "Asset not found");+ return false;+ }+ if(topic.getTokens().size() > 2) {+ token = topic.getTokens().get(2);+ if (!asset.getAttribute(token.toString()).isPresent()) {+ LOG.log(Level.INFO, "Attribute not found on asset");+ return false;+ }+ }+AccessToken accessToken = null;try {accessToken = AdapterTokenVerifier.verifyToken(connection.accessToken, identityProvider.getKeycloakDeployment(connection.realm, KEYCLOAK_CLIENT_ID));@@ -105,19 +119,7 @@ public class KeycloakAuthorizatorPolicy implements IAuthorizatorPolicy {AuthContext authContext = new AccessTokenAuthContext(connection.realm, accessToken);if (Arrays.asList(roles).contains(ClientRole.WRITE_ASSETS)) { //write- Token token = topic.getTokens().get(1);- Asset asset = assetStorageService.find(token.toString());- if(asset == null) {- LOG.log(Level.INFO, "Asset not found");- return false;- }- if(topic.getTokens().size() > 2) {- token = topic.getTokens().get(2);- if (!asset.getAttribute(token.toString()).isPresent()) {- LOG.log(Level.INFO, "Attribute not found on asset");- return false;- }- }+return identityProvider.canSubscribeWith(authContext, new TenantFilter(connection.realm), roles);} else { // readString[] topicParts = topic.getTokens().stream().map(Token::toString).toArray(String[]::new);