Skip to content

armgit / core

Public Imported from GitHub
0

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

Bug fixes for MQTT and protocol asset discovery

Rich Turner4f8ddc0f1bca
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
index 8db5e1aa4..8622682e7 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
@@ -42,6 +42,8 @@ import java.util.List;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -52,14 +54,17 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
private static final Logger LOG = Logger.getLogger(AgentResourceImpl.class.getName());
protected final AgentService agentService;
protected final AssetStorageService assetStorageService;
+ protected final ScheduledExecutorService executorService;
public AgentResourceImpl(TimerService timerService,
ManagerIdentityService identityService,
AssetStorageService assetStorageService,
- AgentService agentService) {
+ AgentService agentService,
+ ScheduledExecutorService executorService) {
super(timerService, identityService);
this.agentService = agentService;
this.assetStorageService = assetStorageService;
+ this.executorService = executorService;
}
@Override
@@ -118,12 +123,25 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
}
List<AssetTreeNode> foundAssets = new ArrayList<>();
- agentService.doProtocolAssetDiscovery(agent, assets -> {
+ String finalRealm = realm;
+
+ Future<Void> result = agentService.doProtocolAssetDiscovery(agent, assets -> {
if (assets != null) {
+ // Persist the assets in a separate thread
+ executorService.submit(() -> persistAssets(assets, agent, finalRealm));
foundAssets.addAll(Arrays.asList(assets));
}
});
+ try {
+ result.get(10000, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ LOG.fine("Protocol discovery stopped as timeout reached");
+ } catch (Exception e) {
+ LOG.log(Level.INFO, "Protocol discovery threw an exception: " + agent, e);
+ throw new BadRequestException("Protocol discovery threw an exception: " + agent, e);
+ }
+
return foundAssets.toArray(new AssetTreeNode[0]);
}
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
index ae9866a90..82c809c85 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -129,7 +129,8 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
container.getService(TimerService.class),
container.getService(ManagerIdentityService.class),
assetStorageService,
- this)
+ this,
+ container.getExecutorService())
);
initDone = true;
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthenticator.java b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthenticator.java
index b80fd1101..09651f1e9 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthenticator.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthenticator.java
@@ -23,6 +23,7 @@ import io.moquette.broker.security.IAuthenticator;
import org.keycloak.representations.idm.ClientRepresentation;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.model.security.Tenant;
+import org.openremote.model.security.User;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.TextUtil;
@@ -70,14 +71,12 @@ public class KeycloakAuthenticator implements IAuthenticator {
return false;
}
- ClientRepresentation clientRepresentation = identityProvider.getClient(realm, username);
-
- if (clientRepresentation == null || TextUtil.isNullOrEmpty(clientRepresentation.getSecret())) {
- LOG.warning("Client not found or doesn't support client credentials grant type");
+ User user = identityProvider.getUserByUsername(realm, User.SERVICE_ACCOUNT_PREFIX + username);
+ if (user == null || user.getEnabled() == null || !user.getEnabled() || TextUtil.isNullOrEmpty(user.getSecret())) {
+ LOG.warning("User not found, disabled or doesn't support client credentials grant type");
return false;
}
- String clientSecret = clientRepresentation.getSecret();
- return suppliedClientSecret.equals(clientSecret);
+ return suppliedClientSecret.equals(user.getSecret());
}
}
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ORAuthorizatorPolicy.java b/manager/src/main/java/org/openremote/manager/mqtt/ORAuthorizatorPolicy.java
index 2b523d801..b93f0770a 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/ORAuthorizatorPolicy.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/ORAuthorizatorPolicy.java
@@ -158,7 +158,7 @@ public class ORAuthorizatorPolicy implements IAuthorizatorPolicy {
}
} else {
// Must be of form //attribute/assetId/attributeName or //attribute/assetId/attributeName/value
- if (topicTokens.size() == 3 || (topicTokens.size() == 4 && ATTRIBUTE_VALUE_TOPIC.equals(topicTokens.get(3)))) {
+ if (!(topicTokens.size() == 3 || (topicTokens.size() == 4 && ATTRIBUTE_VALUE_TOPIC.equals(topicTokens.get(3))))) {
LOG.info("Write request to attribute topic should contain asset ID and attribute name only: " + connection);
return false;
}
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
index 71b250a40..14dad1789 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
@@ -292,8 +292,11 @@ public class ORInterceptHandler extends AbstractInterceptHandler {
headers.put(ClientEventService.HEADER_CONNECTION_TYPE, ClientEventService.HEADER_CONNECTION_TYPE_MQTT);
try {
- AccessToken accessToken = AdapterTokenVerifier.verifyToken(connection.getAccessToken(), identityProvider.getKeycloakDeployment(connection.realm, connection.getUsername()));
- headers.put(Constants.AUTH_CONTEXT, new AccessTokenAuthContext(connection.realm, accessToken));
+ String token = connection.getAccessToken();
+ if (token != null) {
+ AccessToken accessToken = AdapterTokenVerifier.verifyToken(token, identityProvider.getKeycloakDeployment(connection.realm, connection.getUsername()));
+ headers.put(Constants.AUTH_CONTEXT, new AccessTokenAuthContext(connection.realm, accessToken));
+ }
} catch (VerificationException e) {
LOG.log(Level.WARNING, "Couldn't verify token", e);
}
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index bb12a9a72..a00d73b49 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -241,7 +241,16 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public User getUserByUsername(String realm, String username) {
- return ManagerIdentityProvider.getUserByUsernameFromDb(persistenceService, realm, username);
+ User user = ManagerIdentityProvider.getUserByUsernameFromDb(persistenceService, realm, username);
+ if (user != null && user.isServiceAccount()) {
+ getRealms(realmsResource -> {
+ withClientResource(realm, user.getUsername(), realmsResource, (clientRep, clientResource) ->
+ user.setSecret(getClientSecret(clientResource)), null);
+ return null;
+ });
+ }
+
+ return user;
}
@Override
diff --git a/test/src/main/java/org/openremote/test/protocol/MockProtocol.java b/test/src/main/java/org/openremote/test/protocol/MockProtocol.java
index 2052207de..fb14a2564 100644
--- a/test/src/main/java/org/openremote/test/protocol/MockProtocol.java
+++ b/test/src/main/java/org/openremote/test/protocol/MockProtocol.java
@@ -21,23 +21,30 @@ package org.openremote.test.protocol;
import org.openremote.agent.protocol.AbstractProtocol;
import org.openremote.model.Container;
+import org.openremote.model.asset.AssetTreeNode;
import org.openremote.model.asset.agent.ConnectionStatus;
+import org.openremote.model.asset.impl.ThingAsset;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.AttributeState;
+import org.openremote.model.protocol.ProtocolAssetDiscovery;
+import org.openremote.model.value.ValueType;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
/**
- * A mock protocol for testing purposes that records the various method calls
+ * A mock protocol for testing purposes that records the various method calls and supports protocol discovery
*/
-public class MockProtocol extends AbstractProtocol<MockAgent, MockAgent.MockAgentLink> {
+public class MockProtocol extends AbstractProtocol<MockAgent, MockAgent.MockAgentLink> implements ProtocolAssetDiscovery {
public static final String PROTOCOl_NAME = "Mock protocol";
public List<AttributeEvent> protocolWriteAttributeEvents = new ArrayList<>();
public List<String> protocolMethodCalls = new ArrayList<>();
public boolean updateSensor = true;
+ protected Container container;
public MockProtocol(MockAgent agent) {
super(agent);
@@ -45,6 +52,7 @@ public class MockProtocol extends AbstractProtocol<MockAgent, MockAgent.MockAgen
@Override
protected void doStart(Container container) throws Exception {
+ this.container = container;
protocolMethodCalls.add("START");
if (!agent.getRequired().isPresent()) {
@@ -103,4 +111,50 @@ public class MockProtocol extends AbstractProtocol<MockAgent, MockAgent.MockAgen
protected void updateAttribute(AttributeState state) {
sendAttributeEvent(state);
}
+
+ @Override
+ public Future<Void> startAssetDiscovery(Consumer<AssetTreeNode[]> assetConsumer) {
+ return container.getExecutorService().submit(() -> {
+
+ // Simulate discovery init delay
+ Thread.sleep(2000);
+
+ // Discover a few assets
+ assetConsumer.accept(new AssetTreeNode[] {
+ new AssetTreeNode(
+ new ThingAsset("MockAsset1").addAttributes(
+ new Attribute<>("mock1", ValueType.TEXT, "dummy1"),
+ new Attribute<>("mock2", ValueType.POSITIVE_INTEGER, 1234)
+ )
+ ),
+ new AssetTreeNode(
+ new ThingAsset("MockAsset2").addAttributes(
+ new Attribute<>("mock1", ValueType.TEXT, "dummy2"),
+ new Attribute<>("mock2", ValueType.POSITIVE_INTEGER, 1234)
+ )
+ )
+ });
+
+ // Simulate a delay
+ Thread.sleep(1000);
+
+ // Discover a few assets
+ assetConsumer.accept(new AssetTreeNode[] {
+ new AssetTreeNode(
+ new ThingAsset("MockAsset3").addAttributes(
+ new Attribute<>("mock1", ValueType.TEXT, "dummy3"),
+ new Attribute<>("mock2", ValueType.POSITIVE_INTEGER, 1234)
+ )
+ ),
+ new AssetTreeNode(
+ new ThingAsset("MockAsset3").addAttributes(
+ new Attribute<>("mock1", ValueType.TEXT, "dummy3"),
+ new Attribute<>("mock2", ValueType.POSITIVE_INTEGER, 1234)
+ )
+ )
+ });
+
+ return null;
+ });
+ }
}