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
Merge commit from fork
Rich Turnera2493dcacbcc
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.javaindex a1ff56b2f..e4470d290 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java@@ -41,6 +41,7 @@ import org.openremote.model.rules.*;import org.openremote.model.rules.geofence.GeofenceDefinition;import org.openremote.model.security.ClientRole;import org.openremote.model.security.Realm;+import org.openremote.model.util.TextUtil;public class RulesResourceImpl extends ManagerWebResource implements RulesResource {@@ -120,6 +121,18 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour}}+ /**+ * A create must not carry an ID, otherwise the merge would overwrite whichever ruleset holds that+ * ID, bypassing the access checks done on the existing ruleset by the update endpoints.+ */+ protected void rejectIdOnCreate(Ruleset ruleset) {+ if (ruleset.getId() != null) {+ throw new WebApplicationException(+ "Ruleset ID must not be set on create, use update to modify an existing ruleset",+ BAD_REQUEST);+ }+ }+protected void rejectLegacyJavascriptUpdate(Ruleset existingRuleset, Ruleset incomingRuleset) {if ((existingRuleset != null && existingRuleset.getLang() == Ruleset.Lang.JAVASCRIPT)|| (incomingRuleset != null && incomingRuleset.getLang() == Ruleset.Lang.JAVASCRIPT)) {@@ -242,6 +255,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResourif (!isSuperUser()) {throw new WebApplicationException(Response.Status.FORBIDDEN);}+ rejectIdOnCreate(ruleset);rejectLegacyJavascriptCreate(ruleset);ruleset = rulesetStorageService.merge(ruleset);return ruleset.getId();@@ -295,6 +309,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour+ getUsername());throw new WebApplicationException(Response.Status.FORBIDDEN);}+ rejectIdOnCreate(ruleset);rejectLegacyJavascriptCreate(ruleset);// Only super users can create/modify groovy rules@@ -387,7 +402,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour@Overridepublic long createAssetRuleset(@BeanParam RequestParams requestParams, AssetRuleset ruleset) {String assetId = ruleset.getAssetId();- if (assetId == null || assetId.length() == 0) {+ if (TextUtil.isNullOrEmpty(assetId)) {throw new WebApplicationException("Missing asset identifier value", BAD_REQUEST);}Asset<?> asset = assetStorageService.find(assetId, false);@@ -400,6 +415,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResourif (isRestrictedUser() && !assetStorageService.isUserAsset(getUserId(), asset.getId())) {throw new WebApplicationException(Response.Status.FORBIDDEN);}+ rejectIdOnCreate(ruleset);rejectLegacyJavascriptCreate(ruleset);// Only super users can create/modify groovy rulesdiff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovyindex abf2b635d..4ab1c8289 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -1386,4 +1386,57 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex = thrown()ex.response.status == 404}++ def "Realm ruleset create cannot overwrite an existing ruleset in another realm"() {++ given: "the server container is started"+ def container = startContainer(defaultConfig(), defaultServices())+ def rulesetStorageService = container.getService(RulesetStorageService.class)+ def rulesService = container.getService(RulesService.class)+ def keycloakTestSetup = container.getService(SetupService.class).getTaskOfType(KeycloakTestSetup.class)+ def managerTestSetup = container.getService(SetupService.class).getTaskOfType(ManagerTestSetup.class)+ def conditions = new PollingConditions(timeout: 10, delay: 0.2)++ and: "some imported rulesets"+ def rulesImport = new BasicRulesImport(rulesetStorageService, keycloakTestSetup, managerTestSetup)++ and: "an authenticated test user in the master realm who can write rules"+ def accessToken = authenticate(+ container,+ MASTER_REALM,+ KEYCLOAK_CLIENT_ID,+ "testuser1",+ "testuser1"+ )++ and: "the ruleset resource"+ def rulesetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM, accessToken).proxy(RulesResource.class)++ expect: "the rules engines to be ready"+ conditions.eventually {+ rulesImport.assertEnginesReady(rulesService, keycloakTestSetup, managerTestSetup)+ }++ when: "the user creates a realm ruleset in their own realm carrying the ID and version of the building realm ruleset"+ def existingRuleset = rulesetStorageService.find(RealmRuleset.class, rulesImport.realmBuildingRulesetId, true)+ def realmRuleset = new RealmRuleset(MASTER_REALM, "Overwritten realm definition", JSON, "{}")+ realmRuleset.setId(existingRuleset.id)+ realmRuleset.setVersion(existingRuleset.version)+ rulesetResource.createRealmRuleset(null, realmRuleset)++ then: "the request should be rejected"+ WebApplicationException ex = thrown()+ ex.response.withCloseable { r ->+ assert r.status == 400+ return true+ }++ and: "the building realm ruleset should be unchanged"+ def storedRuleset = rulesetStorageService.find(RealmRuleset.class, rulesImport.realmBuildingRulesetId, true)+ storedRuleset.realm == keycloakTestSetup.realmBuilding.name+ storedRuleset.name == "Some building realm demo rules"+ storedRuleset.lang == GROOVY+ storedRuleset.rules == existingRuleset.rules+ storedRuleset.version == existingRuleset.version+ }}