Skip to content

armgit / core

Public Imported from GitHub
0

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

Merge commit from fork

Eric Bariaux3b5e268f778f
diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogResource.java b/model/src/main/java/org/openremote/model/syslog/SyslogResource.java
index 3708dbfe0..948cb28b8 100644
--- a/model/src/main/java/org/openremote/model/syslog/SyslogResource.java
+++ b/model/src/main/java/org/openremote/model/syslog/SyslogResource.java
@@ -38,7 +38,7 @@ public interface SyslogResource {
@GET
@Path("event")
@Produces(APPLICATION_JSON)
- @RolesAllowed({Constants.READ_RULES_ROLE})
+ @RolesAllowed({Constants.READ_LOGS_ROLE})
@Operation(operationId = "getEvents", summary = "Retrieve the syslog events")
@SuppressWarnings({"unusable-by-js"})
Response getEvents(@BeanParam RequestParams requestParams, @QueryParam("level") SyslogLevel level, @QueryParam("per_page") Integer perPage, @QueryParam("page") Integer page, @QueryParam("from") Long from, @QueryParam("to") Long to, @QueryParam("category") List<SyslogCategory> categories, @QueryParam("subCategory") List<String> subCategories);
diff --git a/test/src/test/groovy/org/openremote/test/syslog/SyslogResourceTest.groovy b/test/src/test/groovy/org/openremote/test/syslog/SyslogResourceTest.groovy
new file mode 100644
index 000000000..f7ec641d4
--- /dev/null
+++ b/test/src/test/groovy/org/openremote/test/syslog/SyslogResourceTest.groovy
@@ -0,0 +1,73 @@
+package org.openremote.test.syslog
+
+import jakarta.ws.rs.core.Response
+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.Specification
+
+import static org.openremote.model.Constants.*
+
+class SyslogResourceTest extends Specification implements ManagerContainerTrait {
+
+ 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 keycloakTestSetup = container.getService(SetupService.class).getTaskOfType(KeycloakTestSetup.class)
+
+ and: "a user has the old rules role but not the logs role"
+ def rulesAccessToken = createUserToken(container, keycloakTestSetup, "read-rules", ClientRole.READ_RULES)
+
+ when: "the user requests syslog events"
+ def response = getSyslogEvents(rulesAccessToken)
+
+ then: "the resource rejects the wrong role"
+ response.withCloseable { r ->
+ assert r.status == Response.Status.FORBIDDEN.statusCode
+ return true
+ }
+ }
+
+ 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 keycloakTestSetup = container.getService(SetupService.class).getTaskOfType(KeycloakTestSetup.class)
+
+ and: "a user has the logs role"
+ def logsAccessToken = createUserToken(container, keycloakTestSetup, "read-logs", ClientRole.READ_LOGS)
+
+ when: "the user requests syslog events"
+ def response = getSyslogEvents(logsAccessToken)
+
+ then: "the resource allows the correct role"
+ response.withCloseable { r ->
+ assert r.status == Response.Status.OK.statusCode
+ return true
+ }
+ }
+
+ private String createUserToken(container, KeycloakTestSetup keycloakTestSetup, String roleName, ClientRole role) {
+ def username = "syslog-${roleName}-${UUID.randomUUID()}"
+ keycloakTestSetup.createUser(
+ MASTER_REALM,
+ username,
+ username,
+ "Syslog",
+ roleName,
+ "${username}@openremote.local",
+ true,
+ [role] as ClientRole[]
+ )
+ authenticate(container, MASTER_REALM, KEYCLOAK_CLIENT_ID, username, username)
+ }
+
+ private def getSyslogEvents(String accessToken) {
+ getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken)
+ .path("syslog")
+ .path("event")
+ .request()
+ .get()
+ }
+}