Skip to content

armgit / core

Public Imported from GitHub
0

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

Fix SyslogResourceTest cleanup of created users (#2995)

Rich Turner5368688a2abb
diff --git a/test/src/test/groovy/org/openremote/test/syslog/SyslogResourceTest.groovy b/test/src/test/groovy/org/openremote/test/syslog/SyslogResourceTest.groovy
index f7ec641d4..1a5ce344f 100644
--- a/test/src/test/groovy/org/openremote/test/syslog/SyslogResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/syslog/SyslogResourceTest.groovy
@@ -1,20 +1,29 @@
package org.openremote.test.syslog
import jakarta.ws.rs.core.Response
+import org.openremote.container.security.IdentityProvider
+import org.openremote.container.security.IdentityService
+import org.openremote.manager.security.ManagerIdentityProvider
+import org.openremote.manager.security.ManagerIdentityService
import org.openremote.manager.setup.SetupService
import org.openremote.manager.syslog.SyslogService
import org.openremote.model.security.ClientRole
import org.openremote.setup.integration.KeycloakTestSetup
import org.openremote.test.ManagerContainerTrait
+import spock.lang.Shared
import spock.lang.Specification
import static org.openremote.model.Constants.*
class SyslogResourceTest extends Specification implements ManagerContainerTrait {
+ @Shared
+ private static String userId
+
def "Users with rules read role cannot retrieve syslog events"() {
given: "the server container is started with the syslog resource"
def container = startContainer(defaultConfig(), defaultServices(new SyslogService()))
+ def identityProvider = container.getService(ManagerIdentityService.class).getIdentityProvider()
def keycloakTestSetup = container.getService(SetupService.class).getTaskOfType(KeycloakTestSetup.class)
and: "a user has the old rules role but not the logs role"
@@ -28,11 +37,15 @@ class SyslogResourceTest extends Specification implements ManagerContainerTrait
assert r.status == Response.Status.FORBIDDEN.statusCode
return true
}
+
+ cleanup: "the test user is removed"
+ deleteUser(identityProvider)
}
def "Users with logs read role can retrieve syslog events"() {
given: "the server container is started with the syslog resource"
def container = startContainer(defaultConfig(), defaultServices(new SyslogService()))
+ def identityProvider = container.getService(ManagerIdentityService.class).getIdentityProvider()
def keycloakTestSetup = container.getService(SetupService.class).getTaskOfType(KeycloakTestSetup.class)
and: "a user has the logs role"
@@ -46,11 +59,14 @@ class SyslogResourceTest extends Specification implements ManagerContainerTrait
assert r.status == Response.Status.OK.statusCode
return true
}
+
+ cleanup: "the test user is removed"
+ deleteUser(identityProvider)
}
private String createUserToken(container, KeycloakTestSetup keycloakTestSetup, String roleName, ClientRole role) {
- def username = "syslog-${roleName}-${UUID.randomUUID()}"
- keycloakTestSetup.createUser(
+ def username = "syslog-test-${roleName}"
+ def user = keycloakTestSetup.createUser(
MASTER_REALM,
username,
username,
@@ -60,9 +76,17 @@ class SyslogResourceTest extends Specification implements ManagerContainerTrait
true,
[role] as ClientRole[]
)
+
+ userId = user.id
authenticate(container, MASTER_REALM, KEYCLOAK_CLIENT_ID, username, username)
}
+ private static void deleteUser(ManagerIdentityProvider identityProvider) {
+ if (userId != null) {
+ identityProvider.deleteUser(MASTER_REALM, userId)
+ }
+ }
+
private def getSyslogEvents(String accessToken) {
getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken)
.path("syslog")