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
Syslog related updates and created constants for client roles
Rich Turnerb16c409cd17f
diff --git a/client/src/main/java/org/openremote/app/client/admin/AdminModule.java b/client/src/main/java/org/openremote/app/client/admin/AdminModule.javaindex 905e21dd7..5dfccfa3c 100644--- a/client/src/main/java/org/openremote/app/client/admin/AdminModule.java+++ b/client/src/main/java/org/openremote/app/client/admin/AdminModule.java@@ -35,9 +35,7 @@ import org.openremote.app.client.admin.users.AdminUsersImpl;import org.openremote.app.client.admin.users.edit.AdminUserEdit;import org.openremote.app.client.admin.users.edit.AdminUserEditActivity;import org.openremote.app.client.admin.users.edit.AdminUserEditImpl;-import org.openremote.model.notification.NotificationResource;import org.openremote.model.security.UserResource;-import org.openremote.model.syslog.SyslogResource;public class AdminModule extends AbstractGinModule {@@ -65,7 +63,7 @@ public class AdminModule extends AbstractGinModule {@Provides@Singleton- public native SyslogResource getSyslogResource() /*-{+ public native AdminSyslogActivity.GwtSyslogResource getSyslogResource() /*-{return $wnd.openremote.REST.SyslogResource;}-*/;diff --git a/client/src/main/java/org/openremote/app/client/admin/syslog/AdminSyslogActivity.java b/client/src/main/java/org/openremote/app/client/admin/syslog/AdminSyslogActivity.javaindex fa37c8dd8..c3e127de8 100644--- a/client/src/main/java/org/openremote/app/client/admin/syslog/AdminSyslogActivity.java+++ b/client/src/main/java/org/openremote/app/client/admin/syslog/AdminSyslogActivity.java@@ -19,6 +19,8 @@*/package org.openremote.app.client.admin.syslog;+import jsinterop.annotations.JsMethod;+import jsinterop.annotations.JsType;import org.openremote.app.client.Environment;import org.openremote.app.client.admin.AbstractAdminActivity;import org.openremote.app.client.admin.AdminView;@@ -26,15 +28,17 @@ import org.openremote.app.client.admin.navigation.AdminNavigation;import org.openremote.app.client.event.SharedEventArrayMapper;import org.openremote.app.client.event.ShowSuccessEvent;import org.openremote.app.client.mvp.AcceptsView;+import org.openremote.model.Constants;import org.openremote.model.event.bus.EventBus;import org.openremote.model.event.bus.EventRegistration;import org.openremote.model.event.shared.SharedEvent;-import org.openremote.model.syslog.SyslogConfig;-import org.openremote.model.syslog.SyslogEvent;-import org.openremote.model.syslog.SyslogLevel;-import org.openremote.model.syslog.SyslogResource;+import org.openremote.model.http.RequestParams;+import org.openremote.model.syslog.*;import javax.inject.Inject;+import javax.ws.rs.BeanParam;+import javax.ws.rs.QueryParam;+import javax.ws.rs.core.Response;import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -43,8 +47,15 @@ public class AdminSyslogActivityextends AbstractAdminActivity<AdminSyslogPlace, AdminSyslog>implements AdminSyslog.Presenter {+ // Crappy hack to keep GWT working+ @JsType(isNative = true)+ public interface GwtSyslogResource extends SyslogResource {+ @JsMethod(name = "getEvents")+ List<SyslogEvent> getEventsGwt(@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);+ }+final Environment environment;- final SyslogResource syslogResource;+ final GwtSyslogResource syslogResource;final SyslogConfigMapper syslogConfigMapper;final SharedEventArrayMapper sharedEventArrayMapper;@@ -57,7 +68,7 @@ public class AdminSyslogActivityAdminView adminView,AdminNavigation.Presenter adminNavigationPresenter,AdminSyslog view,- SyslogResource syslogResource,+ GwtSyslogResource syslogResource,SyslogConfigMapper syslogConfigMapper,SharedEventArrayMapper sharedEventArrayMapper) {super(adminView, adminNavigationPresenter, view);@@ -69,7 +80,7 @@ public class AdminSyslogActivity@Overrideprotected String[] getRequiredRoles() {- return new String[]{"read:admin"};+ return new String[]{Constants.READ_ADMIN_ROLE};}@Override@@ -166,7 +177,7 @@ public class AdminSyslogActivityadminContent.setFormBusy(true);environment.getApp().getRequests().sendAndReturn(sharedEventArrayMapper,- requestParams -> syslogResource.getEvents(requestParams, filterLevel, filterLimit),+ requestParams -> syslogResource.getEventsGwt(requestParams, filterLevel, filterLimit, null, null, null, null, null),200,events -> {List<SyslogEvent> syslogEvents = new ArrayList<>();diff --git a/client/src/main/java/org/openremote/app/client/admin/syslog/SyslogFilter.java b/client/src/main/java/org/openremote/app/client/admin/syslog/SyslogFilter.javaindex 8844d4c35..26696b784 100644--- a/client/src/main/java/org/openremote/app/client/admin/syslog/SyslogFilter.java+++ b/client/src/main/java/org/openremote/app/client/admin/syslog/SyslogFilter.java@@ -25,7 +25,6 @@ import org.openremote.app.client.i18n.ManagerMessages;import org.openremote.app.client.style.WidgetStyle;import org.openremote.model.syslog.SyslogLevel;-import static org.openremote.model.syslog.SyslogConfig.DEFAULT_LEVEL;import static org.openremote.model.syslog.SyslogConfig.DEFAULT_LIMIT;public abstract class SyslogFilter extends FlowPanel {@@ -107,7 +106,7 @@ public abstract class SyslogFilter extends FlowPanel {limitListBox.setSelectedIndex(2);break;}- levelListBox.setSelectedIndex(DEFAULT_LEVEL.ordinal());+ levelListBox.setSelectedIndex(0);setPaused(false);}diff --git a/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantActivity.java b/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantActivity.javaindex 26ce92663..6fd1b93a7 100644--- a/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantActivity.java+++ b/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantActivity.java@@ -27,6 +27,7 @@ import org.openremote.app.client.admin.navigation.AdminNavigation;import org.openremote.app.client.event.ShowSuccessEvent;import org.openremote.app.client.mvp.AcceptsView;import org.openremote.app.client.mvp.AppActivity;+import org.openremote.model.Constants;import org.openremote.model.event.bus.EventBus;import org.openremote.model.event.bus.EventRegistration;import org.openremote.model.http.ConstraintViolation;@@ -84,7 +85,7 @@ public class AdminTenantActivity@Overrideprotected String[] getRequiredRoles() {- return new String[]{"read:admin", "write:admin"};+ return new String[]{Constants.READ_ADMIN_ROLE, Constants.WRITE_ADMIN_ROLE};}@Overridediff --git a/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantsActivity.java b/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantsActivity.javaindex 89f5134f4..b01cb64cc 100644--- a/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantsActivity.java+++ b/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantsActivity.java@@ -25,6 +25,7 @@ import org.openremote.app.client.admin.AdminView;import org.openremote.app.client.admin.TenantArrayMapper;import org.openremote.app.client.admin.navigation.AdminNavigation;import org.openremote.app.client.mvp.AcceptsView;+import org.openremote.model.Constants;import org.openremote.model.event.bus.EventBus;import org.openremote.model.event.bus.EventRegistration;import org.openremote.model.security.Tenant;@@ -56,7 +57,7 @@ public class AdminTenantsActivity@Overrideprotected String[] getRequiredRoles() {- return new String[]{"read:admin"};+ return new String[]{Constants.READ_ADMIN_ROLE};}@Overridediff --git a/client/src/main/java/org/openremote/app/client/admin/users/AdminUsersActivity.java b/client/src/main/java/org/openremote/app/client/admin/users/AdminUsersActivity.javaindex 9558d8db2..0109f2ac4 100644--- a/client/src/main/java/org/openremote/app/client/admin/users/AdminUsersActivity.java+++ b/client/src/main/java/org/openremote/app/client/admin/users/AdminUsersActivity.java@@ -28,6 +28,7 @@ import org.openremote.app.client.admin.navigation.AdminNavigation;import org.openremote.app.client.admin.users.edit.AdminUserEditPlace;import org.openremote.app.client.mvp.AcceptsView;import org.openremote.app.client.mvp.AppActivity;+import org.openremote.model.Constants;import org.openremote.model.event.bus.EventBus;import org.openremote.model.event.bus.EventRegistration;import org.openremote.model.security.TenantResource;@@ -68,7 +69,7 @@ public class AdminUsersActivity@Overrideprotected String[] getRequiredRoles() {- return new String[]{"read:admin"};+ return new String[]{Constants.READ_ADMIN_ROLE};}@Overridediff --git a/client/src/main/java/org/openremote/app/client/admin/users/edit/AdminUserEditActivity.java b/client/src/main/java/org/openremote/app/client/admin/users/edit/AdminUserEditActivity.javaindex 3d7dfe274..1fee28e16 100644--- a/client/src/main/java/org/openremote/app/client/admin/users/edit/AdminUserEditActivity.java+++ b/client/src/main/java/org/openremote/app/client/admin/users/edit/AdminUserEditActivity.java@@ -26,6 +26,7 @@ import org.openremote.app.client.admin.users.AdminUsersPlace;import org.openremote.app.client.event.ShowSuccessEvent;import org.openremote.app.client.mvp.AcceptsView;import org.openremote.app.client.mvp.AppActivity;+import org.openremote.model.Constants;import org.openremote.model.event.bus.EventBus;import org.openremote.model.event.bus.EventRegistration;import org.openremote.model.http.ConstraintViolation;@@ -111,7 +112,7 @@ public class AdminUserEditActivity@Overrideprotected String[] getRequiredRoles() {- return new String[]{"read:admin", "write:admin"};+ return new String[]{Constants.READ_ADMIN_ROLE, Constants.WRITE_ADMIN_ROLE};}@Overridediff --git a/client/src/main/java/org/openremote/app/client/app/HeaderPresenter.java b/client/src/main/java/org/openremote/app/client/app/HeaderPresenter.javaindex fcb59a800..b429661c5 100644--- a/client/src/main/java/org/openremote/app/client/app/HeaderPresenter.java+++ b/client/src/main/java/org/openremote/app/client/app/HeaderPresenter.java@@ -165,31 +165,31 @@ public class HeaderPresenter implements HeaderView.Presenter {@Overridepublic boolean isMapEnabled() {- return app.getSecurity().hasResourceRoleOrIsSuperUser("read:map", Constants.KEYCLOAK_CLIENT_ID);+ return app.getSecurity().hasResourceRoleOrIsSuperUser(Constants.READ_MAP_ROLE, Constants.KEYCLOAK_CLIENT_ID);}@Overridepublic boolean isAssetsEnabled() {- return app.getSecurity().hasResourceRoleOrIsSuperUser("read:assets", Constants.KEYCLOAK_CLIENT_ID);+ return app.getSecurity().hasResourceRoleOrIsSuperUser(Constants.READ_ASSETS_ROLE, Constants.KEYCLOAK_CLIENT_ID);}@Overridepublic boolean isRulesEnabled() {- return app.getSecurity().hasResourceRoleOrIsSuperUser("read:rules", Constants.KEYCLOAK_CLIENT_ID);+ return app.getSecurity().hasResourceRoleOrIsSuperUser(Constants.READ_RULES_ROLE, Constants.KEYCLOAK_CLIENT_ID);}@Overridepublic boolean isNotificationsEnabled() {- return app.getSecurity().hasResourceRoleOrIsSuperUser("read:admin", Constants.KEYCLOAK_CLIENT_ID);+ return app.getSecurity().hasResourceRoleOrIsSuperUser(Constants.READ_ADMIN_ROLE, Constants.KEYCLOAK_CLIENT_ID);}@Overridepublic boolean isAppsEnabled() {- return app.getSecurity().hasResourceRoleOrIsSuperUser("read:consoles", Constants.KEYCLOAK_CLIENT_ID);+ return app.getSecurity().hasResourceRoleOrIsSuperUser(Constants.READ_APPS_ROLE, Constants.KEYCLOAK_CLIENT_ID);}@Overridepublic boolean isAdminEnabled() {- return app.getSecurity().hasResourceRoleOrIsSuperUser("read:admin", Constants.KEYCLOAK_CLIENT_ID);+ return app.getSecurity().hasResourceRoleOrIsSuperUser(Constants.READ_ADMIN_ROLE, Constants.KEYCLOAK_CLIENT_ID);}}diff --git a/client/src/main/java/org/openremote/app/client/assets/AssetBrowsingActivity.java b/client/src/main/java/org/openremote/app/client/assets/AssetBrowsingActivity.javaindex 32d4c3838..1583801db 100644--- a/client/src/main/java/org/openremote/app/client/assets/AssetBrowsingActivity.java+++ b/client/src/main/java/org/openremote/app/client/assets/AssetBrowsingActivity.java@@ -23,6 +23,7 @@ import com.google.gwt.place.shared.Place;import org.openremote.app.client.Environment;import org.openremote.app.client.assets.browser.AssetBrowser;import org.openremote.app.client.mvp.AppActivity;+import org.openremote.model.Constants;abstract public class AssetBrowsingActivity<P extends Place> extends AppActivity<P> {@@ -38,6 +39,6 @@ abstract public class AssetBrowsingActivity<P extends Place> extends AppActivity@Overrideprotected String[] getRequiredRoles() {- return new String[]{"read:assets"};+ return new String[]{Constants.READ_ASSETS_ROLE};}}diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.javaindex db7d1ce53..22f8af7fe 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java@@ -35,6 +35,7 @@ import org.openremote.app.client.widget.AttributeLinkEditor;import org.openremote.app.client.widget.AttributeRefEditor;import org.openremote.app.client.widget.FormButton;import org.openremote.app.client.widget.ValueEditors;+import org.openremote.model.Constants;import org.openremote.model.ValueHolder;import org.openremote.model.asset.*;import org.openremote.model.asset.agent.AgentLink;@@ -147,7 +148,7 @@ public class AssetEditActivity@Overrideprotected String[] getRequiredRoles() {- return new String[]{"read:assets", "write:assets"};+ return new String[]{Constants.READ_ASSETS_ROLE, Constants.WRITE_ASSETS_ROLE};}@Overridediff --git a/client/src/main/java/org/openremote/app/client/notifications/NotificationsActivity.java b/client/src/main/java/org/openremote/app/client/notifications/NotificationsActivity.javaindex 5bcd1f3ae..a9e9d8827 100644--- a/client/src/main/java/org/openremote/app/client/notifications/NotificationsActivity.java+++ b/client/src/main/java/org/openremote/app/client/notifications/NotificationsActivity.java@@ -35,6 +35,7 @@ import org.openremote.app.client.assets.browser.TenantTreeNode;import org.openremote.app.client.event.ShowSuccessEvent;import org.openremote.app.client.mvp.AcceptsView;import org.openremote.app.client.mvp.AppActivity;+import org.openremote.model.Constants;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetResource;import org.openremote.model.event.bus.EventBus;@@ -267,7 +268,7 @@ public class NotificationsActivity extends AssetBrowsingActivity<NotificationsPl@Overrideprotected String[] getRequiredRoles() {- return new String[]{"read:admin", "write:admin"};+ return new String[]{Constants.READ_ADMIN_ROLE, Constants.WRITE_ADMIN_ROLE};}@Overridediff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex 97a614f3a..87dfacefc 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -116,6 +116,16 @@"operator": "Operator","area": "Area","timestamp": "Timestamp",+ "level": "Level",+ "limit": "Limit",+ "live": "Live",+ "categories": "Categories",+ "subCategoryFilters": "Sub category filters",+ "category": "Category",+ "subCategory": "Sub category",+ "message": "Message",+ "warn": "Warning",+ "error": "Error""frequency": "Frequency","everyTime": "Every time","onlyOnce": "Only once",diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex ac78f816d..44d71d619 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -20,7 +20,6 @@package org.openremote.manager.rules;import com.fasterxml.jackson.core.JsonProcessingException;-import org.openremote.container.Container;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.concurrent.ManagerExecutorService;diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.javaindex bc2046052..dae77ec8c 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java@@ -25,6 +25,8 @@ import org.jeasy.rules.core.RuleBuilder;import java.util.ArrayList;import java.util.List;+import static org.openremote.manager.rules.RulesEngine.RULES_FIRED_LOG;+/*** Call {@link #add()} to add rules.*/@@ -111,7 +113,10 @@ public class RulesBuilder {throw new IllegalArgumentException("Error evaluating condition of rule '" + builder.name + "': result is not boolean but " + result);}})- .then(facts -> builder.action.execute((RulesFacts) facts)).build();+ .then(facts -> {+ RULES_FIRED_LOG.info("Rule fired '" + builder.name + "'");+ builder.action.execute((RulesFacts) facts);+ }).build();rules.add(rule);}return rules.toArray(new Rule[rules.size()]);diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex a81dc58f5..94de15e41 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -78,6 +78,9 @@ public class RulesEngine<T extends Ruleset> {// Separate logger for execution of rulespublic static final Logger RULES_LOG = Logger.getLogger("org.openremote.rules.Rules");+ // Separate logger for fired rules+ public static final Logger RULES_FIRED_LOG = Logger.getLogger("org.openremote.rules.RulesFired");+// Separate logger for periodic stats printerpublic static final Logger STATS_LOG = Logger.getLogger("org.openremote.rules.RulesEngineStats");diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.javaindex dfeb06a1e..e4ef20b36 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java@@ -20,16 +20,16 @@package org.openremote.manager.syslog;import org.openremote.container.web.WebResource;-import org.openremote.model.syslog.SyslogConfig;-import org.openremote.model.syslog.SyslogResource;import org.openremote.model.http.RequestParams;-import org.openremote.model.syslog.SyslogEvent;-import org.openremote.model.syslog.SyslogLevel;+import org.openremote.model.syslog.*;+import org.openremote.model.util.Pair;import javax.ws.rs.BeanParam;+import javax.ws.rs.core.Response;+import java.time.Instant;+import java.util.Collections;import java.util.List;-import static org.openremote.model.syslog.SyslogConfig.DEFAULT_LEVEL;import static org.openremote.model.syslog.SyslogConfig.DEFAULT_LIMIT;public class SyslogResourceImpl extends WebResource implements SyslogResource {@@ -41,12 +41,35 @@ public class SyslogResourceImpl extends WebResource implements SyslogResource {}@Override- public SyslogEvent[] getEvents(@BeanParam RequestParams requestParams, SyslogLevel level, Integer limit) {- List<SyslogEvent> events = syslogService.getLastStoredEvents(- level != null ? level : DEFAULT_LEVEL,- limit != null ? limit : DEFAULT_LIMIT+ public Response getEvents(@BeanParam RequestParams requestParams, SyslogLevel level, Integer perPage, Integer page, Long from, Long to, List<SyslogCategory> categories, List<String> subCategories) {++ perPage = perPage != null ? perPage : DEFAULT_LIMIT;+ page = page != null ? page : 1;++ Pair<Long, List<SyslogEvent>> result = syslogService.getEvents(+ level,+ perPage,+ page,+ from != null ? Instant.ofEpochMilli(from) : null,+ to != null ? Instant.ofEpochMilli(to) : null,+ categories,+ subCategories);- return events.toArray(new SyslogEvent[events.size()]);++ if (result == null) {+ return Response.ok(Collections.emptyList()).build();+ }++ long lastPage = (result.key / perPage) + 1L;+ Response.ResponseBuilder rb = Response.ok(result.value.toArray(new SyslogEvent[0]));++ if (page != lastPage) {+ rb.link(requestParams.uriInfo.getRequestUriBuilder().replaceQueryParam("page", page + 1).build(), "next");+ }++ rb.link(requestParams.uriInfo.getRequestUriBuilder().replaceQueryParam("page", lastPage).build(), "last");++ return rb.build();}@Overridediff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.javaindex 0015712d6..b7dad3baa 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java@@ -22,24 +22,29 @@ package org.openremote.manager.syslog;import org.openremote.container.Container;import org.openremote.container.ContainerService;import org.openremote.container.persistence.PersistenceService;-import org.openremote.container.web.WebService;import org.openremote.manager.concurrent.ManagerExecutorService;import org.openremote.manager.event.ClientEventService;import org.openremote.manager.web.ManagerWebService;-import org.openremote.model.syslog.SyslogConfig;+import org.openremote.model.Constants;import org.openremote.model.syslog.SyslogCategory;+import org.openremote.model.syslog.SyslogConfig;import org.openremote.model.syslog.SyslogEvent;import org.openremote.model.syslog.SyslogLevel;+import org.openremote.model.util.Pair;-import java.util.ArrayList;-import java.util.Arrays;-import java.util.Collections;-import java.util.List;+import javax.persistence.Query;+import javax.persistence.TypedQuery;+import java.time.Instant;+import java.time.temporal.ChronoUnit;+import java.util.*;import java.util.concurrent.ScheduledFuture;+import java.util.concurrent.atomic.AtomicLong;import java.util.logging.Handler;import java.util.logging.LogRecord;import java.util.logging.Logger;+import static org.openremote.model.syslog.SyslogConfig.DEFAULT_LIMIT;+/*** Act as a JUL handler, publishes (some) log messages on the client event bus, stores* (some, depending on {@link SyslogConfig}) log messages in the database.@@ -78,7 +83,7 @@ public class SyslogService extends Handler implements ContainerService {if (clientEventService != null) {clientEventService.addSubscriptionAuthorizer((auth, subscription) -> {// Only superuser can get logging events- return subscription.isEventType(SyslogEvent.class) && auth.isSuperUser();+ return subscription.isEventType(SyslogEvent.class) && auth.hasResourceRole(Constants.READ_RULES_ROLE, Constants.KEYCLOAK_CLIENT_ID);});}@@ -112,7 +117,7 @@ public class SyslogService extends Handler implements ContainerService {persistenceService.doTransaction(em -> {em.createQuery("delete from SyslogEvent e " +- "where to_timestamp(e.timestamp/1000) < now() - make_interval(0, 0, 0, 0, 0, :minutes, 0)"+ "where e.timestamp < now() - make_interval(0, 0, 0, 0, 0, :minutes, 0)").setParameter("minutes", maxAgeMinutes).executeUpdate();});}, 60 * 1000, 60 * 1000);@@ -170,17 +175,74 @@ public class SyslogService extends Handler implements ContainerService {}}- public List<SyslogEvent> getLastStoredEvents(SyslogLevel level, final int limit) {+ public Pair<Long, List<SyslogEvent>> getEvents(SyslogLevel level, int perPage, int page, Instant from, Instant to, List<SyslogCategory> categories, List<String> subCategories) {if (persistenceService == null)- return new ArrayList<>();- return persistenceService.doReturningTransaction(em -> {- List<SyslogEvent> list = em.createQuery(- "select e from SyslogEvent e where e.level >= :level order by e.timestamp desc",- SyslogEvent.class- ).setParameter("level", level).setMaxResults(limit).getResultList();- Collections.reverse(list);- return list;+ return null;++ if (to == null) {+ to = Instant.now();+ }+ if (from == null) {+ from = to.minus(1, ChronoUnit.HOURS);+ }++ Date fromDate = Date.from(from);+ Date toDate = Date.from(to);+ AtomicLong count = new AtomicLong();++ List<SyslogEvent> events = persistenceService.doReturningTransaction(em -> {+ StringBuilder sb = new StringBuilder("from SyslogEvent e where e.timestamp >= :from and e.timestamp <= :to");+ if (level != null) {+ sb.append(" and e.level >= :level");+ }+ if (categories != null && !categories.isEmpty()) {+ sb.append(" and e.category in :categories");+ }+ if (subCategories != null && !subCategories.isEmpty()) {+ sb.append(" and e.subCategory in :subCategories");+ }++ TypedQuery<Long> countQuery = em.createQuery("select count(e.id) " + sb.toString(), Long.class);+ countQuery.setParameter("from", fromDate);+ countQuery.setParameter("to", toDate);+ if (level != null) {+ countQuery.setParameter("level", level);+ }+ if (categories != null && !categories.isEmpty()) {+ countQuery.setParameter("categories", categories);+ }+ if (subCategories != null && !subCategories.isEmpty()) {+ countQuery.setParameter("subCategories", subCategories);+ }+ count.set(countQuery.getSingleResult());++ if (count.get() == 0L) {+ return Collections.emptyList();+ }++ sb.append(" order by e.timestamp desc");+ TypedQuery<SyslogEvent> query = em.createQuery("select e " + sb.toString(), SyslogEvent.class);++ query.setParameter("from", fromDate);+ query.setParameter("to", toDate);+ if (level != null) {+ query.setParameter("level", level);+ }+ if (categories != null && !categories.isEmpty()) {+ query.setParameter("categories", categories);+ }+ if (subCategories != null && !subCategories.isEmpty()) {+ query.setParameter("subCategories", subCategories);+ }++ query.setMaxResults(perPage);+ if (page > 1) {+ query.setFirstResult(((page-1) * perPage) + 1);+ }+ return query.getResultList();});++ return new Pair<>(count.get(), events);}protected void store(SyslogEvent syslogEvent) {diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.javaindex 6ff1433a8..8835cd70b 100644--- a/model/src/main/java/org/openremote/model/Constants.java+++ b/model/src/main/java/org/openremote/model/Constants.java@@ -25,6 +25,17 @@ public interface Constants {String MASTER_REALM = "master";String MASTER_REALM_ADMIN_USER = "admin";String REALM_ADMIN_ROLE = "admin";+ String READ_LOGS_ROLE = "read:logs";+ String READ_ADMIN_ROLE = "read:admin";+ String READ_MAP_ROLE = "read:map";+ String READ_ASSETS_ROLE = "read:assets";+ String READ_RULES_ROLE = "read:rules";+ String READ_APPS_ROLE = "read:apps";+ String WRITE_USER_ROLE = "write:user";+ String WRITE_ADMIN_ROLE = "write:admin";+ String WRITE_LOGS_ROLE = "write:logs";+ String WRITE_ASSETS_ROLE = "write:assets";+ String WRITE_RULES_ROLE = "write:rules";String AUTH_CONTEXT = "AUTH_CONTEXT";int ACCESS_TOKEN_LIFESPAN_SECONDS = 60; // 1 minuteString PERSISTENCE_SEQUENCE_ID_GENERATOR = "SEQUENCE_ID_GENERATOR";diff --git a/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java b/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.javaindex 1f0aa18b5..d36c036de 100644--- a/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java+++ b/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java@@ -20,6 +20,7 @@package org.openremote.model.apps;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.http.SuccessStatusCode;@@ -42,7 +43,7 @@ public interface ConsoleAppResource {@GET@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:consoles"})+ @RolesAllowed({Constants.READ_APPS_ROLE})@SuppressWarnings("unusable-by-js")String[] getInstalledApps(@BeanParam RequestParams requestParams);diff --git a/model/src/main/java/org/openremote/model/asset/AssetResource.java b/model/src/main/java/org/openremote/model/asset/AssetResource.javaindex dd58fdfb7..177469b53 100644--- a/model/src/main/java/org/openremote/model/asset/AssetResource.java+++ b/model/src/main/java/org/openremote/model/asset/AssetResource.java@@ -20,6 +20,7 @@package org.openremote.model.asset;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.attribute.AttributeRef;import org.openremote.model.attribute.MetaItemType;import org.openremote.model.http.RequestParams;@@ -85,7 +86,7 @@ public interface AssetResource {@Path("user/current")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")Asset[] getCurrentUserAssets(@BeanParam RequestParams requestParams);@@ -106,7 +107,7 @@ public interface AssetResource {@Path("user/link")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")UserAsset[] getUserAssetLinks(@BeanParam RequestParams requestParams,@QueryParam("realm") String realm,@@ -125,7 +126,7 @@ public interface AssetResource {@Path("user/link")@Consumes(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"write:assets"})+ @RolesAllowed({Constants.WRITE_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")void createUserAsset(@BeanParam RequestParams requestParams, UserAsset userAsset);@@ -142,7 +143,7 @@ public interface AssetResource {@DELETE@Path("link/{realm}/{userId}/{assetId}")@SuccessStatusCode(204)- @RolesAllowed({"write:assets"})+ @RolesAllowed({Constants.WRITE_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")void deleteUserAsset(@BeanParam RequestParams requestParams,@PathParam("realm") String realm,@@ -159,7 +160,7 @@ public interface AssetResource {@Path("{assetId}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")Asset get(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId);@@ -170,7 +171,7 @@ public interface AssetResource {@Path("partial/{assetId}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")Asset getPartial(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId);@@ -188,7 +189,7 @@ public interface AssetResource {@Path("{assetId}")@Consumes(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:assets"})+ @RolesAllowed({Constants.WRITE_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")void update(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId, @Valid Asset asset);@@ -227,7 +228,7 @@ public interface AssetResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"write:assets"})+ @RolesAllowed({Constants.WRITE_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")Asset create(@BeanParam RequestParams requestParams, @Valid Asset asset);@@ -240,7 +241,7 @@ public interface AssetResource {@DELETE@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:assets"})+ @RolesAllowed({Constants.WRITE_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")void delete(@BeanParam RequestParams requestParams, @QueryParam("assetId") List<String> assetIds);@@ -258,7 +259,7 @@ public interface AssetResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")Asset[] queryAssets(@BeanParam RequestParams requestParams, AssetQuery query);diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentResource.java b/model/src/main/java/org/openremote/model/asset/agent/AgentResource.javaindex 2502f7a5b..1f534efd2 100644--- a/model/src/main/java/org/openremote/model/asset/agent/AgentResource.java+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentResource.java@@ -20,6 +20,7 @@package org.openremote.model.asset.agent;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetAttribute;import org.openremote.model.asset.AssetResource;@@ -54,7 +55,7 @@ public interface AgentResource {@Path("protocol/{agentId}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")ProtocolDescriptor[] getSupportedProtocols(@BeanParam RequestParams requestParams,@@ -68,7 +69,7 @@ public interface AgentResource {@Path("status/{agentId}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")List<AgentStatusEvent> getAgentStatus(@BeanParam RequestParams requestParams,@@ -82,7 +83,7 @@ public interface AgentResource {@Path("protocol")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")Map<String, ProtocolDescriptor[]> getAllSupportedProtocols(@BeanParam RequestParams requestParams@@ -95,7 +96,7 @@ public interface AgentResource {@Path("configuration/{agentId}/{protocolName}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")AssetAttribute[] getDiscoveredProtocolConfigurations(@BeanParam RequestParams requestParams,diff --git a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.javaindex 97d44a33d..4b0b363c8 100644--- a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java+++ b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java@@ -20,6 +20,7 @@package org.openremote.model.datapoint;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.http.SuccessStatusCode;import org.openremote.model.value.Value;@@ -44,7 +45,7 @@ public interface AssetDatapointResource {@Path("{assetId}/attribute/{attributeName}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:assets"})+ @RolesAllowed({Constants.READ_ASSETS_ROLE})@SuppressWarnings("unusable-by-js")ValueDatapoint[] getDatapoints(@BeanParam RequestParams requestParams,@PathParam("assetId") String assetId,diff --git a/model/src/main/java/org/openremote/model/http/RequestParams.java b/model/src/main/java/org/openremote/model/http/RequestParams.javaindex 03546e244..68b8be40b 100644--- a/model/src/main/java/org/openremote/model/http/RequestParams.java+++ b/model/src/main/java/org/openremote/model/http/RequestParams.java@@ -19,14 +19,17 @@*/package org.openremote.model.http;+import javaemul.internal.annotations.GwtIncompatible;import jsinterop.annotations.JsIgnore;import jsinterop.annotations.JsProperty;import jsinterop.annotations.JsType;import org.openremote.model.interop.Function;import javax.ws.rs.HeaderParam;+import javax.ws.rs.core.Context;import javax.ws.rs.core.HttpHeaders;import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.UriInfo;@JsTypepublic class RequestParams<IN, OUT> {@@ -35,6 +38,11 @@ public class RequestParams<IN, OUT> {@JsProperty(name = HttpHeaders.AUTHORIZATION)public String authorization;+ @JsIgnore+ @Context+ @GwtIncompatible+ public UriInfo uriInfo;+@JsProperty(name = "$entity")public String entity;diff --git a/model/src/main/java/org/openremote/model/notification/NotificationResource.java b/model/src/main/java/org/openremote/model/notification/NotificationResource.javaindex d003d21ce..395d19097 100644--- a/model/src/main/java/org/openremote/model/notification/NotificationResource.java+++ b/model/src/main/java/org/openremote/model/notification/NotificationResource.java@@ -20,6 +20,7 @@package org.openremote.model.notification;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.http.SuccessStatusCode;import org.openremote.model.value.Value;@@ -45,7 +46,7 @@ public interface NotificationResource {@GET@SuccessStatusCode(200)@Produces(APPLICATION_JSON)- @RolesAllowed({"read:admin"})+ @RolesAllowed({Constants.READ_ADMIN_ROLE})@SuppressWarnings("unusable-by-js")SentNotification[] getNotifications(@BeanParam RequestParams requestParams,@QueryParam("id") Long id,@@ -76,7 +77,7 @@ public interface NotificationResource {*/@DELETE@SuccessStatusCode(204)- @RolesAllowed({"write:admin"})+ @RolesAllowed({Constants.WRITE_ADMIN_ROLE})@SuppressWarnings("unusable-by-js")void removeNotifications(@BeanParam RequestParams requestParams,@QueryParam("id") Long id,@@ -105,7 +106,7 @@ public interface NotificationResource {@DELETE@Path("{notificationId}")@SuccessStatusCode(204)- @RolesAllowed({"write:admin"})+ @RolesAllowed({Constants.WRITE_ADMIN_ROLE})@SuppressWarnings("unusable-by-js")void removeNotification(@BeanParam RequestParams requestParams,@PathParam("notificationId") Long notificationId);diff --git a/model/src/main/java/org/openremote/model/rules/RulesResource.java b/model/src/main/java/org/openremote/model/rules/RulesResource.javaindex 1ed3a32e9..35f8ff21d 100644--- a/model/src/main/java/org/openremote/model/rules/RulesResource.java+++ b/model/src/main/java/org/openremote/model/rules/RulesResource.java@@ -20,6 +20,7 @@package org.openremote.model.rules;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.http.SuccessStatusCode;import org.openremote.model.rules.geofence.GeofenceDefinition;@@ -40,7 +41,7 @@ public interface RulesResource {@GET@Path("info/global")@SuccessStatusCode(200)- @RolesAllowed({"read:rules"})+ @RolesAllowed({Constants.READ_RULES_ROLE})@SuppressWarnings("unusable-by-js")RulesEngineInfo getGlobalEngineInfo(@BeanParam RequestParams requestParams);@@ -50,7 +51,7 @@ public interface RulesResource {@GET@Path("info/tenant/{realm}")@SuccessStatusCode(200)- @RolesAllowed({"read:rules"})+ @RolesAllowed({Constants.READ_RULES_ROLE})@SuppressWarnings("unusable-by-js")RulesEngineInfo getTenantEngineInfo(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);@@ -60,7 +61,7 @@ public interface RulesResource {@GET@Path("info/asset/{assetId}")@SuccessStatusCode(200)- @RolesAllowed({"read:rules"})+ @RolesAllowed({Constants.READ_RULES_ROLE})@SuppressWarnings("unusable-by-js")RulesEngineInfo getAssetEngineInfo(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId);@@ -71,7 +72,7 @@ public interface RulesResource {@GET@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:rules"})+ @RolesAllowed({Constants.READ_RULES_ROLE})@SuppressWarnings("unusable-by-js")GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, @QueryParam("language")Ruleset.Lang language, @QueryParam("fullyPopulate") boolean fullyPopulate);@@ -109,7 +110,7 @@ public interface RulesResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")long createGlobalRuleset(@BeanParam RequestParams requestParams, @Valid GlobalRuleset ruleset);@@ -121,7 +122,7 @@ public interface RulesResource {@Path("{id}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:rules"})+ @RolesAllowed({Constants.READ_RULES_ROLE})@SuppressWarnings("unusable-by-js")GlobalRuleset getGlobalRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);@@ -133,7 +134,7 @@ public interface RulesResource {@Path("{id}")@Consumes(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")void updateGlobalRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id, @Valid GlobalRuleset ruleset);@@ -145,7 +146,7 @@ public interface RulesResource {@Path("{id}")@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")void deleteGlobalRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);@@ -160,7 +161,7 @@ public interface RulesResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")long createTenantRuleset(@BeanParam RequestParams requestParams, @Valid TenantRuleset ruleset);@@ -172,7 +173,7 @@ public interface RulesResource {@Path("tenant/{id}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:rules"})+ @RolesAllowed({Constants.READ_RULES_ROLE})@SuppressWarnings("unusable-by-js")TenantRuleset getTenantRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);@@ -184,7 +185,7 @@ public interface RulesResource {@Path("tenant/{id}")@Consumes(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")void updateTenantRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id, @Valid TenantRuleset ruleset);@@ -196,7 +197,7 @@ public interface RulesResource {@Path("tenant/{id}")@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")void deleteTenantRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);@@ -212,7 +213,7 @@ public interface RulesResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")long createAssetRuleset(@BeanParam RequestParams requestParams, @Valid AssetRuleset ruleset);@@ -225,7 +226,7 @@ public interface RulesResource {@Path("asset/{id}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")AssetRuleset getAssetRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);@@ -238,7 +239,7 @@ public interface RulesResource {@Path("asset/{id}")@Consumes(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")void updateAssetRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id, @Valid AssetRuleset ruleset);@@ -251,7 +252,7 @@ public interface RulesResource {@Path("asset/{id}")@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed({"write:rules"})+ @RolesAllowed({Constants.WRITE_RULES_ROLE})@SuppressWarnings("unusable-by-js")void deleteAssetRuleset(@BeanParam RequestParams requestParams, @PathParam("id") Long id);diff --git a/model/src/main/java/org/openremote/model/security/ClientRole.java b/model/src/main/java/org/openremote/model/security/ClientRole.javaindex 51684bed5..c2223bdd1 100644--- a/model/src/main/java/org/openremote/model/security/ClientRole.java+++ b/model/src/main/java/org/openremote/model/security/ClientRole.java@@ -19,7 +19,9 @@*/package org.openremote.model.security;+import com.fasterxml.jackson.annotation.JsonValue;import org.keycloak.representations.idm.RoleRepresentation;+import org.openremote.model.Constants;import java.util.ArrayList;import java.util.HashSet;@@ -31,28 +33,32 @@ import java.util.Set;*/public enum ClientRole {- READ_ADMIN("read:admin", "Read system settings, tenants, and users"),- READ_MAP("read:map", "View map"),- READ_ASSETS("read:assets", "Read asset data"),- READ_RULES("read:rules", "Read rulesets"),- READ_CONSOLES("read:consoles", "Read installed console applications"),+ READ_ADMIN(Constants.READ_ADMIN_ROLE, "Read system settings, tenants, and users"),+ READ_LOGS(Constants.READ_LOGS_ROLE, "Read logs and log settings"),+ READ_MAP(Constants.READ_MAP_ROLE, "View map"),+ READ_ASSETS(Constants.READ_ASSETS_ROLE, "Read asset data"),+ READ_RULES(Constants.READ_RULES_ROLE, "Read rulesets"),+ READ_APPS(Constants.READ_APPS_ROLE, "Read installed applications"),- WRITE_USER("write:user", "Write data of the authenticated user"),- WRITE_ADMIN("write:admin", "Write system settings, tenants, and users"),- WRITE_ASSETS("write:assets", "Write asset data"),- WRITE_RULES("write:rules", "Write rulesets (NOTE: effectively super-user access!)"),+ WRITE_USER(Constants.WRITE_USER_ROLE, "Write data of the authenticated user"),+ WRITE_ADMIN(Constants.WRITE_ADMIN_ROLE, "Write system settings, tenants, and users"),+ WRITE_LOGS(Constants.WRITE_LOGS_ROLE, "Write log settings"),+ WRITE_ASSETS(Constants.WRITE_ASSETS_ROLE, "Write asset data"),+ WRITE_RULES(Constants.WRITE_RULES_ROLE, "Write rulesets (NOTE: effectively super-user access!)"),READ("read", "Read all data", new ClientRole[]{READ_ADMIN,+ READ_LOGS,READ_MAP,READ_ASSETS,READ_RULES,- READ_CONSOLES+ READ_APPS}),WRITE("write", "Write all data", new ClientRole[]{WRITE_USER,WRITE_ADMIN,+ WRITE_LOGS,WRITE_ASSETS,WRITE_RULES});@@ -82,6 +88,7 @@ public enum ClientRole {this.composites = null;}+ @JsonValuepublic String getValue() {return value;}diff --git a/model/src/main/java/org/openremote/model/security/TenantResource.java b/model/src/main/java/org/openremote/model/security/TenantResource.javaindex a46d62dc7..bbbfb4439 100644--- a/model/src/main/java/org/openremote/model/security/TenantResource.java+++ b/model/src/main/java/org/openremote/model/security/TenantResource.java@@ -20,6 +20,7 @@package org.openremote.model.security;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.http.SuccessStatusCode;import org.openremote.model.security.Tenant;@@ -44,7 +45,7 @@ public interface TenantResource {@GET@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed("read:admin")+ @RolesAllowed(Constants.READ_LOGS_ROLE)@SuppressWarnings("unusable-by-js")Tenant[] getAll(@BeanParam RequestParams requestParams);@@ -63,7 +64,7 @@ public interface TenantResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed("write:admin")+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")void update(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @Valid Tenant tenant);@@ -71,7 +72,7 @@ public interface TenantResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed("write:admin")+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")void create(@BeanParam RequestParams requestParams, @Valid Tenant tenant);@@ -79,7 +80,7 @@ public interface TenantResource {@Path("{realm}")@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed("write:admin")+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")void delete(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);}diff --git a/model/src/main/java/org/openremote/model/security/UserResource.java b/model/src/main/java/org/openremote/model/security/UserResource.javaindex 121453993..d886156e2 100644--- a/model/src/main/java/org/openremote/model/security/UserResource.java+++ b/model/src/main/java/org/openremote/model/security/UserResource.java@@ -20,6 +20,7 @@package org.openremote.model.security;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.http.SuccessStatusCode;@@ -44,7 +45,7 @@ public interface UserResource {@Produces(APPLICATION_JSON)@Path("{realm}")@SuccessStatusCode(200)- @RolesAllowed("read:admin")+ @RolesAllowed(Constants.READ_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")User[] getAll(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);@@ -52,7 +53,7 @@ public interface UserResource {@Path("{realm}/{userId}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed("read:admin")+ @RolesAllowed(Constants.READ_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")User get(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId);@@ -61,7 +62,7 @@ public interface UserResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed("write:admin")+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")void update(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId, @Valid User user);@@ -70,7 +71,7 @@ public interface UserResource {@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed("write:admin")+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")void create(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @Valid User user);@@ -78,7 +79,7 @@ public interface UserResource {@Path("{realm}/{userId}")@Produces(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed("write:admin")+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")void delete(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId);@@ -87,7 +88,7 @@ public interface UserResource {@SuccessStatusCode(204)@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)- @RolesAllowed("write:admin")+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")void resetPassword(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId, Credential credential);@@ -95,7 +96,7 @@ public interface UserResource {@Path("{realm}/{userId}/role")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed("read:admin")+ @RolesAllowed(Constants.READ_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")Role[] getRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId);@@ -103,7 +104,7 @@ public interface UserResource {@Path("{realm}/{userId}/role")@Consumes(APPLICATION_JSON)@SuccessStatusCode(204)- @RolesAllowed("write:admin")+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)@SuppressWarnings("unusable-by-js")void updateRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId, Role[] roles);}diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java b/model/src/main/java/org/openremote/model/syslog/SyslogCategory.javaindex 473325be7..e3cace62c 100644--- a/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java+++ b/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java@@ -49,7 +49,8 @@ public enum SyslogCategory {"RulesEngine","RuleExecutionLogger","Rules",- "RulesEngineStats"+ "RulesEngineStats",+ "RulesFired"),PROTOCOL("Protocol",diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogConfig.java b/model/src/main/java/org/openremote/model/syslog/SyslogConfig.javaindex 9d4488be3..10b63baec 100644--- a/model/src/main/java/org/openremote/model/syslog/SyslogConfig.java+++ b/model/src/main/java/org/openremote/model/syslog/SyslogConfig.java@@ -26,7 +26,6 @@ import java.util.Arrays;public class SyslogConfig {- public static final SyslogLevel DEFAULT_LEVEL = SyslogLevel.INFO;public static final int DEFAULT_LIMIT = 50;@NotNulldiff --git a/model/src/main/java/org/openremote/model/syslog/SyslogResource.java b/model/src/main/java/org/openremote/model/syslog/SyslogResource.javaindex c6c8db5d3..c672154de 100644--- a/model/src/main/java/org/openremote/model/syslog/SyslogResource.java+++ b/model/src/main/java/org/openremote/model/syslog/SyslogResource.java@@ -19,13 +19,17 @@*/package org.openremote.model.syslog;+import com.google.gwt.core.shared.GwtIncompatible;import jsinterop.annotations.JsType;+import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.http.SuccessStatusCode;import javax.annotation.security.RolesAllowed;import javax.validation.Valid;import javax.ws.rs.*;+import javax.ws.rs.core.Response;+import java.util.List;import static javax.ws.rs.core.MediaType.APPLICATION_JSON;@@ -36,14 +40,15 @@ public interface SyslogResource {@GET@Path("event")@Produces(APPLICATION_JSON)- @RolesAllowed({"read:admin"})- @SuppressWarnings("unusable-by-js")- SyslogEvent[] getEvents(@BeanParam RequestParams requestParams, @QueryParam("level") SyslogLevel level, @QueryParam("limit") Integer limit);+ @RolesAllowed({Constants.READ_RULES_ROLE})+ @SuppressWarnings({"unusable-by-js"})+ @GwtIncompatible+ 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);@DELETE@Path("event")@SuccessStatusCode(204)- @RolesAllowed({"write:admin"})+ @RolesAllowed({Constants.WRITE_ADMIN_ROLE})@SuppressWarnings("unusable-by-js")void clearEvents(@BeanParam RequestParams requestParams);@@ -51,7 +56,7 @@ public interface SyslogResource {@Path("config")@SuccessStatusCode(200)@Consumes(APPLICATION_JSON)- @RolesAllowed({"read:admin"})+ @RolesAllowed({Constants.READ_ADMIN_ROLE})@SuppressWarnings("unusable-by-js")SyslogConfig getConfig(@BeanParam RequestParams requestParams);@@ -59,8 +64,7 @@ public interface SyslogResource {@Path("config")@SuccessStatusCode(204)@Consumes(APPLICATION_JSON)- @RolesAllowed({"write:admin"})+ @RolesAllowed({Constants.WRITE_ADMIN_ROLE})@SuppressWarnings("unusable-by-js")void updateConfig(@BeanParam RequestParams requestParams, @Valid SyslogConfig config);-}diff --git a/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.java b/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.javaindex 98d0317d5..2fe47c0a9 100644--- a/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.java+++ b/test/src/main/groovy/org/openremote/test/protocol/http/TestResource.java@@ -31,7 +31,7 @@ public interface TestResource {@POST@Consumes(APPLICATION_JSON)- @RolesAllowed({"write:assets"})+ @RolesAllowed({Constants.WRITE_ASSETS_ROLE})void postAsset(Asset asset);@GET