Skip to content

armgit / core

Public Imported from GitHub
0

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

Fixed roles in ClientEventProtocol to comply with the check in KeycloakAuthorizatorPolicy

Michael Rademaker431bebf737bc
diff --git a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventProtocol.java
index b77fa5d12..9af46fb46 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventProtocol.java
@@ -32,8 +32,11 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.attribute.AttributeState;
import org.openremote.model.attribute.MetaItemDescriptor;
+import org.openremote.model.security.ClientRole;
import org.openremote.model.syslog.SyslogCategory;
+import org.openremote.model.value.StringValue;
import org.openremote.model.value.Value;
+import org.openremote.model.value.Values;
import java.util.*;
import java.util.logging.Logger;
@@ -44,6 +47,7 @@ import static org.apache.camel.builder.PredicateBuilder.or;
import static org.openremote.agent.protocol.ProtocolClientEventService.*;
import static org.openremote.model.Constants.PROTOCOL_NAMESPACE;
import static org.openremote.model.attribute.MetaItemDescriptor.Access.ACCESS_PRIVATE;
+import static org.openremote.model.attribute.MetaItemDescriptorImpl.metaItemArray;
import static org.openremote.model.attribute.MetaItemDescriptorImpl.metaItemString;
import static org.openremote.model.syslog.SyslogCategory.PROTOCOL;
import static org.openremote.model.util.TextUtil.REGEXP_PATTERN_STRING_NON_EMPTY;
@@ -67,6 +71,12 @@ public class ClientEventProtocol extends AbstractProtocol {
REGEXP_PATTERN_STRING_NON_EMPTY,
MetaItemDescriptor.PatternFailure.STRING_EMPTY);
+ public static final MetaItemDescriptor META_PROTOCOL_CLIENT_ROLES = metaItemArray(
+ PROTOCOL_NAME + ":clientRoles",
+ ACCESS_PRIVATE,
+ false,
+ null);
+
protected Map<String, AssetAttribute> clientIdProtocolConfigMap = new HashMap<>();
@Override
@@ -98,16 +108,28 @@ public class ClientEventProtocol extends AbstractProtocol {
LOG.info("Creating client credentials for: " + protocolConfiguration);
AttributeRef attributeRef = protocolConfiguration.getReferenceOrThrow();
- String clientId = CLIENT_ID_PREFIX + attributeRef.getEntityId() + ":" + attributeRef.getAttributeName();
+ String clientId = CLIENT_ID_PREFIX + attributeRef.getEntityId();
String clientSecret = protocolConfiguration.getMetaItem(META_PROTOCOL_CLIENT_SECRET.getUrn())
.flatMap(AbstractValueHolder::getValueAsString)
.orElse(UUID.randomUUID().toString());
+ ClientRole[] roles = protocolConfiguration.getMetaItem(META_PROTOCOL_CLIENT_ROLES.getUrn())
+ .flatMap(AbstractValueHolder::getValueAsArray)
+ .flatMap(arrayValue ->
+ Values.getArrayElements(
+ arrayValue,
+ StringValue.class,
+ true,
+ false,
+ StringValue::getString))
+ .map(list -> list.stream().map(ClientRole::valueOf).toArray(ClientRole[]::new))
+ .orElse(null);
+
ProtocolClientEventService.ClientCredentials clientCredentials =
new ProtocolClientEventService.ClientCredentials(
agent.getRealm(),
- null,
+ roles,
clientId,
clientSecret
);
@@ -198,6 +220,7 @@ public class ClientEventProtocol extends AbstractProtocol {
// TODO: Can do some processing of the incoming value here
updateLinkedAttribute(new AttributeState(attributeEvent.getAttributeRef(), attributeEvent.getValue().orElse(null)));
+ stopMessage(exchange);
}
}
}
diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
index 49c63c54a..04df7773e 100644
--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
@@ -36,6 +36,7 @@ import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.manager.web.ManagerWebService;
import org.openremote.model.Constants;
import org.openremote.model.event.shared.*;
+import org.openremote.model.security.User;
import org.openremote.model.syslog.SyslogEvent;
import org.openremote.model.util.TextUtil;
@@ -327,6 +328,9 @@ public class ClientEventService implements ProtocolClientEventService {
clientRepresentation.setSecret(clientCredentials.getSecret());
LOG.info("Creating/updating client event service client credentials: " + clientCredentials);
keycloakIdentityProvider.createClient(clientCredentials.getRealm(), clientRepresentation);
+
+ User serviceUser = keycloakIdentityProvider.getClientServiceUser(clientCredentials.getRealm(), clientCredentials.getClientId());
+ keycloakIdentityProvider.updateRoles(clientCredentials.getRealm(), serviceUser.getId(), clientCredentials.getRoles());
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
index 6cef80af8..1a179a20a 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
@@ -119,7 +119,6 @@ public class KeycloakAuthorizatorPolicy implements IAuthorizatorPolicy {
AuthContext authContext = new AccessTokenAuthContext(connection.realm, accessToken);
if (Arrays.asList(roles).contains(ClientRole.WRITE_ASSETS)) { //write
-
return identityProvider.canSubscribeWith(authContext, new TenantFilter(connection.realm), roles);
} else { // read
String[] topicParts = topic.getTokens().stream().map(Token::toString).toArray(String[]::new);