Skip to content

armgit / core

Public Imported from GitHub
0

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

Guard against admin user deletion (#898)

Rich Turnerbd2668a883bf
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index 57c5ac127..5287fcaf3 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -433,6 +433,10 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
return;
}
+ if (user.getUsername().equals(MASTER_REALM_ADMIN_USER) && user.getRealm().equals(MASTER_REALM)) {
+ throw new IllegalStateException("Cannot delete master realm admin user");
+ }
+
getRealms(realmsResource -> {
if (user.isServiceAccount()) {
diff --git a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy
index 7762b21fb..a588e599d 100644
--- a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy
+++ b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy
@@ -70,6 +70,8 @@ import java.util.stream.IntStream
import static java.util.concurrent.TimeUnit.SECONDS
import static org.openremote.container.web.WebService.OR_WEBSERVER_LISTEN_PORT
+import static org.openremote.model.Constants.MASTER_REALM
+import static org.openremote.model.Constants.MASTER_REALM_ADMIN_USER
trait ContainerTrait {
@@ -123,7 +125,12 @@ trait ContainerTrait {
}
println("Purging ${newUsers.size()} new user(s)")
- newUsers.forEach {user -> identityProvider.deleteUser(user.realm, user.id)}
+ newUsers.forEach {user ->
+ // Never delete the master admin user
+ if (user.getUsername() != MASTER_REALM_ADMIN_USER && user.getRealm() != MASTER_REALM) {
+ identityProvider.deleteUser(user.realm, user.id)
+ }
+ }
}
// Reset gateway connections