Skip to content

armgit / core

Public Imported from GitHub
0

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

Cleanup of isTenantActiveAndAccessible logic

Rich Turner7dfcad991f51
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
index 035dc07cf..ae3b093ae 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
@@ -307,7 +307,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
} else {
// Check realm, must be accessible
if (!identityService.getIdentityProvider().isTenantActiveAndAccessible(authContext,
- asset)) {
+ asset.getRealm())) {
throw new AssetProcessingException(INSUFFICIENT_ACCESS);
}
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 194ecf382..38e9138e4 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
@@ -53,6 +53,7 @@ import static org.openremote.container.Container.JSON;
import static org.openremote.model.attribute.AttributeEvent.Source.CLIENT;
import static org.openremote.model.attribute.MetaItemType.ACCESS_RESTRICTED_READ;
import static org.openremote.model.query.AssetQuery.Access;
+import static org.openremote.model.query.AssetQuery.Select.selectExcludeAll;
import static org.openremote.model.query.AssetQuery.Select.selectExcludePathAndAttributes;
import static org.openremote.model.util.TextUtil.isNullOrEmpty;
@@ -216,7 +217,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
if (asset == null)
throw new WebApplicationException(NOT_FOUND);
- if (!isTenantActiveAndAccessible(asset)) {
+ if (!isTenantActiveAndAccessible(asset.getRealm())) {
LOG.fine("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(FORBIDDEN);
}
@@ -235,12 +236,13 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
public void update(RequestParams requestParams, String assetId, Asset asset) {
try {
Asset storageAsset = assetStorageService.find(assetId, true);
+
if (storageAsset == null)
throw new WebApplicationException(NOT_FOUND);
- // Current and new realm of asset must be accessible
- if (!isTenantActiveAndAccessible(storageAsset) || !isTenantActiveAndAccessible(asset)) {
- LOG.fine("Current or new tenant not accessible by user '" + getUsername() + "', can't update: " + storageAsset);
+ // Realm of asset must be accessible
+ if (!isTenantActiveAndAccessible(storageAsset.getRealm())) {
+ LOG.fine("Tenant not accessible by user '" + getUsername() + "', can't update: " + storageAsset);
throw new WebApplicationException(FORBIDDEN);
}
@@ -445,9 +447,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
// If there was no realm provided (create was called by regular user in manager UI), use the auth realm
if (asset.getRealm() == null || asset.getRealm().length() == 0) {
asset.setRealm(getAuthenticatedTenant().getRealm());
- }
-
- if (!isTenantActiveAndAccessible(asset)) {
+ } else if (!isTenantActiveAndAccessible(asset.getRealm())) {
LOG.fine("Forbidden access for user '" + getUsername() + "', can't create: " + asset);
throw new WebApplicationException(FORBIDDEN);
}
@@ -516,13 +516,14 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
if (isRestrictedUser()) {
throw new WebApplicationException(FORBIDDEN);
}
- List<Asset> assets = assetStorageService.findAll(new AssetQuery().ids(assetIds.toArray(new String[0])).select(selectExcludePathAndAttributes()));
+
+ List<Asset> assets = assetStorageService.findAll(new AssetQuery().ids(assetIds.toArray(new String[0])).select(selectExcludeAll()));
if (assets == null || assets.size() != assetIds.size()) {
LOG.fine("Request to delete one or more invalid assets");
- return;
+ throw new WebApplicationException(BAD_REQUEST);
}
- if (assets.stream().anyMatch(asset -> !isTenantActiveAndAccessible(asset))) {
+ if (assets.stream().map(Asset::getRealm).distinct().anyMatch(asset -> !isTenantActiveAndAccessible(asset))) {
LOG.fine("Forbidden access for user '" + getUsername() + "', can't delete requested assets");
throw new WebApplicationException(FORBIDDEN);
}
@@ -551,23 +552,21 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
query.access(Access.PROTECTED);
}
- Tenant tenant = query.tenant != null
- ? !isNullOrEmpty(query.tenant.realm)
- ? identityService.getIdentityProvider().getTenant(query.tenant.realm)
- : getAuthenticatedTenant()
- : getAuthenticatedTenant();
+ String realm = query.tenant != null && !isNullOrEmpty(query.tenant.realm)
+ ? query.tenant.realm
+ : getAuthenticatedRealm();
- if (tenant == null) {
+ if (TextUtil.isNullOrEmpty(realm)) {
throw new WebApplicationException(NOT_FOUND);
}
- if (!isTenantActiveAndAccessible(tenant)) {
+ if (!isTenantActiveAndAccessible(realm)) {
return EMPTY_ASSETS;
}
// This replicates behaviour of old getRoot and getChildren methods
if (!isSuperUser()) {
- query.tenant(new TenantPredicate(tenant.getRealm()));
+ query.tenant(new TenantPredicate(realm));
}
List<Asset> result = assetStorageService.findAll(query);
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
index 7f8fb9bf9..300afa788 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
@@ -70,7 +70,7 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
- if (!isTenantActiveAndAccessible(asset)) {
+ if (!isTenantActiveAndAccessible(asset.getRealm())) {
LOG.fine("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java
index 8535567ec..088eda937 100644
--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java
@@ -70,7 +70,7 @@ public class AssetPredictedDatapointResourceImpl extends ManagerWebResource impl
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
- if (!isTenantActiveAndAccessible(asset)) {
+ if (!isTenantActiveAndAccessible(asset.getRealm())) {
LOG.fine("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
index 38421c30a..bd1ed14bd 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
@@ -154,8 +154,8 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
}
@Override
- public boolean isTenantActiveAndAccessible(AuthContext authContext, Asset asset) {
- return Objects.equals(asset.getRealm(), Constants.MASTER_REALM);
+ public boolean isTenantActiveAndAccessible(AuthContext authContext, String realm) {
+ return Objects.equals(realm, Constants.MASTER_REALM);
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
index e47435224..e8caa02a7 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
@@ -78,7 +78,7 @@ public interface ManagerIdentityProvider extends IdentityProvider {
boolean isTenantActiveAndAccessible(AuthContext authContext, Tenant tenant);
- boolean isTenantActiveAndAccessible(AuthContext authContext, Asset asset);
+ boolean isTenantActiveAndAccessible(AuthContext authContext, String realm);
boolean tenantExists(String realm);
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index bea921f6e..557bf27c5 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -406,11 +406,11 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
/**
* @return <code>true</code> if the user is the superuser (admin) or if the user is authenticated
- * in the same realm as the assets' realm and the tenant is active.
+ * in the same tenant and the tenant is active.
*/
@Override
- public boolean isTenantActiveAndAccessible(AuthContext authContext, Asset asset) {
- return isTenantActiveAndAccessible(authContext, getTenant(asset.getRealm()));
+ public boolean isTenantActiveAndAccessible(AuthContext authContext, String realm) {
+ return isTenantActiveAndAccessible(authContext, getTenant(realm));
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java
index 233ce4b18..82df845f9 100644
--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java
+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java
@@ -23,7 +23,6 @@ import org.openremote.container.timer.TimerService;
import org.openremote.container.web.WebResource;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.model.security.Tenant;
-import org.openremote.model.asset.Asset;
public class ManagerWebResource extends WebResource {
@@ -47,8 +46,8 @@ public class ManagerWebResource extends WebResource {
return identityService.getIdentityProvider().getTenant(getRequestRealm());
}
- public boolean isTenantActiveAndAccessible(Asset asset) {
- return identityService.getIdentityProvider().isTenantActiveAndAccessible(this, asset);
+ public boolean isTenantActiveAndAccessible(String realm) {
+ return identityService.getIdentityProvider().isTenantActiveAndAccessible(this, realm);
}
public boolean isTenantActiveAndAccessible(Tenant tenant) {
diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.java
index e1617b12b..8624e1f61 100644
--- a/model/src/main/java/org/openremote/model/Constants.java
+++ b/model/src/main/java/org/openremote/model/Constants.java
@@ -66,6 +66,7 @@ public interface Constants {
String UNITS_TEMPERATURE_CELCIUS = "CELCIUS";
String UNITS_TIME_MINUTES = "MINUTES";
+ String UNITS_TIME_SECONDS = "SECONDS";
String UNITS_SPEED_KNOTS = "KNOTS";
String UNITS_SPEED_KPH = "SPEED_KPH";
String UNITS_SPEED_MPS = "SPEED_MPS";