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
Force service user username to be lowercase otherwise causes problems with retrieval (Fixes #525)
Rich Turner7a48a1a71e41
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex 4ed8a91f0..49c6128d0 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -586,7 +586,10 @@ public class GatewayService extends RouteBuilder implements ContainerService, AsLOG.info("Creating gateway keycloak client for gateway id: " + gateway.getId());- String clientId = GATEWAY_CLIENT_ID_PREFIX + gateway.getId();+ String clientId = GATEWAY_CLIENT_ID_PREFIX + gateway.getId().toLowerCase(Locale.ROOT);+ if (clientId.length() > 255) {+ clientId = clientId.substring(0, 254);+ }String secret = gateway.getClientSecret().orElseGet(() -> UUID.randomUUID().toString());try {diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.javaindex 51f87f511..60e74c7fe 100644--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java@@ -294,6 +294,10 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {// Get/create service userString serviceUsername = (PROVISIONING_USER_PREFIX + uniqueId).toLowerCase(); // Keycloak clients are case sensitive but pretends not to be so always force lowercase+ if (serviceUsername.length() > 255) {+ // Keycloak has a 255 character limit on clientId+ serviceUsername = serviceUsername.substring(0, 254);+ }User serviceUser;try {diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex d2dd67994..7307e00b6 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -633,7 +633,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im}return roles.toArray(new Role[0]);- }, null);+ }, () -> new Role[0]);});}