Skip to content

armgit / core

Public Imported from GitHub
0

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

Don't allow recursive AssetQuery to retrieve `ACCESS_PUBLIC_READ` assets (#1672)

Panos Kalogeropoulos58e123690233
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index b1d1e6090..4472ebc48 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -1674,7 +1674,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
binders.add((em, st) -> st.setParameter(pos, query.userIds));
}
- if (level == 1 && query.access == Access.PUBLIC) {
+ if (query.access == Access.PUBLIC) {
sb.append(" and A.ACCESS_PUBLIC_READ is true");
}
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
index 66a7f6ce2..999a02ef1 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
@@ -823,8 +823,16 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
and: "the asset resource"
def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).proxy(AssetResource.class)
+ when: "the anonymous user tries to retrieve all assets"
+ def assets = assetResource.queryAssets(null, new AssetQuery().recursive(true))
+
+ then: "only public assets should be returned"
+ assets.size() == 2
+ assets.find {it.id == managerTestSetup.apartment1Id } != null
+ assets.find {it.id == managerTestSetup.apartment2LivingroomId } != null
+
when: "the public assets are retrieved"
- def assets = assetResource.queryAssets(null, new AssetQuery()
+ assets = assetResource.queryAssets(null, new AssetQuery()
.realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name)))
then: "the public assets should be retrieved"
diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
index b4471291f..1b1488298 100644
--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
@@ -128,7 +128,6 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
def authenticatedAssetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name, accessToken).proxy(AssetResource.class)
def anonymousConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).proxy(ConsoleResource.class)
def anonymousRulesResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).proxy(RulesResource.class)
- def anonymousAssetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.realmBuilding.name).proxy(AssetResource.class)
when: "a console registers with an authenticated user"
def consoleRegistration = new ConsoleRegistration(null,