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
Implemented public websocket connections, moved public asset query into standard asset query
Rich Turner9a7cc539af39
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.javaindex d3cc4adee..5f57fd463 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java@@ -33,6 +33,7 @@ import org.openremote.agent.protocol.AbstractProtocol;import org.openremote.container.json.JacksonConfig;import org.openremote.container.security.IdentityService;import org.openremote.container.web.*;+import org.openremote.model.Constants;import org.openremote.model.Container;import org.openremote.model.asset.agent.Agent;import org.openremote.model.asset.agent.AgentLink;@@ -49,7 +50,6 @@ import java.util.regex.Pattern;import java.util.stream.Collectors;import static org.openremote.container.web.WebService.pathStartsWithHandler;-import static org.openremote.model.Constants.REQUEST_HEADER_REALM;import static org.openremote.model.syslog.SyslogCategory.PROTOCOL;/**@@ -290,7 +290,7 @@ public abstract class AbstractHTTPServerProtocol<T extends AbstractHTTPServerPro// Wrap the handler to inject the realmHttpHandler handlerWrapper = exchange -> {- exchange.getRequestHeaders().put(HttpString.tryFromString(REQUEST_HEADER_REALM), agentRealm);+ exchange.getRequestHeaders().put(HttpString.tryFromString(Constants.REALM_PARAM_NAME), agentRealm);httpHandler.handleRequest(exchange);};WebService.RequestHandler requestHandler = pathStartsWithHandler(deploymentInfo.getDeploymentName(), deploymentInfo.getContextPath(), handlerWrapper);diff --git a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOClient.java b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOClient.javaindex 5a7715c6d..55f115efc 100644--- a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOClient.java@@ -162,7 +162,7 @@ public abstract class AbstractNettyIOClient<T, U extends SocketAddress> implemenprivate static final Logger LOG = SyslogCategory.getLogger(PROTOCOL, AbstractNettyIOClient.class);protected final List<Consumer<T>> messageConsumers = new ArrayList<>();- protected final List<Consumer<ConnectionStatus>> connectionStatusConsumers = new ArrayList<>();+ protected final List<Consumer<ConnectionStatus>> connectionStatusConsumers = new CopyOnWriteArrayList<>();protected ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED;protected ChannelFuture channelStartFuture;protected Channel channel;@@ -366,25 +366,19 @@ public abstract class AbstractNettyIOClient<T, U extends SocketAddress> implemen@Overridepublic void addConnectionStatusConsumer(Consumer<ConnectionStatus> connectionStatusConsumer) {- synchronized (connectionStatusConsumers) {- if (!connectionStatusConsumers.contains(connectionStatusConsumer)) {- connectionStatusConsumers.add(connectionStatusConsumer);- }+ if (!connectionStatusConsumers.contains(connectionStatusConsumer)) {+ connectionStatusConsumers.add(connectionStatusConsumer);}}@Overridepublic void removeConnectionStatusConsumer(Consumer<ConnectionStatus> connectionStatusConsumer) {- synchronized (connectionStatusConsumers) {- connectionStatusConsumers.remove(connectionStatusConsumer);- }+ connectionStatusConsumers.remove(connectionStatusConsumer);}@Overridepublic void removeAllConnectionStatusConsumers() {- synchronized (connectionStatusConsumers) {- connectionStatusConsumers.clear();- }+ connectionStatusConsumers.clear();}@Override@@ -456,16 +450,14 @@ public abstract class AbstractNettyIOClient<T, U extends SocketAddress> implementhis.connectionStatus = connectionStatus;executorService.submit(() -> {- synchronized (connectionStatusConsumers) {- connectionStatusConsumers.forEach(- consumer -> {- try {- consumer.accept(connectionStatus);- } catch (Exception e) {- LOG.log(Level.WARNING, "Connection status change handler threw an exception: " + getClientUri(), e);- }- });- }+ connectionStatusConsumers.forEach(+ consumer -> {+ try {+ consumer.accept(connectionStatus);+ } catch (Exception e) {+ LOG.log(Level.WARNING, "Connection status change handler threw an exception: " + getClientUri(), e);+ }+ });});}diff --git a/container/src/main/java/org/openremote/container/security/AuthOverloadHandler.java b/container/src/main/java/org/openremote/container/security/AuthOverloadHandler.javaindex 10aa99204..81f84e1cc 100644--- a/container/src/main/java/org/openremote/container/security/AuthOverloadHandler.java+++ b/container/src/main/java/org/openremote/container/security/AuthOverloadHandler.java@@ -26,12 +26,12 @@ import io.undertow.util.HttpString;import java.util.Deque;import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;-import static org.openremote.model.Constants.REQUEST_HEADER_REALM;+import static org.openremote.model.Constants.REALM_PARAM_NAME;/*** If a client can't set Authorization header (e.g. Javascript websocket API), use a request* parameter. This handler grabs the parameter and sets it as a regular header. This handler- * will also grab {@link org.openremote.model.Constants#REQUEST_HEADER_REALM} as+ * will also grab {@link org.openremote.model.Constants#REALM_PARAM_NAME} as* a request parameter and set it as a regular header.*/public class AuthOverloadHandler implements HttpHandler {@@ -49,9 +49,9 @@ public class AuthOverloadHandler implements HttpHandler {exchange.getRequestHeaders().put(HttpString.tryFromString(AUTHORIZATION), authParameter.pollFirst());}- Deque<String> authRealmParameter = exchange.getQueryParameters().get(REQUEST_HEADER_REALM);+ Deque<String> authRealmParameter = exchange.getQueryParameters().get(REALM_PARAM_NAME);if (authRealmParameter != null && authRealmParameter.peekFirst() != null) {- exchange.getRequestHeaders().put(HttpString.tryFromString(REQUEST_HEADER_REALM), authRealmParameter.pollFirst());+ exchange.getRequestHeaders().put(HttpString.tryFromString(REALM_PARAM_NAME), authRealmParameter.pollFirst());}next.handleRequest(exchange);diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.javaindex dde1de044..c7ddf1c13 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java@@ -186,7 +186,7 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {keycloakConfigResolver = request -> {// The realm we authenticate against must be available as a request header- String realm = request.getHeader(REQUEST_HEADER_REALM);+ String realm = request.getHeader(REALM_PARAM_NAME);if (realm == null || realm.length() == 0) {LOG.finer("No realm in request, no authentication will be attempted: " + request.getURI());return notAuthenticatedKeycloakDeployment;diff --git a/container/src/main/java/org/openremote/container/web/ConnectionConstants.java b/container/src/main/java/org/openremote/container/web/ConnectionConstants.javaindex 663356f44..6c3e2ea74 100644--- a/container/src/main/java/org/openremote/container/web/ConnectionConstants.java+++ b/container/src/main/java/org/openremote/container/web/ConnectionConstants.java@@ -21,9 +21,10 @@ package org.openremote.container.web;public interface ConnectionConstants {- String SESSION = "connection.session";+ String SESSION_TERMINATOR = "connection.sessionTerminator";String SESSION_KEY = "connection.sessionKey";String SEND_TO_ALL = "connection.sendToAll";+ String HANDSHAKE_REALM = "connection.realm";String HANDSHAKE_AUTH = "connection.auth";String SESSION_OPEN = "connection.sessionOpen";String SESSION_CLOSE = "connection.sessionClose";diff --git a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.javaindex e12af1512..30c017740 100644--- a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java+++ b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java@@ -35,6 +35,7 @@ import org.openremote.container.security.basic.BasicAuthContext;import org.openremote.container.security.keycloak.AccessTokenAuthContext;import org.openremote.container.web.socket.WebsocketAdapter;import org.openremote.container.web.socket.WebsocketComponent;+import org.openremote.model.Constants;import org.xnio.OptionMap;import org.xnio.Options;import org.xnio.Xnio;@@ -44,6 +45,7 @@ import javax.websocket.server.HandshakeRequest;import javax.websocket.server.ServerEndpointConfig;import javax.ws.rs.WebApplicationException;import java.security.Principal;+import java.util.Optional;import java.util.logging.Logger;import static javax.ws.rs.core.Response.Status.FORBIDDEN;@@ -90,13 +92,11 @@ public class DefaultWebsocketComponent extends WebsocketComponent {@Overridepublic void modifyHandshake(ServerEndpointConfig config, HandshakeRequest request, HandshakeResponse response) {+ String realm = Optional.ofNullable(request.getHeaders().get(Constants.REALM_PARAM_NAME))+ .map(realms -> realms.isEmpty() ? null : realms.get(0)).orElse(null);Principal principal = request.getUserPrincipal();- if (principal == null) {- throw new WebApplicationException("Request is not authenticated, can't access user principal", FORBIDDEN);- }-- AuthContext authContext;+ AuthContext authContext = null;if (principal instanceof KeycloakPrincipal) {KeycloakPrincipal<?> keycloakPrincipal = (KeycloakPrincipal<?>) principal;@@ -106,11 +106,12 @@ public class DefaultWebsocketComponent extends WebsocketComponent {);} else if (principal instanceof BasicAuthContext) {authContext = (BasicAuthContext) principal;- } else {- throw new WebApplicationException("Unsupported user principal type: " + principal, INTERNAL_SERVER_ERROR);+ } else if (principal != null) {+ LOG.info("Unsupported user principal type: " + principal);}config.getUserProperties().put(ConnectionConstants.HANDSHAKE_AUTH, authContext);+ config.getUserProperties().put(ConnectionConstants.HANDSHAKE_REALM, realm);super.modifyHandshake(config, request, response);}@@ -143,11 +144,11 @@ public class DefaultWebsocketComponent extends WebsocketComponent {.addServletContextAttribute(WebSocketDeploymentInfo.ATTRIBUTE_NAME, webSocketDeploymentInfo).setClassLoader(WebsocketComponent.class.getClassLoader());+ // Require authentication, but authorize specific roles later in CamelWebResourceCollection resourceCollection = new WebResourceCollection();resourceCollection.addUrlPattern("/*");- // Require authentication, but authorize specific roles later in CamelSecurityConstraint constraint = new SecurityConstraint();- constraint.setEmptyRoleSemantic(SecurityInfo.EmptyRoleSemantic.AUTHENTICATE);+ constraint.setEmptyRoleSemantic(SecurityInfo.EmptyRoleSemantic.PERMIT);constraint.addWebResourceCollection(resourceCollection);deploymentInfo.addSecurityConstraints(constraint);diff --git a/container/src/main/java/org/openremote/container/web/WebResource.java b/container/src/main/java/org/openremote/container/web/WebResource.javaindex ebe54601e..551dccd2e 100644--- a/container/src/main/java/org/openremote/container/web/WebResource.java+++ b/container/src/main/java/org/openremote/container/web/WebResource.java@@ -33,7 +33,7 @@ import java.security.Principal;import static javax.ws.rs.core.Response.Status.FORBIDDEN;import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;-import static org.openremote.model.Constants.REQUEST_HEADER_REALM;+import static org.openremote.model.Constants.REALM_PARAM_NAME;public class WebResource implements AuthContext {@@ -68,7 +68,7 @@ public class WebResource implements AuthContext {}public String getRequestRealm() {- return request.getHeader(REQUEST_HEADER_REALM);+ return request.getHeader(REALM_PARAM_NAME);}public boolean isAuthenticated() {@@ -79,7 +79,7 @@ public class WebResource implements AuthContext {// The securityContext is a thread-local proxy, careful when/how you call itPrincipal principal = securityContext.getUserPrincipal();if (principal == null) {- throw new WebApplicationException("Request is not authenticated, can't access user principal", FORBIDDEN);+ return null;}if (principal instanceof KeycloakPrincipal) {diff --git a/container/src/main/java/org/openremote/container/web/file/FileServlet.java b/container/src/main/java/org/openremote/container/web/file/FileServlet.javaindex a626354b8..a12f4d1a6 100644--- a/container/src/main/java/org/openremote/container/web/file/FileServlet.java+++ b/container/src/main/java/org/openremote/container/web/file/FileServlet.java@@ -29,7 +29,7 @@ import java.util.List;import java.util.Map;import java.util.logging.Logger;-import static org.openremote.model.Constants.REQUEST_HEADER_REALM;+import static org.openremote.model.Constants.REALM_PARAM_NAME;public class FileServlet extends AbstractFileServlet {@@ -98,11 +98,11 @@ public class FileServlet extends AbstractFileServlet {// If secured, serve files from a sub-directory that represents the authenticated realmif (isSecured()) {- String realm = request.getHeader(REQUEST_HEADER_REALM);+ String realm = request.getHeader(REALM_PARAM_NAME);// If we are missing the auth realm header, ignore...if (realm == null || realm.length() ==0) {- LOG.fine("Ignoring request, secured service needs request header: " + REQUEST_HEADER_REALM);+ LOG.fine("Ignoring request, secured service needs request header: " + REALM_PARAM_NAME);return null;}diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketAdapter.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketAdapter.javaindex e52b811f5..3b8132bc6 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketAdapter.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketAdapter.java@@ -19,8 +19,10 @@*/package org.openremote.container.web.socket;+import org.apache.camel.Exchange;import org.openremote.container.security.AuthContext;import org.openremote.container.web.ConnectionConstants;+import org.openremote.model.Constants;import javax.websocket.CloseReason;import javax.websocket.Endpoint;@@ -44,29 +46,29 @@ public class WebsocketAdapter extends Endpoint {public void onOpen(Session session, EndpointConfig config) {if (LOG.isLoggable(Level.FINE))LOG.fine("Websocket session open: " + session.getId());- // TODO We never expire idle websocket sessions, the assumption is that only authenticate clients can+ // TODO We never expire idle websocket sessions, the assumption is that only authenticated clients can// open a session and if their SSO (managed by Keycloak) expires, they are logged outsession.setMaxIdleTimeout(0);consumer.getEndpoint().getWebsocketSessions().add(session);- this.consumer.sendMessage(session.getId(), getHandshakeAuth(session), null, exchange -> {- exchange.getIn().setHeader(ConnectionConstants.SESSION, session);+ this.consumer.sendMessage(null, exchange -> {+ this.prepareExchange(exchange, session);exchange.getIn().setHeader(ConnectionConstants.SESSION_OPEN, true);});session.addMessageHandler(String.class, message -> {- if (LOG.isLoggable(Level.FINE))+ if (LOG.isLoggable(Level.FINE)) {LOG.fine("Websocket session " + session.getId() + " message received: " + message);- this.consumer.sendMessage(session.getId(), getHandshakeAuth(session), message, exchange -> {- exchange.getIn().setHeader(ConnectionConstants.SESSION, session);- });+ }+ this.consumer.sendMessage(message, exchange -> this.prepareExchange(exchange, session));});}@Overridepublic void onClose(Session session, CloseReason closeReason) {- if (LOG.isLoggable(Level.FINE))+ if (LOG.isLoggable(Level.FINE)) {LOG.fine("Websocket session close: " + session.getId() + " " + closeReason);- this.consumer.sendMessage(session.getId(), getHandshakeAuth(session), closeReason, exchange -> {- exchange.getIn().setHeader(ConnectionConstants.SESSION, session);+ }+ this.consumer.sendMessage(closeReason, exchange -> {+ this.prepareExchange(exchange, session);exchange.getIn().setHeader(ConnectionConstants.SESSION_CLOSE, true);});consumer.getEndpoint().getWebsocketSessions().remove(session);@@ -81,17 +83,35 @@ public class WebsocketAdapter extends Endpoint {if (LOG.isLoggable(Level.INFO))LOG.log(Level.INFO, "Websocket session error: " + session.getId(), thr);}- this.consumer.sendMessage(session.getId(), getHandshakeAuth(session), thr, exchange -> {- exchange.getIn().setHeader(ConnectionConstants.SESSION, session);+ this.consumer.sendMessage(thr, exchange -> {+ this.prepareExchange(exchange, session);exchange.getIn().setHeader(ConnectionConstants.SESSION_CLOSE_ERROR, true);});consumer.getEndpoint().getWebsocketSessions().remove(session);}+ protected void prepareExchange(Exchange exchange, Session session) {+ exchange.getIn().setHeader(ConnectionConstants.SESSION_KEY, session.getId());+ exchange.getIn().setHeader(Constants.AUTH_CONTEXT, getHandshakeAuth(session));+ exchange.getIn().setHeader(Constants.REALM_PARAM_NAME, getHandshakeRealm(session));+ exchange.getIn().setHeader(ConnectionConstants.SESSION_TERMINATOR, getSessionTerminator(session));+ }+protected AuthContext getHandshakeAuth(Session session) {- AuthContext auth = (AuthContext) session.getUserProperties().get(ConnectionConstants.HANDSHAKE_AUTH);- if (auth == null)- throw new IllegalStateException("No authorization details in websocket session: " + session.getId());- return auth;+ return (AuthContext) session.getUserProperties().get(ConnectionConstants.HANDSHAKE_AUTH);+ }++ protected String getHandshakeRealm(Session session) {+ return (String) session.getUserProperties().get(ConnectionConstants.HANDSHAKE_REALM);+ }++ protected Runnable getSessionTerminator(Session session) {+ return () -> {+ try {+ session.close();+ } catch (IOException ignored) {+ LOG.log(Level.INFO, "Failed to close client session: " + session.getId());+ }+ };}}diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketConsumer.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketConsumer.javaindex 6e3caddb1..3dd6d79d2 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketConsumer.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketConsumer.java@@ -22,9 +22,6 @@ package org.openremote.container.web.socket;import org.apache.camel.Exchange;import org.apache.camel.Processor;import org.apache.camel.impl.DefaultConsumer;-import org.openremote.container.security.AuthContext;-import org.openremote.container.web.ConnectionConstants;-import org.openremote.model.Constants;import java.util.function.Consumer;@@ -53,19 +50,18 @@ public class WebsocketConsumer extends DefaultConsumer {return endpoint;}- public void sendMessage(final String sessionKey, final AuthContext authContext, final String message) {- sendMessage(sessionKey, authContext, (Object) message);+ public void sendMessage(final String message) {+ sendMessage((Object) message);}- public void sendMessage(final String sessionKey, final AuthContext authContext, final Object message) {- sendMessage(sessionKey, authContext, message, null);+ public void sendMessage(final Object message) {+ sendMessage(message, null);}- public void sendMessage(final String sessionKey, final AuthContext authContext, final Object message, Consumer<Exchange> exchangePreparer) {+ public void sendMessage(final Object message, Consumer<Exchange> exchangePreparer) {final Exchange exchange = getEndpoint().createExchange();- exchange.getIn().setHeader(ConnectionConstants.SESSION_KEY, sessionKey);- exchange.getIn().setHeader(Constants.AUTH_CONTEXT, authContext);exchange.getIn().setBody(message);+if (exchangePreparer != null) {exchangePreparer.accept(exchange);}diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex 07f529d61..fb8086ba6 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -395,8 +395,10 @@ public class AgentService extends RouteBuilder implements ContainerService, Asseprotected void startAgent(Agent<?,?,?> agent) {withLock(getClass().getSimpleName() + "::startAgent", () -> {+ Protocol<?> protocol = null;+try {- Protocol<?> protocol = agent.getProtocolInstance();+ protocol = agent.getProtocolInstance();protocolInstanceMap.put(agent.getId(), protocol);LOG.fine("Starting protocol instance: " + protocol);@@ -429,6 +431,12 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse} catch (Exception e) {+ if (protocol != null) {+ try {+ protocol.stop(container);+ } catch (Exception ignored) {+ }+ }protocolInstanceMap.remove(agent.getId());LOG.log(Level.SEVERE, "Failed to start protocol instance for agent: " + agent, e);sendAttributeEvent(new AttributeEvent(agent.getId(), Agent.STATUS.getName(), ConnectionStatus.ERROR));diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.javaindex c8fffa4c5..faf1a6d9f 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModelService.java@@ -71,8 +71,6 @@ public class AssetModelService extends RouteBuilder implements ContainerServiceclientEventService = container.getService(ClientEventService.class);gatewayService = container.getService(GatewayService.class);- clientEventService.addSubscriptionAuthorizer((auth, subscription) -> false);-container.getService(ManagerWebService.class).getApiSingletons().add(new AssetModelResourceImpl(container.getService(TimerService.class),diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex bbc44f9ce..885f28f56 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -195,11 +195,11 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSerclientEventService = container.getService(ClientEventService.class);EventSubscriptionAuthorizer assetEventAuthorizer = AssetStorageService.assetInfoAuthorizer(identityService, assetStorageService);- clientEventService.addSubscriptionAuthorizer((auth, subscription) -> {+ clientEventService.addSubscriptionAuthorizer((requestedRealm, auth, subscription) -> {if (!subscription.isEventType(AttributeEvent.class)) {return false;}- return assetEventAuthorizer.apply(auth, subscription);+ return assetEventAuthorizer.authorise(requestedRealm, auth, subscription);});processors.add(gatewayService);@@ -498,7 +498,6 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSerprotected void publishClientEvent(Asset<?> asset, Attribute<?> attribute) {// TODO Catch "queue full" exception (e.g. when producing thousands of INFO messages in rules)?clientEventService.publishEvent(- attribute.getMetaValue(MetaItemType.ACCESS_RESTRICTED_READ).orElse(false),new AttributeEvent(asset.getId(),attribute.getName(),diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex 21ba8f1b8..196a6ace7 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -51,14 +51,11 @@ import static javax.ws.rs.core.Response.Status.*;import static org.openremote.model.attribute.AttributeEvent.Source.CLIENT;import static org.openremote.model.query.AssetQuery.Access;import static org.openremote.model.query.AssetQuery.Select.selectExcludeAll;-import static org.openremote.model.util.TextUtil.isNullOrEmpty;import static org.openremote.model.value.MetaItemType.*;public class AssetResourceImpl extends ManagerWebResource implements AssetResource {private static final Logger LOG = Logger.getLogger(AssetResourceImpl.class.getName());-- protected final static Asset<?>[] EMPTY_ASSETS = new Asset<?>[0];protected final AssetStorageService assetStorageService;protected final MessageBrokerService messageBrokerService;@@ -558,35 +555,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour@Overridepublic Asset<?>[] queryAssets(RequestParams requestParams, AssetQuery query) {try {- if (query == null) {- return EMPTY_ASSETS;- }-- if (isRestrictedUser()) {- // A restricted user can only query linked assets- query = query.userIds(getUserId());-- // A restricted user may not query private asset data, only restricted or public- if (query.access == null || query.access == Access.PRIVATE)- query.access(Access.PROTECTED);- }-- String realm = query.tenant != null && !isNullOrEmpty(query.tenant.realm)- ? query.tenant.realm- : getAuthenticatedRealm();-- if (TextUtil.isNullOrEmpty(realm)) {- throw new WebApplicationException(NOT_FOUND);- }-- if (!isTenantActiveAndAccessible(realm)) {- return EMPTY_ASSETS;- }-- // This replicates behaviour of old getRoot and getChildren methods- if (!isSuperUser()) {- query.tenant(new TenantPredicate(realm));- }+ query = assetStorageService.prepareAssetQuery(query, getAuthContext(), getRequestRealm());List<Asset<?>> result = assetStorageService.findAll(query);@@ -596,62 +565,10 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResourreturn result.toArray(new Asset[0]);} catch (IllegalStateException ex) {- throw new WebApplicationException(ex, BAD_REQUEST);- }- }-- @Override- public Asset<?>[] queryPublicAssets(RequestParams requestParams, AssetQuery query) {-- String requestRealm = getRequestRealm();-- if (TextUtil.isNullOrEmpty(requestRealm)) {- return EMPTY_ASSETS;- }-- if (query == null) {- query = new AssetQuery();- }-- // Force realm to be request realm- if (query.tenant == null) {- query.tenant(new TenantPredicate(requestRealm));- } else {- query.tenant.realm = requestRealm;- }-- // Force public access filter on query- if (query.access == null) {- query.access(Access.PUBLIC);- } else {- query.access(Access.PUBLIC);- }-- try {- List<Asset<?>> result = assetStorageService.findAll(query);-- // Compress response (the request attribute enables the interceptor)- request.setAttribute(HttpHeaders.CONTENT_ENCODING, "gzip");-- return result.toArray(new Asset[0]);- } catch (IllegalStateException ex) {- throw new WebApplicationException(ex, BAD_REQUEST);+ throw new BadRequestException(ex);}}- @Override- public Asset<?>[] getPublicAssets(RequestParams requestParams, String q) {- AssetQuery assetQuery = TextUtil.isNullOrEmpty(q) ? null : ValueUtil.parse(q, AssetQuery.class)- .orElseThrow(() -> new WebApplicationException("Error parsing query parameter 'q' as JSON object", BAD_REQUEST));-- Asset<?>[] result = queryPublicAssets(requestParams, assetQuery);-- // Compress response (the request attribute enables the interceptor)- request.setAttribute(HttpHeaders.CONTENT_ENCODING, "gzip");-- return result;- }-protected AttributeWriteResult doAttributeWrite(AttributeRef ref, Object value, Map<String, Object> headers) {AttributeWriteFailure failure = null;diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex f01fdcbcf..32b27b07c 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -42,8 +42,6 @@ import org.openremote.model.asset.impl.GroupAsset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeMap;-import org.openremote.model.attribute.AttributeState;-import org.openremote.model.event.TriggeredEventSubscription;import org.openremote.model.event.shared.AssetInfo;import org.openremote.model.event.shared.EventRequestResponseWrapper;import org.openremote.model.event.shared.EventSubscription;@@ -85,8 +83,7 @@ import static org.openremote.container.persistence.PersistenceEvent.isPersistencimport static org.openremote.manager.event.ClientEventService.CLIENT_EVENT_TOPIC;import static org.openremote.model.attribute.Attribute.getAddedOrModifiedAttributes;import static org.openremote.model.query.AssetQuery.*;-import static org.openremote.model.query.AssetQuery.Access.PRIVATE;-import static org.openremote.model.query.AssetQuery.Access.PROTECTED;+import static org.openremote.model.query.AssetQuery.Access.*;import static org.openremote.model.query.filter.ValuePredicate.asPredicateOrTrue;import static org.openremote.model.util.TextUtil.isNullOrEmpty;import static org.openremote.model.value.MetaItemType.ACCESS_PUBLIC_READ;@@ -142,9 +139,10 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}+ @SuppressWarnings("unchecked")public static <T extends SharedEvent & AssetInfo> EventSubscriptionAuthorizer assetInfoAuthorizer(ManagerIdentityService identityService, AssetStorageService assetStorageService) {- return (auth, sub) -> {+ return (requestRealm, auth, sub) -> {@SuppressWarnings("unchecked")EventSubscription<T> subscription = (EventSubscription<T>)sub;@@ -154,32 +152,49 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicreturn false;}+ // Superuser can get events for any asset in any realm+ if (auth != null && auth.isSuperUser()) {+ return true;+ }+AssetFilter<T> filter = (AssetFilter<T>) subscription.getFilter();+ if (filter == null) {+ filter = new AssetFilter<>();+ subscription.setFilter(filter);+ }- // Superuser can get events for any asset- if (auth.isSuperUser())- return true;+ requestRealm = filter.getRealm() != null ? filter.getRealm() : requestRealm;+ boolean isAnonymous = auth == null;+ boolean isRestricted = identityService.getIdentityProvider().isRestrictedUser(auth);+ String userId = !isAnonymous ? auth.getUserId() : null;+ String realm = requestRealm != null ? requestRealm : !isAnonymous ? auth.getAuthenticatedRealm() : null;- // Regular user must have role- if (!auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), auth.getClientId())) {+ if (realm == null) {+ LOG.fine("Anonymous subscriptions must specify a realm");return false;}- boolean isRestrictedUser = identityService.getIdentityProvider().isRestrictedUser(auth);+ if (isAnonymous || (requestRealm != null && !requestRealm.equals(auth.getAuthenticatedRealm()))) {+ // Users can only request public assets in different realms so force public events in the filter+ filter.setPublicEvents(true);+ }- if (filter == null) {- filter = new AssetFilter<>();- subscription.setFilter(filter);+ // Regular user must have role+ if (!filter.isPublicEvents() && !isAnonymous && !auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), auth.getClientId())) {+ return false;}- // Regular and restricted users can only subscribe to assets in their realm- filter.setRealm(auth.getAuthenticatedRealm());+ filter.setRealm(realm);++ if (!filter.isRestrictedEvents() && isRestricted) {+ filter.setRestrictedEvents(true);+ }// Restricted user can only subscribe to assets they are linked toboolean skipAssetIdCheck = false;- if (isRestrictedUser && (filter.getAssetIds() == null || filter.getAssetIds().length == 0)) {+ if (isRestricted && (filter.getAssetIds() == null || filter.getAssetIds().length == 0)) {filter.setAssetIds(- assetStorageService.findUserAssetLinks(auth.getAuthenticatedRealm(), auth.getUserId(), null)+ assetStorageService.findUserAssetLinks(realm, userId, null).stream().map(userAssetLink -> userAssetLink.getId().getAssetId()).toArray(String[]::new)@@ -194,14 +209,14 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic// If the asset doesn't exist, subscription must failif (asset == null)return false;- if (isRestrictedUser) {+ if (isRestricted) {// Restricted users can only get events for their linked assets- if (!assetStorageService.isUserAsset(auth.getUserId(), assetId))+ if (!assetStorageService.isUserAsset(userId, assetId))return false;// TODO Restricted clients should only receive events for PROTECTED attributes!} else {// Regular users can only get events for assets in their realm- if (!asset.getRealm().equals(auth.getAuthenticatedRealm()))+ if (!asset.getRealm().equals(realm))return false;}}@@ -303,12 +318,12 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicgatewayService = container.getService(GatewayService.class);EventSubscriptionAuthorizer assetEventAuthorizer = AssetStorageService.assetInfoAuthorizer(identityService, this);- clientEventService.addSubscriptionAuthorizer((auth, subscription) -> {+ clientEventService.addSubscriptionAuthorizer((realm, auth, subscription) -> {if (!subscription.isEventType(AssetEvent.class)) {return false;}- return assetEventAuthorizer.apply(auth, subscription);+ return assetEventAuthorizer.authorise(realm, auth, subscription);});container.getService(ManagerWebService.class).getApiSingletons().add(@@ -374,16 +389,21 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicreturn;}- boolean isAttributeRead = !TextUtil.isNullOrEmpty(attributeName);String sessionKey = ClientEventService.getSessionKey(exchange);AuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);+ boolean isAttributeRead = !TextUtil.isNullOrEmpty(attributeName);+ boolean isAnonymous = authContext == null;+ boolean isSuperUser = authContext != null && authContext.isSuperUser();+ boolean isRestricted = identityService.getIdentityProvider().isRestrictedUser(authContext);++ Access access = isAnonymous ? PUBLIC : isRestricted ? PROTECTED : PRIVATE;// Superuser can get all, User must have role- if (!authContext.isSuperUser() && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), authContext.getClientId())) {+ if (!isSuperUser && access != PUBLIC && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), authContext.getClientId())) {+ LOG.fine("User must have '" + ClientRole.READ_ASSETS.getValue() + "' role to read assets and/or attributes");return;}- Access access = authContext.isSuperUser() || !identityService.getIdentityProvider().isRestrictedUser(authContext) ? PRIVATE : PROTECTED;AssetQuery assetQuery = new AssetQuery().ids(assetId).select(new Select().excludePath(false).excludeParentInfo(true))@@ -419,43 +439,98 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic.when(body().isInstanceOf(ReadAssetsEvent.class)).process(exchange -> {ReadAssetsEvent readAssets = exchange.getIn().getBody(ReadAssetsEvent.class);- AssetQuery query = readAssets.getAssetQuery();-String sessionKey = ClientEventService.getSessionKey(exchange);AuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);+ String requestRealm = exchange.getIn().getHeader(Constants.REALM_PARAM_NAME, String.class);+ AssetQuery query = readAssets.getAssetQuery();+ try {+ query = prepareAssetQuery(query, authContext, requestRealm);- // Superuser can get all, User must have role- if (!authContext.isSuperUser() && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), authContext.getClientId())) {- return;- }+ List<Asset<?>> assets = findAll(query);- Access access = authContext.isSuperUser() || !identityService.getIdentityProvider().isRestrictedUser(authContext) ? PRIVATE : PROTECTED;+ String messageId = exchange.getIn().getHeader(ClientEventService.HEADER_REQUEST_RESPONSE_MESSAGE_ID, String.class);- if (!authContext.isSuperUser()) {- // Force realm to match users- query.tenant(new TenantPredicate(authContext.getAuthenticatedRealm()));+ if (isNullOrEmpty(messageId)) {+ clientEventService.sendToSession(sessionKey, new AssetsEvent(assets));+ } else {+ clientEventService.sendToSession(sessionKey, new EventRequestResponseWrapper<>(messageId, new AssetsEvent(assets)));+ }+ } catch (IllegalStateException ignored) {}+ })+ .stop()+ .endChoice()+ .end();+ }- // Set access requirements- query.access(access);+ /**+ * Prepares an {@link AssetQuery} by validating it against security constraints and/or applying default options to the query+ * based on security constraints.+ */+ public AssetQuery prepareAssetQuery(AssetQuery query, AuthContext authContext, String requestRealm) throws IllegalStateException {- if (access == PROTECTED) {- query.userIds(authContext.getUserId());- }+ if (query == null) {+ query = new AssetQuery();+ }- List<Asset<?>> assets = findAll(query);+ boolean isAnonymous = authContext == null;+ boolean isSuperUser = authContext != null && authContext.isSuperUser();+ boolean isRestricted = identityService.getIdentityProvider().isRestrictedUser(authContext);- String messageId = exchange.getIn().getHeader(ClientEventService.HEADER_REQUEST_RESPONSE_MESSAGE_ID, String.class);+ // Take realm from query, requestRealm or lastly auth context (super users can query with no realm)+ String realm = query.tenant != null ? query.tenant.realm : requestRealm != null ? requestRealm : (!isSuperUser && authContext != null ? authContext.getAuthenticatedRealm() : null);- if (isNullOrEmpty(messageId)) {- clientEventService.sendToSession(sessionKey, new AssetsEvent(assets));- } else {- clientEventService.sendToSession(sessionKey, new EventRequestResponseWrapper<>(messageId, new AssetsEvent(assets)));- }- })- .stop()- .endChoice()- .end();+ if (!isSuperUser) {+ if (TextUtil.isNullOrEmpty(realm)) {+ String msg = "Realm must be specified to read assets";+ LOG.finer(msg);+ throw new IllegalStateException(msg);+ }++ if (isAnonymous) {+ if (query.access != null && query.access != PUBLIC) {+ String msg = "Only public access allowed for anonymous requests";+ LOG.finer(msg);+ throw new IllegalStateException(msg);+ }+ query.access = PUBLIC;+ } else if (isRestricted) {+ if (query.access == PRIVATE) {+ String msg = "Only public or restricted access allowed for restricted requests";+ LOG.finer(msg);+ throw new IllegalStateException(msg);+ }+ if (query.access == null) {+ query.access = PROTECTED;+ }+ }++ if (query.access != PUBLIC && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), authContext.getClientId())) {+ String msg = "User must have '" + ClientRole.READ_ASSETS.getValue() + "' role to read non public assets";+ LOG.fine(msg);+ throw new IllegalStateException(msg);+ }++ if (query.access != PUBLIC && !realm.equals(authContext.getAuthenticatedRealm())) {+ String msg = "Realm must match authenticated realm for non public access queries";+ LOG.finer(msg);+ throw new IllegalStateException(msg);+ }++ query.tenant = new TenantPredicate(realm);++ if (query.access == PROTECTED) {+ query.userIds(authContext.getUserId());+ }+ }++ if (!identityService.getIdentityProvider().isTenantActiveAndAccessible(authContext, realm)) {+ String msg = "Realm is not present or is inactive";+ LOG.finer(msg);+ throw new IllegalStateException(msg);+ }++ return query;}public Asset<?> find(String assetId) {@@ -1283,12 +1358,14 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicbreak;case UPDATE:- // Use simple equality check on each property- String[] updatedProperties = Arrays.stream(persistenceEvent.getPropertyNames()).filter(propertyName -> {- Object oldValue = persistenceEvent.getPreviousState(propertyName);- Object newValue = persistenceEvent.getCurrentState(propertyName);- return !Objects.deepEquals(oldValue, newValue);- }).toArray(String[]::new);+ String[] updatedProperties = persistenceEvent.getPropertyNames();+ boolean attributesChanged = Arrays.asList(updatedProperties).contains("attributes");++// String[] updatedProperties = Arrays.stream(persistenceEvent.getPropertyNames()).filter(propertyName -> {+// Object oldValue = persistenceEvent.getPreviousState(propertyName);+// Object newValue = persistenceEvent.getCurrentState(propertyName);+// return !Objects.deepEquals(oldValue, newValue);+// }).toArray(String[]::new);// Fully load the assetloadedAsset = find(new AssetQuery().ids(asset.getId()));@@ -1298,32 +1375,34 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic);// Did any attributes change if so raise attribute events on the event bus- AttributeMap oldAttributes = persistenceEvent.getPreviousState("attributes");- AttributeMap newAttributes = persistenceEvent.getCurrentState("attributes");-- // Get removed attributes and raise an attribute event with deleted flag in attribute state- oldAttributes.stream()- .filter(oldAttribute ->- newAttributes.stream().noneMatch(newAttribute ->- oldAttribute.getName().equals(newAttribute.getName())- ))- .forEach(obsoleteAttribute ->- clientEventService.publishEvent(- AttributeEvent.deletedAttribute(asset.getId(), obsoleteAttribute.getName())- ));-- // Get new or modified attributes- getAddedOrModifiedAttributes(oldAttributes.values(),- newAttributes.values())- .forEach(newOrModifiedAttribute ->- clientEventService.publishEvent(- new AttributeEvent(- asset.getId(),- newOrModifiedAttribute.getName(),- newOrModifiedAttribute.getValue().orElse(null),- newOrModifiedAttribute.getTimestamp().orElse(0L))- .setParentId(asset.getParentId()).setRealm(asset.getRealm())- ));+ if (attributesChanged) {+ AttributeMap oldAttributes = persistenceEvent.getPreviousState("attributes");+ AttributeMap newAttributes = persistenceEvent.getCurrentState("attributes");++ // Get removed attributes and raise an attribute event with deleted flag in attribute state+ oldAttributes.stream()+ .filter(oldAttribute ->+ newAttributes.stream().noneMatch(newAttribute ->+ oldAttribute.getName().equals(newAttribute.getName())+ ))+ .forEach(obsoleteAttribute ->+ clientEventService.publishEvent(+ AttributeEvent.deletedAttribute(asset.getId(), obsoleteAttribute.getName())+ ));++ // Get new or modified attributes+ getAddedOrModifiedAttributes(oldAttributes.values(),+ newAttributes.values())+ .forEach(newOrModifiedAttribute ->+ clientEventService.publishEvent(+ new AttributeEvent(+ asset.getId(),+ newOrModifiedAttribute.getName(),+ newOrModifiedAttribute.getValue().orElse(null),+ newOrModifiedAttribute.getTimestamp().orElse(0L))+ .setParentId(asset.getParentId()).setRealm(asset.getRealm())+ ));+ }break;case DELETE:@@ -1341,18 +1420,6 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}- protected void replyWithAttributeEvents(String sessionKey, String subscriptionId, Asset<?> asset, String[] attributeNames) {- List<String> names = attributeNames == null ? Collections.emptyList() : Arrays.asList(attributeNames);-- // Client may want to read a subset or all attributes of the asset- List<AttributeEvent> events = asset.getAttributes().stream()- .filter(attribute -> names.isEmpty() || names.contains(attribute.getName()))- .map(attribute -> new AttributeEvent(new AttributeState(asset.getId(), attribute)))- .collect(Collectors.toList());- TriggeredEventSubscription<?> triggeredEventSubscription = new TriggeredEventSubscription<>(events, subscriptionId);- clientEventService.sendToSession(sessionKey, triggeredEventSubscription);- }-public String toString() {return getClass().getSimpleName() + "{" +'}';diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.javaindex c5369e4fd..0acee334d 100644--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java@@ -45,7 +45,7 @@ import java.util.logging.Logger;import static org.apache.camel.builder.Builder.header;import static org.apache.camel.builder.PredicateBuilder.or;-import static org.openremote.container.web.ConnectionConstants.SESSION;+import static org.openremote.container.web.ConnectionConstants.SESSION_TERMINATOR;/*** Receives and publishes messages, handles the client/server event bus.@@ -102,7 +102,6 @@ public class ClientEventService implements ContainerService {}public static final int PRIORITY = ManagerWebService.PRIORITY - 200;- public static final String HEADER_ACCESS_RESTRICTED = ClientEventService.class.getName() + ".HEADER_ACCESS_RESTRICTED";public static final String HEADER_CONNECTION_TYPE = ClientEventService.class.getName() + ".HEADER_CONNECTION_TYPE";public static final String HEADER_CONNECTION_TYPE_WEBSOCKET = ClientEventService.class.getName() + ".HEADER_CONNECTION_TYPE_WEBSOCKET";public static final String HEADER_CONNECTION_TYPE_MQTT = ClientEventService.class.getName() + ".HEADER_CONNECTION_TYPE_MQTT";@@ -244,14 +243,18 @@ public class ClientEventService implements ContainerService {String sessionKey = getSessionKey(exchange);EventSubscription<?> subscription = exchange.getIn().getBody(EventSubscription.class);AuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);- if (authorizeEventSubscription(authContext, subscription)) {- boolean restrictedUser = identityService.getIdentityProvider().isRestrictedUser(authContext);- eventSubscriptions.createOrUpdate(sessionKey, restrictedUser, subscription);+ boolean restrictedUser = identityService.getIdentityProvider().isRestrictedUser(authContext);+ boolean anonymousUser = authContext == null;+ String username = authContext == null ? "anonymous" : authContext.getUsername();+ String realm = exchange.getIn().getHeader(Constants.REALM_PARAM_NAME, String.class);++ if (authorizeEventSubscription(realm, authContext, subscription)) {+ eventSubscriptions.createOrUpdate(sessionKey, restrictedUser, anonymousUser, subscription);subscription.setSubscribed(true);sendToSession(sessionKey, subscription);} else {LOG.warning("Unauthorized subscription from '"- + authContext.getUsername() + "' in realm '" + authContext.getAuthenticatedRealm()+ + username + "' in realm '" + realm+ "': " + subscription);sendToSession(sessionKey, new UnauthorizedEventSubscription<>(subscription));@@ -286,7 +289,7 @@ public class ClientEventService implements ContainerService {// Add pending internal subscriptionsif (!pendingInternalSubscriptions.isEmpty()) {pendingInternalSubscriptions.forEach(subscription ->- eventSubscriptions.createOrUpdate(INTERNAL_SESSION_KEY, false, subscription));+ eventSubscriptions.createOrUpdate(INTERNAL_SESSION_KEY, false, false, subscription));}pendingInternalSubscriptions = null;@@ -299,6 +302,7 @@ public class ClientEventService implements ContainerService {return addInternalSubscription(Integer.toString(Objects.hash(eventClass, filter, eventConsumer)), eventClass, filter, eventConsumer);}public <T extends SharedEvent> String addInternalSubscription(String subscriptionId, Class<T> eventClass, EventFilter<T> filter, Consumer<T> eventConsumer) {+EventSubscription<T> subscription = new EventSubscription<T>(eventClass, filter, subscriptionId, eventConsumer);if (eventSubscriptions == null) {// Not initialised yet@@ -307,7 +311,7 @@ public class ClientEventService implements ContainerService {}pendingInternalSubscriptions.add(subscription);} else {- eventSubscriptions.createOrUpdate(INTERNAL_SESSION_KEY, false, subscription);+ eventSubscriptions.createOrUpdate(INTERNAL_SESSION_KEY, false, false, subscription);}return subscriptionId;}@@ -338,19 +342,12 @@ public class ClientEventService implements ContainerService {this.eventSubscriptionAuthorizers.add(authorizer);}- public boolean authorizeEventSubscription(AuthContext authContext, EventSubscription<?> subscription) {+ public boolean authorizeEventSubscription(String realm, AuthContext authContext, EventSubscription<?> subscription) {return eventSubscriptionAuthorizers.stream()- .anyMatch(authorizer -> authorizer.apply(authContext, subscription));+ .anyMatch(authorizer -> authorizer.authorise(realm, authContext, subscription));}public <T extends SharedEvent> void publishEvent(T event) {- publishEvent(true, event);- }-- /**- * @param accessRestricted <code>true</code> if this event can be received by restricted user sessions.- */- public <T extends SharedEvent> void publishEvent(boolean accessRestricted, T event) {// Only publish if service is not stoppedif (stopped) {return;@@ -362,7 +359,7 @@ public class ClientEventService implements ContainerService {LOG.finer("Publishing: " + event);}messageBrokerService.getProducerTemplate()- .sendBodyAndHeader(CLIENT_EVENT_QUEUE, event, HEADER_ACCESS_RESTRICTED, accessRestricted);+ .sendBody(CLIENT_EVENT_QUEUE, event);}}@@ -420,23 +417,8 @@ public class ClientEventService implements ContainerService {}protected static SessionInfo createSessionInfo(String sessionKey, Exchange exchange) {-String connectionType = (String) exchange.getIn().getHeader(HEADER_CONNECTION_TYPE);- Runnable closeRunnable = null;-- if (HEADER_CONNECTION_TYPE_WEBSOCKET.equals(connectionType)) {- Session session = exchange.getIn().getHeader(SESSION, Session.class);- closeRunnable = () -> {- try {- session.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, ""));- } catch (Exception e) {- LOG.log(Level.INFO, "Failed to close client session: " + sessionKey);- }- };- } else if (HEADER_CONNECTION_TYPE_MQTT.equals(connectionType)) {- closeRunnable = exchange.getIn().getHeader(SESSION, Runnable.class);- }-+ Runnable closeRunnable = exchange.getIn().getHeader(SESSION_TERMINATOR, Runnable.class);return new SessionInfo(connectionType, closeRunnable);}}diff --git a/manager/src/main/java/org/openremote/manager/event/EventSubscriptionAuthorizer.java b/manager/src/main/java/org/openremote/manager/event/EventSubscriptionAuthorizer.javaindex bdb5968f5..a28d4a4df 100644--- a/manager/src/main/java/org/openremote/manager/event/EventSubscriptionAuthorizer.java+++ b/manager/src/main/java/org/openremote/manager/event/EventSubscriptionAuthorizer.java@@ -31,6 +31,7 @@ import java.util.function.BiFunction;* permissions. It might also fail if the subscription is invalid, for example, if* a required filter is not supplied or if the filter is not valid.*/-public interface EventSubscriptionAuthorizer extends BiFunction<AuthContext, EventSubscription<?>, Boolean> {--}\ No newline at end of file+@FunctionalInterface+public interface EventSubscriptionAuthorizer {+ boolean authorise(String requestRealm, AuthContext authContext, EventSubscription<?> eventSubscription);+}diff --git a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.javaindex 092ddc06e..289a97d9b 100644--- a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java+++ b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java@@ -43,8 +43,8 @@ public class EventSubscriptions {final protected TimerService timerService;final protected Map<String, SessionSubscriptions> sessionSubscriptionIdMap = new HashMap<>();- class SessionSubscriptions extends HashSet<SessionSubscription> {- public void createOrUpdate(boolean restrictedUser, EventSubscription<?> eventSubscription) {+ class SessionSubscriptions extends HashSet<SessionSubscription<?>> {+ protected void createOrUpdate(boolean restrictedUser, boolean anonymousUser, EventSubscription<?> eventSubscription) {if (TextUtil.isNullOrEmpty(eventSubscription.getSubscriptionId())) {cancelByType(eventSubscription.getEventType());@@ -52,43 +52,35 @@ public class EventSubscriptions {cancelById(eventSubscription.getSubscriptionId());}- add(new SessionSubscription(restrictedUser, timerService.getCurrentTimeMillis(), eventSubscription));+ add(new SessionSubscription<>(restrictedUser, anonymousUser, timerService.getCurrentTimeMillis(), eventSubscription));}- public void update(boolean resstrictedUser, String[] subscriptionIds) {- List<String> ids = Arrays.asList(subscriptionIds);- forEach(sessionSubscription -> {- if (ids.contains(sessionSubscription.subscriptionId)) {- sessionSubscription.restrictedUser = resstrictedUser;- sessionSubscription.timestamp = timerService.getCurrentTimeMillis();- }- });- }-- public void cancelByType(String eventType) {+ protected void cancelByType(String eventType) {removeIf(sessionSubscription -> sessionSubscription.subscriptionId == null && sessionSubscription.subscription.getEventType().equals(eventType));}- public void cancelById(String subscriptionId) {+ protected void cancelById(String subscriptionId) {removeIf(sessionSubscription -> sessionSubscription.subscription.getSubscriptionId().equals(subscriptionId));}}- class SessionSubscription {+ static class SessionSubscription<T extends SharedEvent> {boolean restrictedUser;+ boolean anonymousUser;long timestamp;- final EventSubscription subscription;+ final EventSubscription<T> subscription;final String subscriptionId;- public SessionSubscription(boolean restrictedUser, long timestamp, EventSubscription subscription) {+ public SessionSubscription(boolean restrictedUser, boolean anonymousUser, long timestamp, EventSubscription<T> subscription) {this.restrictedUser = restrictedUser;+ this.anonymousUser = anonymousUser;this.timestamp = timestamp;this.subscription = subscription;this.subscriptionId = subscription.getSubscriptionId();}- public boolean matches(boolean accessibleForRestrictedUsers, SharedEvent event) {- return (!restrictedUser || accessibleForRestrictedUsers) && subscription.getEventType().equals(event.getEventType());+ public boolean matches(SharedEvent event) {+ return (!restrictedUser || event.canAccessRestrictedRead()) && (!anonymousUser || event.canAccessPublicRead()) && subscription.getEventType().equals(event.getEventType());}}@@ -97,27 +89,16 @@ public class EventSubscriptions {this.timerService = timerService;}- public void createOrUpdate(String sessionKey, boolean restrictedUser, EventSubscription<?> subscription) {+ protected void createOrUpdate(String sessionKey, boolean restrictedUser, boolean anonymousUser, EventSubscription<?> subscription) {synchronized (this.sessionSubscriptionIdMap) {- // TODO Check if the user can actually subscribe to the events it wants, how do we do that?LOG.finer("For session '" + sessionKey + "', creating/updating: " + subscription);SessionSubscriptions sessionSubscriptions =this.sessionSubscriptionIdMap.computeIfAbsent(sessionKey, k -> new SessionSubscriptions());- sessionSubscriptions.createOrUpdate(restrictedUser, subscription);+ sessionSubscriptions.createOrUpdate(restrictedUser, anonymousUser, subscription);}}- public void update(String sessionKey, boolean restrictedUser, String[] subscriptionIds) {- synchronized (this.sessionSubscriptionIdMap) {- SessionSubscriptions sessionSubscriptions = this.sessionSubscriptionIdMap.get(sessionKey);- if (sessionSubscriptions != null) {- LOG.finer("For session '" + sessionKey + "', updating: " + Arrays.toString(subscriptionIds));- sessionSubscriptions.update(restrictedUser, subscriptionIds);- }- }- }-- public void cancel(String sessionKey, CancelEventSubscription subscription) {+ protected void cancel(String sessionKey, CancelEventSubscription subscription) {synchronized (this.sessionSubscriptionIdMap) {if (!this.sessionSubscriptionIdMap.containsKey(sessionKey)) {return;@@ -138,7 +119,7 @@ public class EventSubscriptions {}}- public void cancelAll(String sessionKey) {+ protected void cancelAll(String sessionKey) {synchronized (this.sessionSubscriptionIdMap) {if (this.sessionSubscriptionIdMap.containsKey(sessionKey)) {LOG.finer("Cancelling all subscriptions for session: " + sessionKey);@@ -147,16 +128,16 @@ public class EventSubscriptions {}}- @SuppressWarnings("unchecked")+ @SuppressWarnings({"unchecked", "unused"})public <T extends SharedEvent> List<Message> splitForSubscribers(Exchange exchange) {List<Message> messageList = new ArrayList<>();- SharedEvent event = exchange.getIn().getBody(SharedEvent.class);+ T event = (T)exchange.getIn().getBody(SharedEvent.class);+if (event == null)return messageList;- boolean accessibleForRestrictedUsers = exchange.getIn().getHeader(ClientEventService.HEADER_ACCESS_RESTRICTED, false, Boolean.class);-Set<Map.Entry<String, SessionSubscriptions>> sessionSubscriptionsSet;+synchronized (this.sessionSubscriptionIdMap) {sessionSubscriptionsSet = new HashSet<>(sessionSubscriptionIdMap.entrySet());}@@ -165,18 +146,20 @@ public class EventSubscriptions {String sessionKey = entry.getKey();SessionSubscriptions subscriptions = entry.getValue();- for (SessionSubscription sessionSubscription : subscriptions) {+ for (SessionSubscription<?> sessionSubscription : subscriptions) {- if (!sessionSubscription.matches(accessibleForRestrictedUsers, event))+ if (!sessionSubscription.matches(event))continue;- if (sessionSubscription.subscription.getFilter() == null- || sessionSubscription.subscription.getFilter().apply(event)) {+ SessionSubscription<T> sessionSub = (SessionSubscription<T>) sessionSubscription;++ if (sessionSub.subscription.getFilter() == null+ || sessionSub.subscription.getFilter().apply(event)) {LOG.finer("Creating message for subscribed session '" + sessionKey + "': " + event);- List<SharedEvent> events = Collections.singletonList(event);- TriggeredEventSubscription<?> triggeredEventSubscription = new TriggeredEventSubscription<>(events, sessionSubscription.subscriptionId);+ List<T> events = Collections.singletonList(event);+ TriggeredEventSubscription<T> triggeredEventSubscription = new TriggeredEventSubscription<>(events, sessionSub.subscriptionId);- if (sessionSubscription.subscription.getInternalConsumer() == null) {+ if (sessionSub.subscription.getInternalConsumer() == null) {Message msg = new DefaultMessage();msg.setBody(triggeredEventSubscription); // Don't copy the event, use same referencemsg.setHeaders(new HashMap<>(exchange.getIn().getHeaders())); // Copy headers@@ -184,8 +167,8 @@ public class EventSubscriptions {messageList.add(msg);} else {if (triggeredEventSubscription.getEvents() != null) {- triggeredEventSubscription.getEvents().forEach(ev ->- sessionSubscription.subscription.getInternalConsumer().accept(ev));+ triggeredEventSubscription.getEvents().forEach(e ->+ sessionSub.subscription.getInternalConsumer().accept(e));}}}diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.javaindex 28ee66be3..1687f446b 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java@@ -22,6 +22,7 @@ package org.openremote.manager.gateway;import io.netty.channel.ChannelHandler;import org.apache.camel.builder.RouteBuilder;import org.apache.http.client.utils.URIBuilder;+import org.openremote.model.Constants;import org.openremote.model.Container;import org.openremote.model.auth.OAuthClientCredentialsGrant;import org.openremote.agent.protocol.io.AbstractNettyIOClient;@@ -95,11 +96,15 @@ public class GatewayClientService extends RouteBuilder implements ContainerServicontainer.getService(MessageBrokerService.class).getContext().addRoutes(this);- clientEventService.addSubscriptionAuthorizer((authContext, eventSubscription) -> {+ clientEventService.addSubscriptionAuthorizer((realm, authContext, eventSubscription) -> {if (!eventSubscription.isEventType(GatewayConnectionStatusEvent.class)) {return false;}+ if (authContext == null) {+ return false;+ }+// If not a super user force a filter for the users realmif (!authContext.isSuperUser()) {@SuppressWarnings("unchecked")@@ -198,7 +203,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi.setHost(connection.getHost()).setPort(connection.getPort() == null ? -1 : connection.getPort()).setPath("websocket/events")- .setParameter("Auth-Realm", connection.getRealm()).build(),+ .setParameter(Constants.REALM_PARAM_NAME, connection.getRealm()).build(),null,new OAuthClientCredentialsGrant(new URIBuilder()diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex 20392fafd..c6b33e6cc 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -38,10 +38,7 @@ import org.openremote.model.Container;import org.openremote.model.ContainerService;import org.openremote.model.asset.Asset;import org.openremote.model.asset.impl.GatewayAsset;-import org.openremote.model.attribute.Attribute;-import org.openremote.model.attribute.AttributeEvent;-import org.openremote.model.attribute.AttributeMap;-import org.openremote.model.attribute.AttributeWriteFailure;+import org.openremote.model.attribute.*;import org.openremote.model.event.shared.SharedEvent;import org.openremote.model.gateway.GatewayDisconnectEvent;import org.openremote.model.query.AssetQuery;@@ -52,7 +49,6 @@ import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.TextUtil;import javax.persistence.EntityManager;-import javax.websocket.Session;import java.util.*;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.atomic.AtomicBoolean;@@ -272,9 +268,8 @@ public class GatewayService extends RouteBuilder implements ContainerService, As}if (header(ConnectionConstants.SESSION_OPEN).matches(exchange)) {- Session session = exchange.getIn().getHeader(ConnectionConstants.SESSION, Session.class);String sessionKey = ClientEventService.getSessionKey(exchange);- processGatewayConnected(clientId, sessionKey, session);+ processGatewayConnected(clientId, sessionKey);return;}@@ -455,7 +450,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, Asreturn null;}- protected void processGatewayConnected(String gatewayClientId, String sessionId, Session session) {+ protected void processGatewayConnected(String gatewayClientId, String sessionId) {if (!active) {return;diff --git a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.javaindex cc9fa6d27..ebc776737 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java@@ -123,7 +123,7 @@ public class DefaultMQTTHandler extends MQTTHandler {headers.put(ConnectionConstants.SESSION_OPEN, true);// Put a close connection runnable into the headers for the client event serviceRunnable closeRunnable = () -> mqttBrokerService.forceDisconnect(connection.getClientId());- headers.put(ConnectionConstants.SESSION, closeRunnable);+ headers.put(ConnectionConstants.SESSION_TERMINATOR, closeRunnable);messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, null, headers);LOG.fine("Connected: " + connection);}@@ -247,7 +247,7 @@ public class DefaultMQTTHandler extends MQTTHandler {filter);- if (!clientEventService.authorizeEventSubscription(authContext, subscription)) {+ if (!clientEventService.authorizeEventSubscription(connection.getRealm(), authContext, subscription)) {LOG.info("Subscription was not authorised for this user and topic: topic=" + topic + ", connection=" + connection);return false;}@@ -510,6 +510,7 @@ public class DefaultMQTTHandler extends MQTTHandler {headers.put(ConnectionConstants.SESSION_KEY, connection.getClientId());headers.put(ClientEventService.HEADER_CONNECTION_TYPE, ClientEventService.HEADER_CONNECTION_TYPE_MQTT);headers.put(Constants.AUTH_CONTEXT, connection.getAuthContext());+ headers.put(Constants.REALM_PARAM_NAME, connection.getRealm());return headers;}}diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 8b2ab5e5f..97d2ae6bc 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -154,10 +154,14 @@ public class RulesService extends RouteBuilder implements ContainerService, Assereturn;}- clientEventService.addSubscriptionAuthorizer((auth, subscription) -> {+ clientEventService.addSubscriptionAuthorizer((realm, auth, subscription) -> {if (subscription.isEventType(RulesEngineStatusEvent.class) || subscription.isEventType(RulesetChangedEvent.class)) {+ if (auth == null) {+ return false;+ }+if (auth.isSuperUser()) {return true;}diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex 7cf2a7543..1707d8e4a 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -1023,8 +1023,14 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im*/@Overridepublic boolean isTenantActiveAndAccessible(AuthContext authContext, Tenant tenant) {- return tenant != null && (authContext.isSuperUser()- || (tenant.isActive(timerService.getCurrentTimeMillis()) && authContext.isRealmAccessibleByUser(tenant.getRealm())));+ if (tenant == null) {+ return false;+ }++ boolean isSuperUser = authContext != null && authContext.isSuperUser();+ boolean isUsersRealm = isSuperUser || authContext == null || authContext.isRealmAccessibleByUser(tenant.getRealm());++ return isSuperUser || (isUsersRealm && tenant.isActive(timerService.getCurrentTimeMillis()));}/**@@ -1043,7 +1049,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im@Overridepublic boolean isRestrictedUser(AuthContext authContext) {- return authContext.hasRealmRole(RESTRICTED_USER_REALM_ROLE);+ return authContext != null && authContext.hasRealmRole(RESTRICTED_USER_REALM_ROLE);}@Overridediff --git a/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.javaindex a56dbc32c..cd177c546 100644--- a/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java@@ -64,7 +64,15 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso@Overridepublic Tenant[] getAccessible(RequestParams requestParams) {try {- Tenant[] tenants = isSuperUser() ? identityService.getIdentityProvider().getTenants() : new Tenant[] {getAuthenticatedTenant()};+ Tenant[] tenants;++ if (isSuperUser()) {+ tenants = identityService.getIdentityProvider().getTenants();+ } else {+ tenants = new Tenant[] {+ (isAuthenticated() ? getAuthenticatedTenant() : getRequestTenant())+ };+ }return Arrays.stream(tenants).map(tenant -> new Tenant().setRealm(tenant.getRealm()).setDisplayName(tenant.getDisplayName())).toArray(Tenant[]::new);} catch (ClientErrorException ex) {throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());diff --git a/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java b/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.javaindex 1b99091d0..46c1d8f54 100644--- a/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java+++ b/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java@@ -68,10 +68,14 @@ public class SimulatorService extends RouteBuilder implements ContainerService {assetStorageService = container.getService(AssetStorageService.class);clientEventService = container.getService(ClientEventService.class);- clientEventService.addSubscriptionAuthorizer((auth, subscription) -> {+ clientEventService.addSubscriptionAuthorizer((realm, auth, subscription) -> {if (!subscription.isEventType(SimulatorState.class))return false;+ if (auth == null) {+ return false;+ }+// Superuser can get allif (auth.isSuperUser())return true;diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.javaindex 117bc8f4d..66a69f371 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java@@ -80,10 +80,8 @@ 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.hasResourceRole(Constants.READ_RULES_ROLE, auth.getClientId());- });+ clientEventService.addSubscriptionAuthorizer((realm, auth, subscription) ->+ subscription.isEventType(SyslogEvent.class) && auth != null && (auth.isSuperUser() || auth.hasResourceRole(Constants.READ_LOGS_ROLE, auth.getClientId())));}if (container.hasService(ManagerWebService.class)) {diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.javaindex a724142a3..315df9a46 100644--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java@@ -63,7 +63,7 @@ import static io.undertow.util.RedirectBuilder.redirect;import static javax.ws.rs.core.Response.Status.NOT_FOUND;import static javax.ws.rs.core.UriBuilder.fromUri;import static org.openremote.container.util.MapAccess.getString;-import static org.openremote.model.Constants.REQUEST_HEADER_REALM;+import static org.openremote.model.Constants.REALM_PARAM_NAME;import static org.openremote.model.util.ValueUtil.configureObjectMapper;public class ManagerWebService extends WebService {@@ -166,7 +166,7 @@ public class ManagerWebService extends WebService {String realm = realmSubMatcher.group(1);// Move the realm from path segment to header- exchange.getRequestHeaders().put(HttpString.tryFromString(REQUEST_HEADER_REALM), realm);+ exchange.getRequestHeaders().put(HttpString.tryFromString(REALM_PARAM_NAME), realm);URI url = fromUri(exchange.getRequestURL()).replacePath(realmSubMatcher.group(2))diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.javaindex 44d544bce..8c59acbb5 100644--- a/model/src/main/java/org/openremote/model/Constants.java+++ b/model/src/main/java/org/openremote/model/Constants.java@@ -57,7 +57,7 @@ public interface Constants {boolean SETUP_EMAIL_TLS_DEFAULT = true;String SETUP_EMAIL_FROM = "SETUP_EMAIL_FROM";String SETUP_EMAIL_FROM_DEFAULT = "[email protected]";- String REQUEST_HEADER_REALM = "Auth-Realm";+ String REALM_PARAM_NAME = "Realm";String ASSET_ID_REGEXP = "^[0-9A-Za-z]{22}$";String UUID_REGEXP = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}";String EMAIL_REGEXP = "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])";diff --git a/model/src/main/java/org/openremote/model/asset/AssetEvent.java b/model/src/main/java/org/openremote/model/asset/AssetEvent.javaindex 56a7ba95f..9ed711ac0 100644--- a/model/src/main/java/org/openremote/model/asset/AssetEvent.java+++ b/model/src/main/java/org/openremote/model/asset/AssetEvent.java@@ -29,7 +29,7 @@ import java.util.Arrays;/*** This event is used when an {@link Asset} is created, read, updated or deleted (updates are only fired when one or more top- * level {@link Asset} properties are changed (excluding {@link Asset#getAttributes}. Attribute changes are handled via+ * level {@link Asset} properties are changed (including attributes). Attribute changes are handled via* the {@link org.openremote.model.attribute.AttributeEvent}. When the cause is {@link Cause#READ} then the asset's* {@link org.openremote.model.attribute.Attribute}s will be included in the asset otherwise they are not.*/diff --git a/model/src/main/java/org/openremote/model/asset/AssetFilter.java b/model/src/main/java/org/openremote/model/asset/AssetFilter.javaindex 9adbd0405..958f4507e 100644--- a/model/src/main/java/org/openremote/model/asset/AssetFilter.java+++ b/model/src/main/java/org/openremote/model/asset/AssetFilter.java@@ -27,6 +27,7 @@ import org.openremote.model.util.TextUtil;import java.util.Arrays;import java.util.List;+// TODO: Merge this with AssetQuery and use AssetQueryPredicate to resolvepublic class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<T> {public static final String FILTER_TYPE = "asset";@@ -36,6 +37,8 @@ public class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<protected String[] parentIds;protected String[] path;protected String[] attributeNames;+ protected boolean publicEvents;+ protected boolean restrictedEvents;public AssetFilter() {}@@ -71,6 +74,10 @@ public class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<return this;}+ public String[] getPath() {+ return path;+ }+public AssetFilter<T> setPath(String[] path) {this.path = path;return this;@@ -85,6 +92,24 @@ public class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<return this;}+ public boolean isPublicEvents() {+ return publicEvents;+ }++ public AssetFilter<T> setPublicEvents(boolean publicEvents) {+ this.publicEvents = publicEvents;+ return this;+ }++ public boolean isRestrictedEvents() {+ return restrictedEvents;+ }++ public AssetFilter<T> setRestrictedEvents(boolean restrictedEvents) {+ this.restrictedEvents = restrictedEvents;+ return this;+ }+@Overridepublic String getFilterType() {return FILTER_TYPE;@@ -93,6 +118,14 @@ public class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<@Overridepublic boolean apply(T event) {+ if (restrictedEvents && !event.canAccessRestrictedRead()) {+ return false;+ }++ if (publicEvents && !event.canAccessPublicRead()) {+ return false;+ }+if (assetIds != null && assetIds.length > 0) {if (!Arrays.asList(assetIds).contains(event.getAssetId())) {return false;diff --git a/model/src/main/java/org/openremote/model/asset/AssetResource.java b/model/src/main/java/org/openremote/model/asset/AssetResource.javaindex d99d30fc0..735d81ac9 100644--- a/model/src/main/java/org/openremote/model/asset/AssetResource.java+++ b/model/src/main/java/org/openremote/model/asset/AssetResource.java@@ -61,7 +61,6 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON;* <ul>* <li>{@link #getCurrentUserAssets}</li>* <li>{@link #queryAssets}</li>- * <li>{@link #queryPublicAssets}</li>* <li>{@link #get}</li>* <li>{@link #update}</li>* <li>{@link #writeAttributeValue}</li>@@ -277,27 +276,5 @@ public interface AssetResource {@Path("query")@Consumes(APPLICATION_JSON)@Produces(APPLICATION_JSON)- @RolesAllowed({Constants.READ_ASSETS_ROLE})Asset<?>[] queryAssets(@BeanParam RequestParams requestParams, AssetQuery query);-- /**- * Retrieve public assets using an {@link AssetQuery}.- * <p>- * Allows un-authenticated 'public' users to query public assets for a realm.- */- @POST- @Path("public/query")- @Consumes(APPLICATION_JSON)- @Produces(APPLICATION_JSON)- Asset<?>[] queryPublicAssets(@BeanParam RequestParams requestParams, AssetQuery query);-- /**- * Retrieve public assets using an {@link AssetQuery} as a JSON serialized query parameter.- * <p>- * Allows un-authenticated 'public' users to query public assets for a realm.- */- @GET- @Path("public/query")- @Produces(APPLICATION_JSON)- Asset<?>[] getPublicAssets(@BeanParam RequestParams requestParams, @QueryParam("q") String q);}diff --git a/model/src/main/java/org/openremote/model/attribute/Attribute.java b/model/src/main/java/org/openremote/model/attribute/Attribute.javaindex 4babcf131..3d57cf7c1 100644--- a/model/src/main/java/org/openremote/model/attribute/Attribute.java+++ b/model/src/main/java/org/openremote/model/attribute/Attribute.java@@ -319,6 +319,14 @@ public class Attribute<T> extends AbstractNameValueHolder<T> implements MetaHold@Overridepublic String toString() {+ return getClass().getSimpleName() + "{" ++ "name='" + name + '\'' ++ ", value='" + value + '\'' ++ ", timestamp='" + getTimestamp().orElse(0L) + '\'' ++ "} ";+ }++ public String toStringAll() {return getClass().getSimpleName() + "{" +"name='" + name + '\'' +", value='" + value + '\'' +diff --git a/model/src/main/java/org/openremote/model/event/shared/EventFilter.java b/model/src/main/java/org/openremote/model/event/shared/EventFilter.javaindex b82dc95d4..eb0cdfcab 100644--- a/model/src/main/java/org/openremote/model/event/shared/EventFilter.java+++ b/model/src/main/java/org/openremote/model/event/shared/EventFilter.java@@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect;import com.fasterxml.jackson.annotation.JsonSubTypes;import com.fasterxml.jackson.annotation.JsonTypeInfo;import org.openremote.model.asset.AssetFilter;-import org.openremote.model.simulator.SimulatorState;import org.openremote.model.syslog.SyslogEvent;/**@@ -36,7 +35,6 @@ import org.openremote.model.syslog.SyslogEvent;})@JsonTypeInfo(use = JsonTypeInfo.Id.NAME,- include = JsonTypeInfo.As.PROPERTY,property = "filterType")@JsonAutoDetect(diff --git a/model/src/main/java/org/openremote/model/event/shared/EventSubscription.java b/model/src/main/java/org/openremote/model/event/shared/EventSubscription.javaindex 6d89db077..5938a162b 100644--- a/model/src/main/java/org/openremote/model/event/shared/EventSubscription.java+++ b/model/src/main/java/org/openremote/model/event/shared/EventSubscription.java@@ -117,6 +117,10 @@ public class EventSubscription<E extends SharedEvent> {this.internalConsumer = internalConsumer;}+ public boolean isInternal() {+ return internalConsumer != null;+ }+public String getSubscriptionId() {return subscriptionId;}diff --git a/model/src/main/java/org/openremote/model/event/shared/SharedEvent.java b/model/src/main/java/org/openremote/model/event/shared/SharedEvent.javaindex e94b547cf..7828e314c 100644--- a/model/src/main/java/org/openremote/model/event/shared/SharedEvent.java+++ b/model/src/main/java/org/openremote/model/event/shared/SharedEvent.java@@ -67,4 +67,13 @@ public abstract class SharedEvent extends Event {public SharedEvent() {}++ public boolean canAccessPublicRead() {+ return false;+ }++ public boolean canAccessRestrictedRead() {+ return false;+ }+}diff --git a/model/src/main/java/org/openremote/model/query/AssetQuery.java b/model/src/main/java/org/openremote/model/query/AssetQuery.javaindex 844283d8b..8aab81f05 100644--- a/model/src/main/java/org/openremote/model/query/AssetQuery.java+++ b/model/src/main/java/org/openremote/model/query/AssetQuery.java@@ -214,7 +214,7 @@ public class AssetQuery implements Serializable {// Projectionpublic Select select;// Restriction predicates- public Access access = Access.PRIVATE;+ public Access access;public String[] ids;public StringPredicate[] names;public ParentPredicate[] parents;diff --git a/model/src/main/java/org/openremote/model/rules/AssetState.java b/model/src/main/java/org/openremote/model/rules/AssetState.javaindex 790b4e7e1..96e2735fc 100644--- a/model/src/main/java/org/openremote/model/rules/AssetState.java+++ b/model/src/main/java/org/openremote/model/rules/AssetState.java@@ -121,11 +121,6 @@ public class AssetState<T> implements Comparable<AssetState<?>>, NameValueHolderreturn ValueUtil.getValueCoerced(value, valueType);}- @Override- public void setValue(Object value) {- throw new UnsupportedOperationException("Cannot set value of Asset State");- }-public long getTimestamp() {return timestamp;}diff --git a/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java b/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.javaindex 4afa4a283..657d6b211 100644--- a/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java+++ b/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java@@ -96,7 +96,6 @@ public abstract class AbstractNameValueHolder<T> implements NameValueHolder<T>,}@JsonProperty- @Overridepublic void setValue(T value) {this.value = value;}diff --git a/model/src/main/java/org/openremote/model/value/ValueHolder.java b/model/src/main/java/org/openremote/model/value/ValueHolder.javaindex d39126b68..d0df25034 100644--- a/model/src/main/java/org/openremote/model/value/ValueHolder.java+++ b/model/src/main/java/org/openremote/model/value/ValueHolder.java@@ -42,6 +42,4 @@ public interface ValueHolder<T> {* Provides basic type casting/coercion useful for unknown values*/<U> Optional<U> getValueAs(Class<U> valueType);-- void setValue(T value);}diff --git a/project.gradle b/project.gradleindex d579823be..f93807457 100644--- a/project.gradle+++ b/project.gradle@@ -200,24 +200,24 @@ task npmInstall(type: Exec){}task npmClean(type: Exec){dependsOn getYarnInstallTask()- commandLine npmCommand("npm"), "run-script", "clean"+ commandLine npmCommand("npm"), "run", "clean"}task npmBuild(type: Exec){mustRunAfter npmCleandependsOn getYarnInstallTask()- commandLine npmCommand("npm"), "run-script", "build"+ commandLine npmCommand("npm"), "run", "build"}task npmTest(type: Exec){dependsOn getYarnInstallTask()- commandLine npmCommand("npm"), "run-script", "test"+ commandLine npmCommand("npm"), "run", "test"}task npmServe(type: Exec){dependsOn getYarnInstallTask()- commandLine npmCommand("npm"), "run-script", "serve"+ commandLine npmCommand("npm"), "run", "serve"}task npmPrepare(type: Exec){dependsOn getYarnInstallTask()- commandLine npmCommand("npm"), "run-script", "prepublishOnly"+ commandLine npmCommand("npm"), "run", "prepublishOnly"}task npmPublish(type: Exec){dependsOn getYarnInstallTask()@@ -225,7 +225,7 @@ task npmPublish(type: Exec){}task npmServeProduction(type: Exec){dependsOn getYarnInstallTask()- commandLine npmCommand("npm"), "run-script", "serveProduction"+ commandLine npmCommand("npm"), "run", "serveProduction"}// Add typescript tasksdiff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovyindex 7978b3c3b..514847eab 100644--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy+++ b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy@@ -55,9 +55,7 @@ import org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.GlobalRulesetimport org.openremote.model.rules.Rulesetimport org.openremote.model.rules.TenantRuleset-import org.openremote.model.security.Roleimport org.openremote.model.security.User-import org.openremote.model.util.Pairimport javax.websocket.ClientEndpointConfigimport javax.websocket.Endpoint@@ -502,7 +500,7 @@ trait ContainerTrait {.scheme("ws").replacePath(DefaultWebsocketComponent.WEBSOCKET_PATH).path(endpointPath)- .queryParam(Constants.REQUEST_HEADER_REALM, realm)+ .queryParam(Constants.REALM_PARAM_NAME, realm).queryParam("Authorization", "Bearer " + accessToken)}diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovyindex ebde195ec..e784bbdef 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy@@ -1,6 +1,7 @@package org.openremote.test.assetsimport org.openremote.manager.setup.SetupService+import org.openremote.model.asset.impl.ThingAssetimport org.openremote.model.attribute.AttributeStateimport org.openremote.model.attribute.AttributeWriteFailureimport org.openremote.model.util.ValueUtil@@ -20,6 +21,7 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions+import javax.ws.rs.BadRequestExceptionimport javax.ws.rs.WebApplicationExceptionimport static org.openremote.container.util.MapAccess.getString@@ -282,15 +284,16 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets[0].id == managerTestSetup.smartOfficeIdassets[0].realm == keycloakTestSetup.masterTenant.realm- when: "the root assets of the given realm are retrieved"+ when: "the root assets of a foreign realm are retrieved"assets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)).parents(new ParentPredicate(true)))- then: "result should match"- assets.length == 0+ then: "a bad request exception should be thrown"+ WebApplicationException ex = thrown()+ assert ex instanceof BadRequestExceptionwhen: "the child assets of an asset in a foreign realm are retrieved"assets = assetResource.queryAssets(null,@@ -311,7 +314,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassetResource.get(null, managerTestSetup.smartBuildingId)then: "access should be forbidden"- WebApplicationException ex = thrown()+ ex = thrown()ex.response.status == 403/* ############################################## WRITE ####################################### */@@ -422,8 +425,8 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai.parents(new ParentPredicate(true)))- then: "result should match"- assets.length == 0+ then: "a bad request exception should be thrown"+ thrown(BadRequestException)when: "the root assets of the authenticated realm are retrieved"assets = assetResource.queryAssets(null,@@ -436,7 +439,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets[0].id == managerTestSetup.smartBuildingIdassets[0].realm == keycloakTestSetup.tenantBuilding.realm- when: "the root assets of the given realm are retrieved"+ when: "the root assets of a foreign realm are retrieved"assets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantCity.realm))@@ -444,7 +447,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai)then: "result should match"- assets.length == 0+ thrown(BadRequestException)when: "the child assets of an asset in a foreign realm are retrieved"assets = assetResource.queryAssets(null,@@ -524,7 +527,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrairesponse.status == 403}- def "Access assets as testuser3"() {+ def "Access assets as testuser3 (restricted user)"() {given: "the server container is started"def container = startContainer(defaultConfig(), defaultServices())def managerTestSetup = container.getService(SetupService.class).getTaskOfType(ManagerTestSetup.class)@@ -587,8 +590,8 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai.parents(new ParentPredicate(true)))- then: "result should match"- assets.length == 0+ then: "a bad request exception should be thrown"+ thrown(BadRequestException)when: "the root assets of the authenticated realm are retrieved"assets = assetResource.queryAssets(null,@@ -599,15 +602,15 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraithen: "result should match"assets.length == 0- when: "the root assets of the given realm are retrieved"+ when: "the root assets of a foreign realm are retrieved"assets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantCity.realm)).parents(new ParentPredicate(true)))- then: "result should match"- assets.length == 0+ then: "a bad request exception should be thrown"+ thrown(BadRequestException)when: "the child assets of linked asset are retrieved"assets = assetResource.queryAssets(null,@@ -671,6 +674,12 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiex = thrown()ex.response.status == 403+ when: "all linked assets of the user are retrieved"+ assets = assetResource.queryAssets(null, null)++ then: "result should contain all linked assets"+ assets.length == 6+/* ############################################## WRITE ####################################### */when: "an asset is created in a foreign realm"@@ -838,26 +847,17 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiand: "the asset resource"def assetResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm).proxy(AssetResource.class)- when: "the public assets are retrieved using the query parameter endpoint"- def assets = assetResource.getPublicAssets(null, ValueUtil.asJSON(- new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm))- ).get())-- then: "the public assets should be retrieved"- assert assets.size() == 2- assert assets.find {it.id == managerTestSetup.apartment1Id} != null- assert assets.find {it.id == managerTestSetup.apartment2LivingroomId} != null-- when: "the public assets are retrieved using the query parameter endpoint without a query"- assets = assetResource.getPublicAssets(null, null)+ when: "the public assets are retrieved"+ def assets = assetResource.queryAssets(null, new AssetQuery()+ .tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)))then: "the public assets should be retrieved"assert assets.size() == 2assert assets.find {it.id == managerTestSetup.apartment1Id} != nullassert assets.find {it.id == managerTestSetup.apartment2LivingroomId} != null- when: "the public assets are retrieved using the post endpoint"- assets = assetResource.queryPublicAssets(null, new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)))+ when: "the public assets are retrieved without a query"+ assets = assetResource.queryAssets(null, null)then: "the public assets should be retrieved"assert assets.size() == 2diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovydeleted file mode 100644index 45b3923fe..000000000--- a/test/src/test/groovy/org/openremote/test/assets/AssetPublicQueryTest.groovy+++ /dev/null@@ -1,109 +0,0 @@-package org.openremote.test.assets---import org.openremote.container.persistence.PersistenceService-import org.openremote.manager.asset.AssetStorageService-import org.openremote.manager.setup.SetupService-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup-import org.openremote.model.asset.Asset-import org.openremote.model.asset.impl.ThingAsset-import org.openremote.model.attribute.Attribute-import org.openremote.model.asset.AssetResource-import org.openremote.model.attribute.MetaItem-import org.openremote.model.query.AssetQuery-import org.openremote.model.util.ValueUtil-import org.openremote.test.ManagerContainerTrait-import spock.lang.Shared-import spock.lang.Specification--import static org.openremote.model.Constants.MASTER_REALM-import static org.openremote.model.value.ValueType.*-import static org.openremote.model.value.MetaItemType.*--class AssetPublicQueryTest extends Specification implements ManagerContainerTrait {-- @Shared- static ManagerTestSetup managerTestSetup- @Shared- static KeycloakTestSetup keycloakTestSetup- @Shared- static AssetStorageService assetStorageService- @Shared- static PersistenceService persistenceService- @Shared- static AssetResource assetResource- @Shared- static List<Asset> returnedAssets-- def setupSpec() {- given: "the server container is started"- def container = startContainer(defaultConfig(), defaultServices())- managerTestSetup = container.getService(SetupService.class).getTaskOfType(ManagerTestSetup.class)- keycloakTestSetup = container.getService(SetupService.class).getTaskOfType(KeycloakTestSetup.class)- assetStorageService = container.getService(AssetStorageService.class)- persistenceService = container.getService(PersistenceService.class)- assetResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM).proxy(AssetResource.class)- returnedAssets = new ArrayList<>()- returnedAssets = new ArrayList<>()-- for (int i = 0; i < 10; i++) {- Asset somePublicAsset = new ThingAsset("Some Public Asset")- .setParentId(managerTestSetup.smartOfficeId)- .setRealm(MASTER_REALM)- .setAccessPublicRead(true)- somePublicAsset.addOrReplaceAttributes(- new Attribute<>("somePrivateAttribute", NUMBER, 123D).addMeta(- new MetaItem<>(LABEL, "Some Private Attribute")- ),- new Attribute<>("somePublicAttribute", NUMBER, 456D).addMeta(- new MetaItem<>(LABEL, "Some Public Attribute"),- new MetaItem<>(ACCESS_PUBLIC_READ, true)- ),- )-- returnedAssets.add(assetStorageService.merge(somePublicAsset))- }- }-- def "Query public assets"() {-- expect: "10 public assets to have been created"- assert returnedAssets.size() == 10- assert returnedAssets.count { it.id != null } == 10-- when: "a query for a specific public asset is executed"- def query = new AssetQuery()- .ids(returnedAssets.get(0).id)- def assets = assetResource.queryPublicAssets(null, query)-- then: "the result should match"- assets.size() == 1- assets[0].id == returnedAssets.get(0).id- assets[0].name == "Some Public Asset"- assets[0].type == ThingAsset.DESCRIPTOR.name- assets[0].parentId == managerTestSetup.smartOfficeId- assets[0].realm == keycloakTestSetup.masterTenant.realm- !assets[0].getAttribute("somePrivateAttribute").isPresent()- assets[0].getAttribute("somePublicAttribute").get().getValue().get() == 456- assets[0].getAttribute("somePublicAttribute").get().getMeta().size() >= 1- assets[0].getAttribute("somePublicAttribute").get().getMetaItem(LABEL).get().getValue().get() == "Some Public Attribute"-- when: "a GET query for a specific public asset is executed"- def queryJson = "{\"select\":{\"include\":\"ALL\"},\"id\":\"${returnedAssets.get(0).id}\"}"- queryJson = ValueUtil.JSON.writeValueAsString(query)- assets = assetResource.getPublicAssets(null, queryJson)-- then: "the result should match"- assets.size() == 1- assets[0].id == returnedAssets.get(0).id- assets[0].name == "Some Public Asset"- assets[0].type == ThingAsset.DESCRIPTOR.name- assets[0].parentId == managerTestSetup.smartOfficeId- assets[0].realm == keycloakTestSetup.masterTenant.realm- !assets[0].getAttribute("somePrivateAttribute").isPresent()- assets[0].getAttribute("somePublicAttribute").get().getValue().get() == 456- assets[0].getAttribute("somePublicAttribute").get().getMeta().size() >= 1- assets[0].getAttribute("somePublicAttribute").get().getMetaItem(LABEL).get().getValue().get() == "Some Public Attribute"- }-}diff --git a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovyindex 908135c7d..ef34f3945 100644--- a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy+++ b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy@@ -110,7 +110,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {when: "the Gateway client is created"def gatewayClient = new WebsocketIOClient<String>(- new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Auth-Realm=$managerTestSetup.realmBuildingTenant").build(),+ new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Realm=$managerTestSetup.realmBuildingTenant").build(),null,new OAuthClientCredentialsGrant("http://127.0.0.1:$serverPort/auth/realms/$managerTestSetup.realmBuildingTenant/protocol/openid-connect/token",gateway.getClientId().orElse(""),@@ -601,7 +601,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {when: "the gateway client reconnects with the new secret"gatewayClient = new WebsocketIOClient<String>(- new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Auth-Realm=$managerTestSetup.realmBuildingTenant").build(),+ new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Realm=$managerTestSetup.realmBuildingTenant").build(),null,new OAuthClientCredentialsGrant("http://127.0.0.1:$serverPort/auth/realms/$managerTestSetup.realmBuildingTenant/protocol/openid-connect/token",gateway.getClientId().orElse(""),diff --git a/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovyindex bd35a2cf2..ead055e62 100644--- a/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy@@ -24,10 +24,6 @@ import org.openremote.agent.protocol.mqtt.MQTTAgentimport org.openremote.agent.protocol.mqtt.MQTTAgentLinkimport org.openremote.agent.protocol.mqtt.MQTTProtocolimport org.openremote.agent.protocol.simulator.SimulatorProtocol-import org.openremote.agent.protocol.websocket.WebsocketAgentLink-import org.openremote.agent.protocol.websocket.WebsocketHTTPSubscription-import org.openremote.agent.protocol.websocket.WebsocketSubscription-import org.openremote.agent.protocol.websocket.WebsocketSubscriptionImplimport org.openremote.container.util.UniqueIdentifierGeneratorimport org.openremote.manager.agent.AgentServiceimport org.openremote.manager.asset.AssetProcessingService@@ -35,7 +31,6 @@ import org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.event.ClientEventServiceimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.Constants-import org.openremote.model.asset.ReadAttributeEventimport org.openremote.model.asset.agent.Agentimport org.openremote.model.asset.agent.ConnectionStatusimport org.openremote.model.asset.agent.Protocol@@ -44,22 +39,12 @@ import org.openremote.model.attribute.Attributeimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.MetaItemimport org.openremote.model.auth.UsernamePassword-import org.openremote.model.event.TriggeredEventSubscription-import org.openremote.model.event.shared.SharedEvent-import org.openremote.model.query.filter.StringPredicate-import org.openremote.model.util.ValueUtil-import org.openremote.model.value.JsonPathFilter-import org.openremote.model.value.RegexValueFilter-import org.openremote.model.value.SubStringValueFilter-import org.openremote.model.value.ValueFilterimport org.openremote.test.ManagerContainerTraitimport org.openremote.test.setup.KeycloakTestSetupimport org.openremote.test.setup.ManagerTestSetupimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.core.MediaType-import static org.openremote.container.util.MapAccess.getIntegerimport static org.openremote.container.util.MapAccess.getStringimport static org.openremote.manager.mqtt.MqttBrokerService.MQTT_SERVER_LISTEN_HOSTdiff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovyindex 6899b310d..5e5ed0b2a 100644--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy@@ -141,7 +141,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContaiand: "a Websocket client agent is created to connect to this tests manager"def agent = new WebsocketAgent("Test agent").setRealm(Constants.MASTER_REALM)- .setConnectUri("ws://127.0.0.1:$serverPort/websocket/events?Auth-Realm=master")+ .setConnectUri("ws://127.0.0.1:$serverPort/websocket/events?Realm=master").setOAuthGrant(new OAuthPasswordGrant("http://127.0.0.1:$serverPort/auth/realms/master/protocol/openid-connect/token",KEYCLOAK_CLIENT_ID,null,diff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovyindex 4b485187f..df11253fc 100644--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy@@ -85,7 +85,7 @@ class WebsocketClientTest extends Specification implements ManagerContainerTraitand: "a simple Websocket client"def client = new WebsocketIOClient<String>(- new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Auth-Realm=master").build(),+ new URIBuilder("ws://127.0.0.1:$serverPort/websocket/events?Realm=master").build(),null,new OAuthPasswordGrant("http://127.0.0.1:$serverPort/auth/realms/master/protocol/openid-connect/token",KEYCLOAK_CLIENT_ID,diff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovyindex 053f39d5d..33288ddf8 100644--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy@@ -24,9 +24,7 @@ import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3ClientConfigViewimport com.hivemq.client.mqtt.MqttClientConfigimport com.hivemq.client.mqtt.MqttClientConnectionConfigimport io.moquette.BrokerConstants-import io.netty.channel.ChannelOptionimport io.netty.channel.socket.SocketChannel-import io.netty.channel.socket.nio.NioSocketChannelimport org.openremote.agent.protocol.mqtt.MQTTMessageimport org.openremote.agent.protocol.mqtt.MQTT_IOClientimport org.openremote.container.util.UniqueIdentifierGeneratordiff --git a/ui/app/console_loader/src/index.ts b/ui/app/console_loader/src/index.tsindex 4ebb8b4ea..554be09c8 100644--- a/ui/app/console_loader/src/index.ts+++ b/ui/app/console_loader/src/index.ts@@ -44,7 +44,7 @@ const onboardingConfig:OnboardingConfig = {image: require("../images/onboarding-geofence.svg")}],- redirect: "/main/?realm=smartcity&consoleProviders=geofence push storage"+ redirect: "/manager/?realm=smartcity&consoleProviders=geofence push storage"}const splashConfig:SplashConfig = {diff --git a/ui/app/manager/src/pages/page-map.ts b/ui/app/manager/src/pages/page-map.tsindex 8a74d2f13..2f577521a 100644--- a/ui/app/manager/src/pages/page-map.ts+++ b/ui/app/manager/src/pages/page-map.ts@@ -17,6 +17,7 @@ import {Asset,AssetEvent,AssetEventCause,+ AssetQuery,Attribute,AttributeEvent,GeoJSONPoint,@@ -25,6 +26,7 @@ import {} from "@openremote/model";import {getAssetsRoute, getMapRoute} from "../routes";import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";+import {GenericAxiosResponse, RestResponse } from "@openremote/rest";export interface MapState {assets: Asset[];@@ -52,7 +54,10 @@ const pageMapSlice = createSlice({const asset = action.payload.asset;const locationAttr = asset.attributes && asset.attributes.hasOwnProperty(WellknownAttributes.LOCATION) ? asset.attributes[WellknownAttributes.LOCATION] as Attribute<GeoJSONPoint> : undefined;if (locationAttr && (!locationAttr.meta || locationAttr.meta && (!locationAttr.meta.hasOwnProperty(WellknownMetaItems.SHOWONDASHBOARD) || !!locationAttr.meta[WellknownMetaItems.SHOWONDASHBOARD]))) {- state.assets.push(action.payload.asset);+ return {+ ...state,+ assets: [...this.state.assets, action.payload.asset]+ };}}@@ -69,10 +74,13 @@ const pageMapSlice = createSlice({}if (action.payload.attributeState.deleted) {- assets.splice(index, 1);- } else {- assets[index] = Util.updateAsset({...asset}, action.payload);+ return {+ ...state,+ assets: [...assets.splice(index, 1)]+ };}++ assets[index] = Util.updateAsset({...asset}, action.payload);return state;},setAssets(state, action: PayloadAction<Asset[]>) {@@ -87,8 +95,11 @@ const pageMapSlice = createSlice({const {assetEventReceived, attributeEventReceived, setAssets} = pageMapSlice.actions;export const pageMapReducer = pageMapSlice.reducer;++export interface PageMapConfig {- card?: MapAssetCardConfig+ card?: MapAssetCardConfig,+ assetQuery?: AssetQuery}export function pageMapProvider(store: EnhancedStore<MapStateKeyed>, config?: PageMapConfig): PageProvider<MapStateKeyed> {@@ -164,59 +175,62 @@ export class PageMap extends Page<MapStateKeyed> {protected attributeSubscriptionId: string;protected subscribeAssets = async (realm: string) => {-- try {- const result = await manager.rest.api.AssetResource.queryAssets({- tenant: {- realm: realm- },- select: {- attributes: [WellknownAttributes.LOCATION],- excludeParentInfo: true,- excludePath: true- },- attributes: {- items: [- {- name: {- predicateType: "string",- value: WellknownAttributes.LOCATION+ let response: GenericAxiosResponse<Asset[]>;++ const assetQuery: AssetQuery = this.config && this.config.assetQuery ? this.config.assetQuery : {+ tenant: {+ realm: realm+ },+ select: {+ attributes: [WellknownAttributes.LOCATION],+ excludeParentInfo: true,+ excludePath: true+ },+ attributes: {+ items: [+ {+ name: {+ predicateType: "string",+ value: WellknownAttributes.LOCATION+ },+ meta: [+ {+ name: {+ predicateType: "string",+ value: WellknownMetaItems.SHOWONDASHBOARD+ },+ negated: true},- meta: [- {- name: {- predicateType: "string",- value: WellknownMetaItems.SHOWONDASHBOARD- },- negated: true+ {+ name: {+ predicateType: "string",+ value: WellknownMetaItems.SHOWONDASHBOARD},- {- name: {- predicateType: "string",- value: WellknownMetaItems.SHOWONDASHBOARD- },- value: {- predicateType: "boolean",- value: true- }+ value: {+ predicateType: "boolean",+ value: true}- ]- }- ]- }- });+ }+ ]+ }+ ]+ }+ };++ try {+ response = await manager.rest.api.AssetResource.queryAssets(assetQuery);if (!this.isConnected || realm !== this._realmSelector(this.getState())) {// No longer connected or realm has changedreturn;}- if (result.data) {- const assets = result.data;+ if (response.data) {+ const assets = response.data;this._store.dispatch(setAssets(assets));- const assetSubscriptionId = await manager.events.subscribeAssetEvents(undefined, false, undefined, (event) => {+ const assetSubscriptionId = await manager.events.subscribeAssetEvents(undefined, false, (event) => {this._store.dispatch(assetEventReceived(event));});diff --git a/ui/component/core/src/asset-mixin.ts b/ui/component/core/src/asset-mixin.tsindex 0903bfe1c..cca6f7f4f 100644--- a/ui/component/core/src/asset-mixin.ts+++ b/ui/component/core/src/asset-mixin.ts@@ -108,7 +108,7 @@ export const subscribe = (eventProviderFactory: EventProviderFactory) => <T extethis._subscriptionIds = [];if (!isAttributes) {- const assetSubscriptionId = await eventProviderFactory.getEventProvider()!.subscribeAssetEvents(ids, true, undefined, (event) => this._onEvent(event));+ const assetSubscriptionId = await eventProviderFactory.getEventProvider()!.subscribeAssetEvents(ids, true, (event) => this._onEvent(event));// Check if the same IDs are in placeconst currentIds: string[] | AttributeRef[] | undefined = this._attributeRefs ? this._attributeRefs : this._assetIds;if (!this._subscriptionIds || !Util.objectsEqual(ids, currentIds)) {diff --git a/ui/component/core/src/event.ts b/ui/component/core/src/event.tsindex 41ea0f533..84d5b7007 100644--- a/ui/component/core/src/event.ts+++ b/ui/component/core/src/event.ts@@ -41,7 +41,7 @@ export interface EventProvider {/*** Subscribe to {@link AssetEvent}s for the specified {@link Asset}s for all {@link Asset}s*/- subscribeAssetEvents(ids: string[] | AttributeRef[] | undefined, requestCurrentValues: boolean, filter: AssetFilter | undefined, callback: (event: AssetEvent) => void): Promise<string>;+ subscribeAssetEvents(ids: string[] | AttributeRef[] | undefined, requestCurrentValues: boolean, callback: (event: AssetEvent) => void): Promise<string>;/*** Subscribe to {@link AttributeEvent}s for the specified {@link Asset}s and if {@link AttributeRef}s are provided@@ -267,7 +267,7 @@ abstract class EventProviderImpl implements EventProvider {return this._doSendWithReply(event);}- public async subscribeAssetEvents(ids: string[] | AttributeRef[] | undefined, requestCurrentValues: boolean, filter: AssetFilter | undefined, callback: (event: AssetEvent) => void): Promise<string> {+ public async subscribeAssetEvents(ids: string[] | AttributeRef[] | undefined, requestCurrentValues: boolean, callback: (event: AssetEvent) => void): Promise<string> {const isAttributeRef = ids && typeof ids[0] !== "string";const assetIds = isAttributeRef ? (ids as AttributeRef[]).map((ref) => ref.id!) : ids as string[] | undefined;@@ -276,15 +276,26 @@ abstract class EventProviderImpl implements EventProvider {// If not already done then create a single global subscription for asset events and filter for each callbackif (!this._assetEventPromise) {+ let assetFilter: AssetFilter | undefined;++ if (!manager.authenticated) {+ // Need to set the filter realm when anonymous+ assetFilter = {+ filterType: "asset",+ realm: manager.displayRealm+ }+ }+const subscription: EventSubscription<AssetEvent> = {eventType: "asset",+ filter: assetFilter};- if (assetIds) {- subscription.filter = {- filterType: "asset",- assetIds: assetIds- };- }+ // if (assetIds) {+ // subscription.filter = {+ // filterType: "asset",+ // assetIds: assetIds+ // };+ // }this._assetEventPromise = this.subscribe(subscription, (event) => {this._assetEventCallbackMap.forEach((callback) => callback(event));});@@ -361,8 +372,19 @@ abstract class EventProviderImpl implements EventProvider {// If not already done then create a single global subscription for attribute events and filter for each callbackif (!this._attributeEventPromise) {+ let assetFilter: AssetFilter | undefined;++ if (!manager.authenticated) {+ // Need to set the filter realm when anonymous+ assetFilter = {+ filterType: "asset",+ realm: manager.displayRealm+ }+ }+const subscription: EventSubscription<AttributeEvent> = {- eventType: "attribute"+ eventType: "attribute",+ filter: assetFilter};this._attributeEventPromise = this.subscribe(subscription, (event) => {this._attributeEventCallbackMap.forEach((callback) => callback(event));@@ -595,7 +617,7 @@ export class WebSocketEventProvider extends EventProviderImpl {}protected _doConnect(): Promise<boolean> {- let authorisedUrl = this._endpointUrl + "?Auth-Realm=" + manager.config.realm;+ let authorisedUrl = this._endpointUrl + "?Realm=" + manager.config.realm;if (manager.authenticated) {authorisedUrl += "&Authorization=" + manager.getAuthorizationHeader();@@ -612,7 +634,7 @@ export class WebSocketEventProvider extends EventProviderImpl {}};- this._webSocket!.onerror = () => {+ this._webSocket!.onerror = (err) => {if (this._connectDeferred) {const deferred = this._connectDeferred;this._connectDeferred = null;@@ -653,7 +675,7 @@ export class WebSocketEventProvider extends EventProviderImpl {const deferred = this._subscribeDeferred;this._subscribeDeferred = null;if (deferred) {- console.warn("Unauthorized event subscription: " + subscription);+ console.warn("Unauthorized event subscription: " + JSON.stringify(subscription, null, 2));deferred.reject("Unauthorized");}} else if (msg.startsWith(TRIGGERED_MESSAGE_PREFIX)) {diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex abcadcac8..29d432d5d 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -1248,15 +1248,14 @@ export class Manager implements EventProviderFactory {// TODO: Remove events logic once websocket supports anonymous connectionsprotected _setAuthenticated(authenticated: boolean) {this._authenticated = authenticated;- if (authenticated) {- if (!this._events) {- this.doEventsSubscriptionInit();- }- } else {- if (this._events) {- this._events.disconnect();- }- this._events = undefined;++ // Reconnect to websocket+ if (this._events) {+ this._events.disconnect();+ }++ if (!this._events) {+ this.doEventsSubscriptionInit();}}}diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex e34ce373f..9540b063f 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -846,7 +846,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {public async _addEventSubscriptions(): Promise<void> {if (!this.disableSubscribe) {// Subscribe to asset events for all assets in the realm- this._subscriptionIds = [await manager.getEventProvider()!.subscribeAssetEvents(undefined, false, undefined, (event) => this._onEvent(event))];+ this._subscriptionIds = [await manager.getEventProvider()!.subscribeAssetEvents(undefined, false, (event) => this._onEvent(event))];}}diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 73a409692..e1ad93bc4 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -8,8 +8,6 @@ import "@openremote/or-mwc-components/or-mwc-input";import "@openremote/or-attribute-input";import "@openremote/or-attribute-history";import "@openremote/or-chart";-import "@openremote/or-survey";-import "@openremote/or-survey-results";import "@openremote/or-mwc-components/or-mwc-table";import "@openremote/or-components/or-panel";import "@openremote/or-mwc-components/or-mwc-dialog";@@ -518,16 +516,20 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: { [}+ // This is not something that should be part of the standard asset-viewerif (panelConfig && panelConfig.type === "survey") {- return html`- <or-survey id="survey" .surveyId="${asset.id}"></or-survey>- `;+ return html``;+ // return html`+ // <or-survey id="survey" .surveyId="${asset.id}"></or-survey>+ // `;}+ // This is not something that should be part of the standard asset-viewerif (panelConfig && panelConfig.type === "survey-results") {- return html`- <or-survey-results id="survey-results" .survey="${asset}"></or-survey-results>- `;+ return html``;+ // return html`+ // <or-survey-results id="survey-results" .survey="${asset}"></or-survey-results>+ // `;}if (panelConfig && panelConfig.type === "history") {diff --git a/ui/component/or-asset-viewer/tsconfig.json b/ui/component/or-asset-viewer/tsconfig.jsonindex aeb2fd09f..1b805cbb8 100644--- a/ui/component/or-asset-viewer/tsconfig.json+++ b/ui/component/or-asset-viewer/tsconfig.json@@ -16,8 +16,6 @@{ "path": "../or-translate" },{ "path": "../or-icon" },{ "path": "../or-map" },- { "path": "../or-survey" },- { "path": "../or-survey-results" },{ "path": "../or-attribute-input" },{ "path": "../or-attribute-history" },{ "path": "../or-mwc-components" },diff --git a/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts b/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.tsindex 7b566bf50..57ec452de 100644--- a/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts+++ b/ui/component/or-attribute-input/src/agent-link-json-forms-renderer.ts@@ -47,7 +47,7 @@ export function loadAgents(): PromiseLike<Agent[]> {}});- manager.events!.subscribeAssetEvents(undefined, false, undefined, (assetEvent) => {+ manager.events!.subscribeAssetEvents(undefined, false, (assetEvent) => {if (assetEvent.asset && assetEvent.asset.type!.endsWith("Agent")) {agents = undefined;loadingPromise = undefined;diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.tsindex 66386f42e..719a072c3 100644--- a/ui/component/or-map/src/index.ts+++ b/ui/component/or-map/src/index.ts@@ -27,13 +27,13 @@ export {Control, IControl} from "maplibre-gl";export * from "./or-map-asset-card";export interface ViewSettings {- "center": LngLatLike;- "bounds": LngLatBoundsLike;- "zoom": number;- "maxZoom": number;- "minZoom": number;- "boxZoom": boolean;- "geoCodeUrl": String;+ center: LngLatLike;+ bounds: LngLatBoundsLike;+ zoom: number;+ maxZoom: number;+ minZoom: number;+ boxZoom: boolean;+ geocodeUrl: String;}export interface MapEventDetail {diff --git a/ui/component/or-map/src/mapwidget.ts b/ui/component/or-map/src/mapwidget.tsindex ce57a87a0..3bdcc4a7f 100644--- a/ui/component/or-map/src/mapwidget.ts+++ b/ui/component/or-map/src/mapwidget.ts@@ -296,7 +296,7 @@ export class MapWidget {this._onMapClick(e.lngLat, true);});- if (this._showGeoCodingControl && this._viewSettings && this._viewSettings.geoCodeUrl) {+ if (this._showGeoCodingControl && this._viewSettings && this._viewSettings.geocodeUrl) {this._geocoder = new MaplibreGeocoder({forwardGeocode: this._forwardGeocode.bind(this), reverseGeocode: this._reverseGeocode }, { marker: false, showResultsWhileTyping: true });// Override the _onKeyDown function from MaplibreGeocoder which has a bug getting the value from the input elementthis._geocoder._onKeyDown = debounce((e: KeyboardEvent) => {@@ -603,7 +603,7 @@ export class MapWidget {protected async _forwardGeocode(config: any) {const features = [];try {- let request = this._viewSettings!.geoCodeUrl + '/search?q=' + config.query + '&format=geojson&polygon_geojson=1&addressdetails=1';+ let request = this._viewSettings!.geocodeUrl + '/search?q=' + config.query + '&format=geojson&polygon_geojson=1&addressdetails=1';const response = await fetch(request);const geojson = await response.json();for (let feature of geojson.features) {diff --git a/ui/component/or-map/src/or-map-asset-card.ts b/ui/component/or-map/src/or-map-asset-card.tsindex 807b50cc9..6ad6cff8b 100644--- a/ui/component/or-map/src/or-map-asset-card.ts+++ b/ui/component/or-map/src/or-map-asset-card.ts@@ -26,6 +26,7 @@ import { i18next } from "@openremote/or-translate";export interface MapAssetCardTypeConfig {include?: string[];exclude?: string[];+ hideViewAsset?: boolean;}export interface MapAssetCardConfig {@@ -164,9 +165,11 @@ export class OrMapAssetCard extends subscribe(manager)(LitElement) {})}</ul></div>- <div id="footer">- <or-mwc-input .type="${InputType.BUTTON}" .label="${i18next.t("viewAsset")}" @click="${(e: MouseEvent) => {e.preventDefault(); this._loadAsset(this.asset!.id!);}}"></or-mwc-input>- </div>+ ${cardConfig && cardConfig.hideViewAsset ? html`` : html`+ <div id="footer">+ <or-mwc-input .type="${InputType.BUTTON}" .label="${i18next.t("viewAsset")}" @click="${(e: MouseEvent) => {e.preventDefault(); this._loadAsset(this.asset!.id!);}}"></or-mwc-input>+ </div>+ `}</div>`;}diff --git a/ui/component/or-survey-results/src/index.ts b/ui/component/or-survey-results/src/index.tsindex 0972cf363..d1cf3b6a7 100644--- a/ui/component/or-survey-results/src/index.ts+++ b/ui/component/or-survey-results/src/index.ts@@ -143,7 +143,7 @@ class OrSurveyResults extends LitElement {ids: [surveyId]};- manager.rest.api.AssetResource.queryPublicAssets(surveyQuery).then((response) => {+ manager.rest.api.AssetResource.queryAssets(surveyQuery).then((response) => {if (response && response.data) {this.survey = response.data[0];this.requestUpdate();@@ -156,7 +156,7 @@ class OrSurveyResults extends LitElement {parents: [{id:surveyId}]};- manager.rest.api.AssetResource.queryPublicAssets(surveyQuestQuery).then((response) => {+ manager.rest.api.AssetResource.queryAssets(surveyQuestQuery).then((response) => {if (response && response.data) {this.questions = response.data;this.requestUpdate();diff --git a/ui/component/or-survey/src/index.ts b/ui/component/or-survey/src/index.tsindex 34ddce627..2ca954bde 100644--- a/ui/component/or-survey/src/index.ts+++ b/ui/component/or-survey/src/index.ts@@ -413,7 +413,7 @@ class OrSurvey extends LitElement {ids: [surveyId],types: ["SurveyAsset"]};- manager.rest.api.AssetResource.queryPublicAssets(surveyQuery).then((response) => {+ manager.rest.api.AssetResource.queryAssets(surveyQuery).then((response) => {if (response && response.data) {this.survey = response.data[0];this.requestUpdate();@@ -431,7 +431,7 @@ class OrSurvey extends LitElement {types: ["SurveyQuestionAsset"]};- manager.rest.api.AssetResource.queryPublicAssets(questionQuery).then((response) => {+ manager.rest.api.AssetResource.queryAssets(questionQuery).then((response) => {if (response && response.data) {const questions = response.data;questions.sort((a, b) => a.attributes && b.attributes ? a.attributes.order.value - b.attributes.order.value : 0);diff --git a/ui/util/cli.js b/ui/util/cli.jsindex cbb0bd293..94450e143 100755--- a/ui/util/cli.js+++ b/ui/util/cli.js@@ -6,7 +6,7 @@ const { spawn } = require("child_process");/* THIS IS JUST A WRAPPER THAT LAUNCHES GRADLE TASKS */-/* Try and get the gradle openremote project dir */+/* Try and get the openremote project dir or custom project dir */function getWorkingDirectory() {let dirs = __dirname.split(path.sep);dirs.pop();@@ -15,6 +15,11 @@ function getWorkingDirectory() {let cwd = dirs.join(path.sep);cwd = path.join(cwd, "..");+ if (fs.existsSync(path.join(cwd, "..", ".gitmodules"))) {+ // Assume we're in a custom project+ cwd = path.join(cwd, "..");+ }+return cwd;}