Skip to content

armgit / core

Public Imported from GitHub
0

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

Reinstated same realm check in AssetResourceImpl update method

Rich Turnerf0eec3cdf82a
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
index 38e9138e4..d3fafe402 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
@@ -246,6 +246,11 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
throw new WebApplicationException(FORBIDDEN);
}
+ if (!storageAsset.getRealm().equals(asset.getRealm())) {
+ LOG.fine("Cannot change asset's realm: " + storageAsset);
+ throw new WebApplicationException(FORBIDDEN);
+ }
+
boolean isRestrictedUser = isRestrictedUser();
// The asset that will ultimately be stored (override/ignore some values for restricted users)
@@ -254,7 +259,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
storageAsset,
isRestrictedUser ? storageAsset.getName() : null, // TODO We could allow restricted users to update names?
storageAsset.getRealm(), // The realm can never change
- isRestrictedUser ? storageAsset.getParentId() : null, // Restricted users can not change realm
+ isRestrictedUser ? storageAsset.getParentId() : null, // Restricted users can not change parent
storageAsset.getType(), // The type can never change
isRestrictedUser ? storageAsset.isAccessPublicRead() : null, // Restricted user can not change access public flag
isRestrictedUser ? storageAsset.getAttributes() : null // Restricted users need manual attribute merging (see below)