Skip to content

armgit / core

Public Imported from GitHub
0

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

User and asset provisioning WIP (currently in testing)

Rich Turnerca82502babab
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java
new file mode 100644
index 000000000..f003cf081
--- /dev/null
+++ b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.manager.provisioning;
+
+import org.openremote.manager.security.ManagerIdentityService;
+import org.openremote.model.http.RequestParams;
+import org.openremote.model.provisioning.ProvisioningConfig;
+import org.openremote.model.provisioning.ProvisioningResource;
+
+public class ProvisioningResourceImpl implements ProvisioningResource {
+
+ protected final ProvisioningService provisioningService;
+ protected final ManagerIdentityService identityService;
+
+ public ProvisioningResourceImpl(ProvisioningService provisioningService, ManagerIdentityService identityService) {
+ this.provisioningService = provisioningService;
+ this.identityService = identityService;
+ }
+
+ @Override
+ public ProvisioningConfig<?> getProvisioningConfigs() {
+ return null;
+ }
+
+ @Override
+ public long createProvisioningConfig(ProvisioningConfig<?> provisioningConfig) {
+ return 0;
+ }
+
+ @Override
+ public void updateProvisioningConfig(RequestParams requestParams, Long id, ProvisioningConfig<?> provisioningConfig) {
+
+ }
+
+ @Override
+ public void deleteProvisioningConfig(RequestParams requestParams, Long id) {
+
+ }
+}
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java
new file mode 100644
index 000000000..a53c4915e
--- /dev/null
+++ b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.manager.provisioning;
+
+import org.apache.commons.io.IOUtils;
+import org.openremote.container.persistence.PersistenceService;
+import org.openremote.manager.security.ManagerIdentityService;
+import org.openremote.manager.web.ManagerWebService;
+import org.openremote.model.Container;
+import org.openremote.model.ContainerService;
+import org.openremote.model.asset.impl.WeatherAsset;
+import org.openremote.model.provisioning.ProvisioningConfig;
+import org.openremote.model.provisioning.X509ProvisioningConfig;
+import org.openremote.model.provisioning.X509ProvisioningData;
+import org.openremote.model.provisioning.X509ProvisioningMessage;
+import org.openremote.model.security.ClientRole;
+import org.openremote.model.util.ValueUtil;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Logger;
+
+public class ProvisioningService implements ContainerService {
+
+ protected static final Logger LOG = Logger.getLogger(ProvisioningService.class.getName());
+ protected PersistenceService persistenceService;
+ protected ManagerIdentityService identityService;
+ protected CertificateFactory certificateFactory;
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+ @Override
+ public void init(Container container) throws Exception {
+ persistenceService = container.getService(PersistenceService.class);
+ identityService = container.getService(ManagerIdentityService.class);
+
+
+ container.getService(ManagerWebService.class).getApiSingletons().add(
+ new ProvisioningResourceImpl(this, identityService)
+ );
+ }
+
+ @Override
+ public void start(Container container) throws Exception {
+
+ }
+
+ @Override
+ public void stop(Container container) throws Exception {
+
+ }
+
+ public List<ProvisioningConfig<?>> getProvisioningConfigs() {
+ String caPemStr = null;
+ try {
+ caPemStr = IOUtils.toString(getClass().getResource("/org/openremote/test/provisioning/ca_long.pem"), StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return Collections.singletonList(
+ new X509ProvisioningConfig().setData(
+ new X509ProvisioningData()
+ .setCACertPEM(caPemStr)
+ ).setAssetTemplate(
+ ValueUtil.asJSON(
+ new WeatherAsset("Weather Asset")
+ ).orElse("")
+ ).setRealm("building")
+ .setRestrictedUser(true)
+ .setUserRoles(new ClientRole[] {
+ ClientRole.WRITE_ASSETS,
+ ClientRole.READ_ASSETS
+ })
+ );
+//
+// return persistenceService.doReturningTransaction(entityManager ->
+// entityManager.createQuery(
+// "select pc from " + ProvisioningConfig.class + " pc " +
+// "order by pc.name desc",
+// ProvisioningConfig.class)
+// .getResultList());
+ }
+}
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
index bb7b222e3..e705bbae5 100644
--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
@@ -23,12 +23,36 @@ import io.moquette.broker.subscriptions.Topic;
import io.moquette.interception.messages.InterceptPublishMessage;
import io.moquette.interception.messages.InterceptSubscribeMessage;
import io.moquette.interception.messages.InterceptUnsubscribeMessage;
+import io.netty.handler.codec.mqtt.MqttQoS;
+import org.openremote.container.timer.TimerService;
+import org.openremote.container.util.UniqueIdentifierGenerator;
+import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.mqtt.MQTTHandler;
+import org.openremote.manager.mqtt.MqttBrokerService;
import org.openremote.manager.mqtt.MqttConnection;
+import org.openremote.manager.security.ManagerIdentityService;
+import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
+import org.openremote.model.Container;
+import org.openremote.model.asset.Asset;
+import org.openremote.model.asset.UserAsset;
+import org.openremote.model.provisioning.*;
+import org.openremote.model.security.ClientRole;
+import org.openremote.model.security.User;
import org.openremote.model.syslog.SyslogCategory;
+import org.openremote.model.util.TextUtil;
+import org.openremote.model.util.ValueUtil;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.logging.Level;
import java.util.logging.Logger;
+import static org.openremote.model.Constants.RESTRICTED_USER_REALM_ROLE;
import static org.openremote.model.syslog.SyslogCategory.API;
/**
@@ -38,12 +62,58 @@ import static org.openremote.model.syslog.SyslogCategory.API;
public class UserAssetProvisioningMQTTHandler extends MQTTHandler {
protected static final Logger LOG = SyslogCategory.getLogger(API, UserAssetProvisioningMQTTHandler.class);
- public static final String TOP_LEVEL_TOPIC = "provisioning";
- //protected ProvisioningService provisioningService;
+ public static final String PROVISIONING_TOKEN = "provisioning";
+ public static final String REQUEST_TOKEN = "request";
+ public static final String RESPONSE_TOKEN = "response";
+ public static final String UNIQUE_ID_PLACEHOLDER = "%UNIQUE_ID%";
+ protected ProvisioningService provisioningService;
+ protected TimerService timerService;
+ protected MqttBrokerService brokerService;
+ protected AssetStorageService assetStorageService;
+ protected ManagerKeycloakIdentityProvider identityProvider;
+ protected boolean isKeycloak;
+
+ @Override
+ public void start(Container container) throws Exception {
+ super.start(container);
+ provisioningService = container.getService(ProvisioningService.class);
+ timerService = container.getService(TimerService.class);
+ brokerService = container.getService(MqttBrokerService.class);
+ assetStorageService = container.getService(AssetStorageService.class);
+ ManagerIdentityService identityService = container.getService(ManagerIdentityService.class);
+
+ if (!identityService.isKeycloakEnabled()) {
+ LOG.warning("MQTT connections are not supported when not using Keycloak identity provider");
+ isKeycloak = false;
+ } else {
+ isKeycloak = true;
+ identityProvider = (ManagerKeycloakIdentityProvider) identityService.getIdentityProvider();
+ }
+ }
+
+ @Override
+ public boolean handlesTopic(Topic topic) {
+ // Skip standard checks
+ return topicMatches(topic);
+ }
+
+ @Override
+ public boolean checkCanSubscribe(MqttConnection connection, Topic topic) {
+ // Skip standard checks
+ return canSubscribe(connection, topic);
+ }
+
+ @Override
+ public boolean checkCanPublish(MqttConnection connection, Topic topic) {
+ // Skip standard checks
+ return canPublish(connection, topic);
+ }
@Override
public boolean topicMatches(Topic topic) {
- return false;
+ return isProvisioningTopic(topic)
+ && topic.getTokens().size() == 3
+ && (isRequestTopic(topic) || isResponseTopic(topic));
}
@Override
@@ -53,25 +123,19 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {
@Override
public boolean canSubscribe(MqttConnection connection, Topic topic) {
- if (!TOP_LEVEL_TOPIC.equals(topic.headToken().toString())) {
+ if (!isKeycloak) {
+ LOG.fine("Identity provider is not keycloak");
return false;
}
- // client/UNIQUE_ID/connect/response
-
-// topic.getTokens().size() ==
-// if (Arrays.stream(this.realms).noneMatch(realm -> realm.equals(connection.getRealm()))) {
-// LOG.info("realm mismatch");
-// return false;
-// }
-// return true;
-
- return false;
+ return isResponseTopic(topic)
+ && !TOKEN_MULTI_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 1))
+ && !TOKEN_SINGLE_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 1));
}
@Override
public void doSubscribe(MqttConnection connection, Topic topic, InterceptSubscribeMessage msg) {
-
+ // Nothing to do here as we'll publish to this topic in response to client messages
}
@Override
@@ -81,11 +145,248 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {
@Override
public boolean canPublish(MqttConnection connection, Topic topic) {
- return false;
+ if (!isKeycloak) {
+ LOG.fine("Identity provider is not keycloak");
+ return false;
+ }
+
+ return isRequestTopic(topic)
+ && !TOKEN_MULTI_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 1))
+ && !TOKEN_SINGLE_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 1));
}
@Override
public void doPublish(MqttConnection connection, Topic topic, InterceptPublishMessage msg) {
+ String payloadContent = msg.getPayload().toString(StandardCharsets.UTF_8);
+
+ ProvisioningMessage provisioningMessage = ValueUtil.parse(payloadContent, ProvisioningMessage.class)
+ .orElseGet(() -> {
+ LOG.fine("Failed to parse message from client: topic=" + topic + ", connection=" + connection);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.MESSAGE_INVALID), MqttQoS.AT_MOST_ONCE);
+ return null;
+ });
+
+ if (provisioningMessage == null) {
+ return;
+ }
+
+ if (provisioningMessage instanceof X509ProvisioningMessage) {
+ processX509ProvisioningMessage(connection, topic, (X509ProvisioningMessage)provisioningMessage);
+ }
+ }
+
+ protected static boolean isProvisioningTopic(Topic topic) {
+ return PROVISIONING_TOKEN.equals(topicTokenIndexToString(topic, 0));
+ }
+
+ protected static boolean isRequestTopic(Topic topic) {
+ return REQUEST_TOKEN.equals(topicTokenIndexToString(topic, 2));
+ }
+
+ protected static boolean isResponseTopic(Topic topic) {
+ return RESPONSE_TOKEN.equals(topicTokenIndexToString(topic, 2));
+ }
+
+ protected String getResponseTopic(Topic topic) {
+ return PROVISIONING_TOKEN + "/" + topicTokenIndexToString(topic, 1) + "/" + RESPONSE_TOKEN;
+ }
+
+ protected void processX509ProvisioningMessage(MqttConnection connection, Topic topic, X509ProvisioningMessage provisioningMessage) {
+
+ if (TextUtil.isNullOrEmpty(provisioningMessage.getCert())) {
+ LOG.fine("Certificate is missing from X509 provisioning message: topic=" + topic + ", connection=" + connection);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.CERTIFICATE_INVALID), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+
+ // Parse client cert
+ X509Certificate clientCertificate;
+ try {
+ clientCertificate = ProvisioningUtil.getX509Certificate(provisioningMessage.getCert());
+ } catch (CertificateException e) {
+ LOG.log(Level.INFO, "Failed to parse client X.509 certificate: topic=" + topic + ", connection=" + connection, e);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.CERTIFICATE_INVALID), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+
+ X509ProvisioningConfig matchingConfig = getMatchingX509ProvisioningConfig(connection, clientCertificate);
+
+ if (matchingConfig == null) {
+ LOG.fine("No matching provisioning config found for client certificate: topic=" + topic + ", connection=" + connection);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.UNAUTHORIZED), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+
+ // Validate unique ID
+ String certUniqueId = ProvisioningUtil.getSubjectCN(clientCertificate.getSubjectX500Principal());
+ String uniqueId = topicTokenIndexToString(topic, 1);
+
+ if (TextUtil.isNullOrEmpty(certUniqueId)) {
+ LOG.info("Client X.509 certificate missing unique ID in subject CN: topic=" + topic + ", connection=" + connection);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.UNIQUE_ID_MISMATCH), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+
+ if (TextUtil.isNullOrEmpty(uniqueId) || !certUniqueId.equals(uniqueId)) {
+ LOG.info("Client X.509 certificate unique ID doesn't match topic unique ID: topic=" + topic + ", connection=" + connection);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.UNIQUE_ID_MISMATCH), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+
+ String realm = matchingConfig.getRealm();
+
+ // Get/create service user
+ String serviceUsername = "PS-" + uniqueId;
+ User serviceUser;
+
+ try {
+ serviceUser = identityProvider.getUserByUsername(realm, User.SERVICE_ACCOUNT_PREFIX + serviceUsername);
+
+ if (serviceUser != null) {
+ if (!serviceUser.getEnabled()) {
+ LOG.info("Client service user has been disabled: topic=" + topic + ", connection=" + connection);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.USER_DISABLED), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+ } else {
+ serviceUser = createClientServiceUser(realm, serviceUsername, matchingConfig);
+ }
+ } catch (Exception e) {
+ LOG.log(Level.WARNING, "Failed to retrieve/create service user: topic=" + topic + ", connection=" + connection, e);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.SERVER_ERROR), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+
+ Asset<?> asset;
+
+ // Prepend realm name to unique ID to generate asset ID to further improve uniqueness
+ String assetId = UniqueIdentifierGenerator.generateId(matchingConfig.getRealm() + uniqueId);
+ LOG.fine("Client unique ID '" + uniqueId + "' mapped to asset ID '" + assetId + "': topic=" + topic + ", connection=" + connection);
+
+ try {
+ // Look for existing asset
+ asset = assetStorageService.find(assetId);
+
+ if (asset != null) {
+ LOG.finer("Client asset found: topic=" + topic + ", connection=" + connection + ", assetId=" + assetId);
+
+ if (!matchingConfig.getRealm().equals(asset.getRealm())) {
+ LOG.info("Client asset realm mismatch : topic=" + topic + ", connection=" + connection + ", assetId=" + assetId);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.ASSET_ERROR), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+ } else {
+ asset = createClientAsset(realm, assetId, uniqueId, serviceUser, matchingConfig);
+ }
+ } catch (Exception e) {
+ LOG.log(Level.WARNING, "Failed to retrieve/create asset: topic=" + topic + ", connection=" + connection + ", config=" + matchingConfig, e);
+ brokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.SERVER_ERROR), MqttQoS.AT_MOST_ONCE);
+ return;
+ }
+
+ LOG.fine("Client successfully initialised: topic=" + topic + ", connection=" + connection);
+
+ // Update connection with service user credentials
+ connection.setCredentials(serviceUser.getUsername(), serviceUser.getSecret());
+ brokerService.publishMessage(getResponseTopic(topic), new SuccessResponseMessage(realm, asset), MqttQoS.AT_MOST_ONCE);
+ }
+
+ protected X509ProvisioningConfig getMatchingX509ProvisioningConfig(MqttConnection connection, X509Certificate clientCertificate) {
+ return provisioningService
+ .getProvisioningConfigs()
+ .stream()
+ .filter(config -> config instanceof X509ProvisioningConfig)
+ .map(config -> (X509ProvisioningConfig)config)
+ .filter(config -> {
+ try {
+ X509Certificate caCertificate = config.getCertificate();
+ if (caCertificate != null) {
+ if (!caCertificate.getSubjectX500Principal().getName().equals(clientCertificate.getIssuerX500Principal().getName())) {
+ LOG.fine("Client certificate issuer matches provisioning config CA certificate subject: connection=" + connection + ", config=" + config);
+ Date now = Date.from(timerService.getNow());
+
+ try {
+ clientCertificate.verify(caCertificate.getPublicKey());
+ LOG.fine("Client certificate verified against CA certificate: connection=" + connection + ", config=" + config);
+
+ if (!config.getData().isIgnoreExpiryDate()) {
+ LOG.fine("Validating client certificate validity: connection=" + connection + ", timestamp=" + now);
+ clientCertificate.checkValidity(now);
+ }
+
+ return true;
+ } catch (CertificateExpiredException | CertificateNotYetValidException e) {
+ LOG.log(Level.INFO, "Client certificate failed validity check: connection=" + connection + ", timestamp=" + now, e);
+ } catch (Exception e) {
+ LOG.log(Level.INFO, "Client certificate failed verification against CA certificate: connection=" + connection + ", config=" + config, e);
+ }
+ }
+ }
+ } catch (Exception e) {
+ LOG.log(Level.WARNING, "Failed to extract certificate from provisioning config: config=" + config, e);
+ }
+ return false;
+ })
+ .findFirst()
+ .orElse(null);
+ }
+
+ protected User createClientServiceUser(String realm, String username, ProvisioningConfig<?> provisioningConfig) {
+ LOG.fine("Creating client service user: realm=" + realm + ", username=" + username);
+
+ User serviceUser = new User()
+ .setServiceAccount(true)
+ .setEnabled(true)
+ .setUsername(username);
+
+ serviceUser = identityProvider.createUpdateUser(realm, serviceUser, null);
+
+ if (provisioningConfig.getUserRoles() != null && provisioningConfig.getUserRoles().length > 0) {
+ LOG.finer("Setting user roles: realm=" + realm + ", username=" + username + ", roles=" + Arrays.toString(provisioningConfig.getUserRoles()));
+ identityProvider.updateUserRoles(
+ realm,
+ serviceUser.getId(),
+ username,
+ Arrays.stream(provisioningConfig.getUserRoles()).map(ClientRole::getValue).toArray(String[]::new)
+ );
+ } else {
+ LOG.finer("No user roles defined: realm=" + realm + ", username=" + username);
+ }
+
+ if (provisioningConfig.isRestrictedUser()) {
+ LOG.finer("User will be made restricted: realm=" + realm + ", username=" + username);
+ identityProvider.updateUserRoles(realm, serviceUser.getId(), null, RESTRICTED_USER_REALM_ROLE);
+ }
+
+ return serviceUser;
+ }
+
+ protected Asset<?> createClientAsset(String realm, String assetId, String uniqueId, User serviceUser, ProvisioningConfig<?> provisioningConfig) throws RuntimeException {
+ LOG.fine("Creating client asset: realm=" + realm + ", username=" + serviceUser.getUsername());
+
+ if (TextUtil.isNullOrEmpty(provisioningConfig.getAssetTemplate())) {
+ return null;
+ }
+
+ // Replace any placeholders in the template
+ String assetTemplate = provisioningConfig.getAssetTemplate();
+ assetTemplate = assetTemplate.replaceAll(UNIQUE_ID_PLACEHOLDER, uniqueId);
+
+ // Try and parse provisioning config asset template
+ Asset<?> asset = ValueUtil.parse(assetTemplate, Asset.class).orElseThrow(() ->
+ new RuntimeException("Failed to de-serialise asset template into an asset instance: template=" + provisioningConfig.getAssetTemplate())
+ );
+
+ // Set ID and realm
+ asset.setId(assetId);
+ asset.setRealm(realm);
+
+ assetStorageService.merge(asset);
+
+ if (provisioningConfig.isRestrictedUser()) {
+ assetStorageService.storeUserAsset(new UserAsset(realm, serviceUser.getId(), assetId));
+ }
+ return asset;
}
}
diff --git a/manager/src/main/resources/META-INF/services/org.openremote.model.ContainerService b/manager/src/main/resources/META-INF/services/org.openremote.model.ContainerService
index a4e799ed9..60e458962 100644
--- a/manager/src/main/resources/META-INF/services/org.openremote.model.ContainerService
+++ b/manager/src/main/resources/META-INF/services/org.openremote.model.ContainerService
@@ -26,3 +26,4 @@ org.openremote.manager.gateway.GatewayClientService
org.openremote.manager.mqtt.MqttBrokerService
org.openremote.manager.asset.AssetModelService
org.openremote.manager.energy.EnergyOptimisationService
+org.openremote.manager.provisioning.ProvisioningService
diff --git a/model/src/main/java/org/openremote/model/provisioning/ErrorResponseMessage.java b/model/src/main/java/org/openremote/model/provisioning/ErrorResponseMessage.java
new file mode 100644
index 000000000..6ec289772
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/ErrorResponseMessage.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+public class ErrorResponseMessage extends ProvisioningMessage {
+
+ public enum Error {
+ MESSAGE_INVALID,
+ CERTIFICATE_INVALID,
+ UNAUTHORIZED,
+ FORBIDDEN,
+ UNIQUE_ID_MISMATCH,
+ CONFIG_DISABLED,
+ USER_DISABLED,
+ SERVER_ERROR,
+ ASSET_ERROR
+ }
+
+ protected Error error;
+
+ public ErrorResponseMessage(Error error) {
+ this.error = error;
+ }
+
+ public Error getError() {
+ return error;
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java
new file mode 100644
index 000000000..8b9a8e0f9
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.vladmihalcea.hibernate.type.array.EnumArrayType;
+import org.hibernate.annotations.Parameter;
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.TypeDefs;
+import org.openremote.model.security.ClientRole;
+
+import javax.persistence.*;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.Date;
+
+import static javax.persistence.DiscriminatorType.STRING;
+import static org.openremote.model.Constants.*;
+
+@TypeDefs({
+ @TypeDef(
+ typeClass = EnumArrayType.class,
+ defaultForType = ClientRole[].class,
+ parameters = {
+ @Parameter(
+ name = EnumArrayType.SQL_ARRAY_TYPE,
+ value = "client_role"
+ )
+ }
+ )
+})
+@Table(name = "provisioning_config")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+@DiscriminatorColumn(name = "TYPE", discriminatorType = STRING)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", visible = true)
+@JsonSubTypes(
+ @JsonSubTypes.Type(name = "x509", value = X509ProvisioningConfig.class)
+)
+public abstract class ProvisioningConfig<T> {
+
+ @Id
+ @Column(name = "ID")
+ @Min(1)
+ @GeneratedValue(generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)
+ protected Long id;
+
+ @Temporal(TemporalType.TIMESTAMP)
+ @Column(name = "CREATED_ON", updatable = false, nullable = false, columnDefinition= "TIMESTAMP WITH TIME ZONE")
+ @org.hibernate.annotations.CreationTimestamp
+ protected Date createdOn = new Date();
+
+ @Temporal(TemporalType.TIMESTAMP)
+ @Column(name = "LAST_MODIFIED", nullable = false, columnDefinition= "TIMESTAMP WITH TIME ZONE")
+ protected Date lastModified;
+
+ @NotNull
+ @Column(name = "NAME", nullable = false, columnDefinition = "text")
+ protected String name;
+
+ @Column(name = "TYPE", columnDefinition = "text")
+ protected String type;
+
+ @Column(name = "REALM", columnDefinition = "text")
+ protected String realm;
+
+ @Column(name = "ASSET_TEMPLATE", columnDefinition = "text")
+ protected String assetTemplate;
+
+ @Column(name = "RESTRICTED_USER", nullable = false)
+ protected boolean restrictedUser;
+
+ @Column(name = "ROLES", columnDefinition = "client_role[]")
+ protected ClientRole[] userRoles;
+
+ @Column(name = "DISABLED", nullable = false)
+ protected boolean disabled;
+
+ /**
+ * JSON serialisable data for a specific implementation
+ */
+ @Column(name = "DATA", columnDefinition = "jsonb")
+ @org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)
+ protected T data;
+
+ public Long getId() {
+ return id;
+ }
+
+ public Date getCreatedOn() {
+ return createdOn;
+ }
+
+ public Date getLastModified() {
+ return lastModified;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public ProvisioningConfig<T> setName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public String getAssetTemplate() {
+ return assetTemplate;
+ }
+
+ public ProvisioningConfig<T> setAssetTemplate(String assetTemplate) {
+ this.assetTemplate = assetTemplate;
+ return this;
+ }
+
+ public boolean isRestrictedUser() {
+ return restrictedUser;
+ }
+
+ public ProvisioningConfig<T> setRestrictedUser(boolean restrictedUser) {
+ this.restrictedUser = restrictedUser;
+ return this;
+ }
+
+ public ClientRole[] getUserRoles() {
+ return userRoles;
+ }
+
+ public ProvisioningConfig<T> setUserRoles(ClientRole[] userRoles) {
+ this.userRoles = userRoles;
+ return this;
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public ProvisioningConfig<T> setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ return this;
+ }
+
+ public T getData() {
+ return data;
+ }
+
+ public ProvisioningConfig<T> setData(T data) {
+ this.data = data;
+ return this;
+ }
+
+ public String getRealm() {
+ return realm;
+ }
+
+ public ProvisioningConfig<T> setRealm(String realm) {
+ this.realm = realm;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "{" +
+ "id=" + id +
+ ", createdOn=" + createdOn +
+ ", lastModified=" + lastModified +
+ ", name='" + name + '\'' +
+ ", type='" + type + '\'' +
+ ", realm='" + realm + '\'' +
+ ", assetTemplate='" + assetTemplate + '\'' +
+ ", restrictedUser=" + restrictedUser +
+ ", userRoles=" + Arrays.toString(userRoles) +
+ ", disabled=" + disabled +
+ ", data=" + data +
+ '}';
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningMessage.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningMessage.java
new file mode 100644
index 000000000..c1d4b1c10
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningMessage.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
+@JsonSubTypes({
+ @JsonSubTypes.Type(name = "error", value = ErrorResponseMessage.class),
+ @JsonSubTypes.Type(name = "success", value = SuccessResponseMessage.class),
+ @JsonSubTypes.Type(name = "x509", value = X509ProvisioningMessage.class)
+})
+public abstract class ProvisioningMessage {
+}
diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java
new file mode 100644
index 000000000..315c97a92
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+import org.openremote.model.Constants;
+import org.openremote.model.http.RequestParams;
+
+import javax.annotation.security.RolesAllowed;
+import javax.validation.Valid;
+import javax.ws.rs.*;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+
+public interface ProvisioningResource {
+
+ @GET
+ @Produces(APPLICATION_JSON)
+ @RolesAllowed({Constants.REALM_ADMIN_ROLE})
+ ProvisioningConfig<?> getProvisioningConfigs();
+
+ @POST
+ @Consumes(APPLICATION_JSON)
+ @Produces(APPLICATION_JSON)
+ @RolesAllowed({Constants.REALM_ADMIN_ROLE})
+ long createProvisioningConfig(ProvisioningConfig<?> provisioningConfig);
+
+ @PUT
+ @Path("{id}")
+ @Consumes(APPLICATION_JSON)
+ @RolesAllowed({Constants.REALM_ADMIN_ROLE})
+ void updateProvisioningConfig(@BeanParam RequestParams requestParams, @PathParam("id") Long id, @Valid ProvisioningConfig<?> provisioningConfig);
+
+ @DELETE
+ @Path("{id}")
+ @Produces(APPLICATION_JSON)
+ @RolesAllowed({Constants.REALM_ADMIN_ROLE})
+ void deleteProvisioningConfig(@BeanParam RequestParams requestParams, @PathParam("id") Long id);
+}
diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningUtil.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningUtil.java
new file mode 100644
index 000000000..58eee4bd4
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningUtil.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+import javax.security.auth.x500.X500Principal;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class ProvisioningUtil {
+
+ protected static final Logger LOG = Logger.getLogger(ProvisioningUtil.class.getName());
+ protected static CertificateFactory certificateFactory;
+
+ static {
+ try {
+ certificateFactory = CertificateFactory.getInstance("X.509");
+ } catch (CertificateException e) {
+ LOG.log(Level.SEVERE, "Failed to create X.509 certificate factory", e);
+ }
+ }
+
+ protected ProvisioningUtil() {
+ }
+
+ public static X509Certificate getX509Certificate(String pem) throws CertificateException {
+ X509Certificate certificate = null;
+
+ try (InputStream stream = new ByteArrayInputStream(pem.getBytes(StandardCharsets.UTF_8))) {
+ certificate = (X509Certificate) certificateFactory.generateCertificate(stream);
+ } catch (IOException ignored) {
+ }
+
+ return certificate;
+ }
+
+ public static String getSubjectCN(X500Principal principal) {
+ // Use LDAP RFC 2253 which is same spec as X500 principal to get CN
+ try {
+ LdapName ldapName = new LdapName(principal.getName());
+ return ldapName.getRdns().stream().filter(rdn -> "CN".equals(rdn.getType())).map(rdn -> rdn.getValue().toString()).findFirst().orElse(null);
+ } catch (InvalidNameException e) {
+ LOG.log(Level.WARNING, "Failed to extract subject CN from X500 principal", e);
+ return null;
+ }
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/provisioning/SuccessResponseMessage.java b/model/src/main/java/org/openremote/model/provisioning/SuccessResponseMessage.java
new file mode 100644
index 000000000..d6bd45e10
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/SuccessResponseMessage.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+import org.openremote.model.asset.Asset;
+
+public class SuccessResponseMessage extends ProvisioningMessage {
+
+ protected String realm;
+ protected Asset<?> asset;
+
+ public SuccessResponseMessage(String realm, Asset<?> asset) {
+ this.realm = realm;
+ this.asset = asset;
+ }
+
+ public String getRealm() {
+ return realm;
+ }
+
+ public Asset<?> getAsset() {
+ return asset;
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java
new file mode 100644
index 000000000..a1197010d
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+import org.openremote.model.util.TextUtil;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+@Entity
+@DiscriminatorValue("x509")
+public class X509ProvisioningConfig extends ProvisioningConfig<X509ProvisioningData> {
+
+ @Transient
+ protected X509Certificate certificate;
+
+ @Transient boolean valid = true;
+
+ public synchronized X509Certificate getCertificate() throws IllegalStateException, CertificateException {
+ if (!valid) {
+ return null;
+ }
+ if (data == null || TextUtil.isNullOrEmpty(data.getCACertPEM())) {
+ valid = false;
+ throw new IllegalStateException("CA cert PEM must be defined");
+ }
+ if (certificate == null) {
+ try {
+ certificate = ProvisioningUtil.getX509Certificate(data.getCACertPEM());
+ } catch (CertificateException e) {
+ valid = false;
+ throw(e);
+ }
+ }
+ return certificate;
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningData.java b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningData.java
new file mode 100644
index 000000000..d0734086c
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningData.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+public class X509ProvisioningData {
+
+ protected String CACertPEM;
+ protected boolean ignoreExpiryDate;
+ protected String overrideUniqueIdAttribute;
+
+ public String getCACertPEM() {
+ return CACertPEM;
+ }
+
+ public X509ProvisioningData setCACertPEM(String CACertPEM) {
+ this.CACertPEM = CACertPEM;
+ return this;
+ }
+
+ public boolean isIgnoreExpiryDate() {
+ return ignoreExpiryDate;
+ }
+
+ public X509ProvisioningData setIgnoreExpiryDate(boolean ignoreExpiryDate) {
+ this.ignoreExpiryDate = ignoreExpiryDate;
+ return this;
+ }
+
+ public String getOverrideUniqueIdAttribute() {
+ return overrideUniqueIdAttribute;
+ }
+
+ public X509ProvisioningData setOverrideUniqueIdAttribute(String overrideUniqueIdAttribute) {
+ this.overrideUniqueIdAttribute = overrideUniqueIdAttribute;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() +"{" +
+ "CACertPEM='" + CACertPEM + '\'' +
+ ", ignoreExpiryDate=" + ignoreExpiryDate +
+ ", overrideUniqueIdAttribute='" + overrideUniqueIdAttribute + '\'' +
+ '}';
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningMessage.java b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningMessage.java
new file mode 100644
index 000000000..07f587739
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningMessage.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.provisioning;
+
+public class X509ProvisioningMessage extends ProvisioningMessage {
+ protected String cert;
+
+ public X509ProvisioningMessage(String cert) {
+ this.cert = cert;
+ }
+
+ public String getCert() {
+ return cert;
+ }
+}
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca.key b/test/src/main/resources/org/openremote/test/provisioning/ca.key
new file mode 100644
index 000000000..f72dc6e88
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/ca.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_expired.pem b/test/src/main/resources/org/openremote/test/provisioning/ca_expired.pem
new file mode 100644
index 000000000..39ed5d9c4
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/ca_expired.pem
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF+zCCA+OgAwIBAgIUWv+fEoBokZnefmaUFtHgiRPNggcwDQYJKoZIhvcNAQEL
+BQAwgYwxCzAJBgNVBAYTAk5MMRYwFAYDVQQIDA1Ob3J0aCBCcmFiYW50MRIwEAYD
+VQQHDAlFaW5kaG92ZW4xEzARBgNVBAoMCk9wZW5SZW1vdGUxFjAUBgNVBAMMDW9w
+ZW5yZW1vdGUuaW8xJDAiBgkqhkiG9w0BCQEWFXN1cHBvcnRAb3BlbnJlbW90ZS5p
+bzAeFw0yMTEwMjYxMTExMjZaFw0yMTEwMjcxMTExMjZaMIGMMQswCQYDVQQGEwJO
+TDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJRWluZGhvdmVuMRMw
+EQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVtb3RlLmlvMSQwIgYJ
+KoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQC2Dc+WVjKRbvtitZDXqd+CnodnJZJwO0Zt1pHu6R6E
+6Y3Xahzb0ElY0jgewmQNROfmvDu5lOpL5xN8Hnf4fgzt3EFooW2E8PZTa/ftjC0v
+Po58vpQ3rlzjF8XG96IOAp/PJnz4oXbFJJiP4ux5N6Eo6J8iz8nDFvzN3dUui+mJ
+IK3ZAN42zLWkfXqXAr/4NT/VgSsxdOaiLNZVRMxlzshdiptqzwHVHFIxaZQWxA8l
+IM2wGLHVE89DwrwBYtcvNv8a3lnmUPDpVtU56jDkdHpVQ3/3fAJ/mty1f7kmgYoZ
+nUuMr8XKmTRlPkoWwTuj/vCYy0DQ5j0IIxFEQmE+Dch0QQoSa99Qgr1dkCdiJB5+
+W8vfyr752f+ctyo2IbfVd6KA9KbcSFSoYcLjRXg0gvT56q9kC/pmsJVqvlqv6vzz
+DdN+IE6i5GALJuJbaEI/y9Hm0XUNLfS/RTC+Pnw7RDlgFM9/70XDdSdsuXTY2WOB
+/m0wHphl6Q95M9FcoSlnTxkGYADCeoBBx82ODqIt1LC17ed5J5i45Bt46OoP2FiT
+olnJ+05UUY/T45o/mk8df/aPPtzJxJtExwFF9czeSFH1NTp6XB1nntkG1JWk7nWG
+GGUPnQiSJkloKePBTBcD1y4mxf8bAH2ACIcPYrH0EntCZlAb+NTLDssxyQWLAB9v
+TQIDAQABo1MwUTAdBgNVHQ4EFgQUJ8bCUIFDnZlv4kr0yeu1raR3vKIwHwYDVR0j
+BBgwFoAUJ8bCUIFDnZlv4kr0yeu1raR3vKIwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAgEAYDLZOzHI3jZZDhUELxIzVNiyB/euYYzmMovsKVGNUlaS
+P6vOKnpfl4PmkGKvRNTIUf66oXJXlDCWgoho66DotVbD2I5+4bmV5MeB2jnwOC5b
+fv++Jz3lgIzoJToVxW2rZKIgAwt3m2BQPvV/PKANMG+eq+XoM1Rn4dlfe93QtcBV
+DXLAokR0ysHEnPF1EQRb09n+I1FaGCgppN0RVuOEpSGa0k3RTHC6GkKPRzmprZDg
+YI1y4T8c8blJjDqSgQZI5SVNgMInvsEDV7LmqUx/88IRPLTYDZ75Ck+8csnk4O0K
+GkSqlcejv9trqG3LFXm3T67gJTeqhS/ATGa/8/jB26ryjR70DFJIGrAv5KRVuu43
+iSb6DWb2GiwOIQXLFOa9EVpbI4WQPFVg7HlKi1ZL0TwbgdlphAIVzagkjCCJiMPk
+hBTQVPyunYx/1mMnwDXChSza9Is9d5r8NagION30ph9XsUrDU2vGqxpSi7omJ5Ow
+JjGmMNk6cmVb3x/zRm9/G0EpFfyaBRGM8zVQNN9jV9/aOJx4ssbqq73X8MErjOIW
+vOh+J+r4rVLaRXDUQCrN5ZfsFSlUwyIqUU9jHD7iR7LqlzsfGrQQtzJUQyq/xOZD
+WNhRZit7N+BX+zQSXWTtAxIS7rKznEEFP7aEwZ0beTxmroHAANDMhM8P5v9UJL8=
+-----END CERTIFICATE-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_expired.srl b/test/src/main/resources/org/openremote/test/provisioning/ca_expired.srl
new file mode 100644
index 000000000..4600f55e3
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/ca_expired.srl
@@ -0,0 +1 @@
+723C5C7D28D67D5C4288FB0CDAD9069628284C
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_long.pem b/test/src/main/resources/org/openremote/test/provisioning/ca_long.pem
new file mode 100644
index 000000000..b98be40e6
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/ca_long.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIF/TCCA+WgAwIBAgIUZ/o8/s1N8dM2kn3jqrzMfoF+/SMwDQYJKoZIhvcNAQEL
+BQAwgYwxCzAJBgNVBAYTAk5MMRYwFAYDVQQIDA1Ob3J0aCBCcmFiYW50MRIwEAYD
+VQQHDAlFaW5kaG92ZW4xEzARBgNVBAoMCk9wZW5SZW1vdGUxFjAUBgNVBAMMDW9w
+ZW5yZW1vdGUuaW8xJDAiBgkqhkiG9w0BCQEWFXN1cHBvcnRAb3BlbnJlbW90ZS5p
+bzAgFw0yMTEwMjgxMTA5MjJaGA8yMDcxMDIwODExMDkyMlowgYwxCzAJBgNVBAYT
+Ak5MMRYwFAYDVQQIDA1Ob3J0aCBCcmFiYW50MRIwEAYDVQQHDAlFaW5kaG92ZW4x
+EzARBgNVBAoMCk9wZW5SZW1vdGUxFjAUBgNVBAMMDW9wZW5yZW1vdGUuaW8xJDAi
+BgkqhkiG9w0BCQEWFXN1cHBvcnRAb3BlbnJlbW90ZS5pbzCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBALYNz5ZWMpFu+2K1kNep34Keh2clknA7Rm3Wke7p
+HoTpjddqHNvQSVjSOB7CZA1E5+a8O7mU6kvnE3wed/h+DO3cQWihbYTw9lNr9+2M
+LS8+jny+lDeuXOMXxcb3og4Cn88mfPihdsUkmI/i7Hk3oSjonyLPycMW/M3d1S6L
+6YkgrdkA3jbMtaR9epcCv/g1P9WBKzF05qIs1lVEzGXOyF2Km2rPAdUcUjFplBbE
+DyUgzbAYsdUTz0PCvAFi1y82/xreWeZQ8OlW1TnqMOR0elVDf/d8An+a3LV/uSaB
+ihmdS4yvxcqZNGU+ShbBO6P+8JjLQNDmPQgjEURCYT4NyHRBChJr31CCvV2QJ2Ik
+Hn5by9/KvvnZ/5y3KjYht9V3ooD0ptxIVKhhwuNFeDSC9Pnqr2QL+mawlWq+Wq/q
+/PMN034gTqLkYAsm4ltoQj/L0ebRdQ0t9L9FML4+fDtEOWAUz3/vRcN1J2y5dNjZ
+Y4H+bTAemGXpD3kz0VyhKWdPGQZgAMJ6gEHHzY4Ooi3UsLXt53knmLjkG3jo6g/Y
+WJOiWcn7TlRRj9Pjmj+aTx1/9o8+3MnEm0THAUX1zN5IUfU1OnpcHWee2QbUlaTu
+dYYYZQ+dCJImSWgp48FMFwPXLibF/xsAfYAIhw9isfQSe0JmUBv41MsOyzHJBYsA
+H29NAgMBAAGjUzBRMB0GA1UdDgQWBBQnxsJQgUOdmW/iSvTJ67WtpHe8ojAfBgNV
+HSMEGDAWgBQnxsJQgUOdmW/iSvTJ67WtpHe8ojAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4ICAQBIbKYJDzEWn6yP44t3BYLb/1XIW/f+LUCNDIdlXKco
+sxcMddWHNLFTC05fd/HKaUWBGEMBpuV2EjZHCxX8b3g5yhEMy2gU3BaMel777vcg
+EG7c82+kOzuunuH7vUTi4NhTFko/iIgqlIbQYF/8oWnFH7tn5PMhaiGEMMEOCf1Y
+fKedTGM+Or4e/ptddWroucqw9wzIZ9Wi/YYsLxwpdew2Eay7OZhY8qnH5rvkiUjG
+SgkSmxyN3F+EZQj00G15yVmFpJ1bhLT4s9a33gqcMUon0eHVlGpLcF/0vxVvZ5zr
+UUPb1MKUhxSqpFC7h+2odlDwtfepCCTAvpnqiI794ewvkblcafJ5lbypNUjTSXBA
++Fi1BcJteEBCVGOOLs34bquAtNdPEmc37wZA+5QNdz9WnYLCgvnrPh8VEXTdqqqb
+Mf4/Rr0GbUOmRZXk0LordT3IwOq67c2HrbTFD5H6SGgEiyslzGeDjZyMWJ6uy+ae
+MydnFVor6diyzew3MwhCZJKxMu/UJYaECuUtazLWhQi3q0YbQlYMcIGHfp7jDpXa
+1ibFAeRSri7PXTVqMNuJ1dftG7s08V55N1AB/3w9f8kkOOO2jZpwRauhIUJA++Xh
+Iq6M+PLEvBky6g/v6zOf7/68LtseuaSmMw7GxRVXX2BcrEjSLVz24INa24ZxM87P
+qQ==
+-----END CERTIFICATE-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_long.srl b/test/src/main/resources/org/openremote/test/provisioning/ca_long.srl
new file mode 100644
index 000000000..9ee3b8d38
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/ca_long.srl
@@ -0,0 +1 @@
+01483583083A22CE208EB8006FAB309EBF102ACB
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device1.csr b/test/src/main/resources/org/openremote/test/provisioning/device1.csr
new file mode 100644
index 000000000..a0875b01a
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device1.csr
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEpTCCAo0CAQAwYDELMAkGA1UEBhMCTkwxFjAUBgNVBAgMDU5vcnRoIEJyYWJh
+bnQxEjAQBgNVBAcMCUVpbmRob3ZlbjETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4G
+A1UEAwwHZGV2aWNlMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALiI
+eN0lxA8+RGoWEFCOgqfNrtxOqb2KSp/yTFSRKyZSAW5NYmZ1tswWHrtMo/Bke5q9
+dQYMYa4y+vcuq2Z9Wh7gdVi0kdHRTlWofe9EU2JFbpzCDmDlIufrfd+VkeIGqIRw
+mumaVNFtuxyKUhBYzcxIahojdR+BXavurQcOMVAo+k9+N654AgwiyxygOex0Bfr4
+prXHmPDqZhOxTr4gDsKkBmjHBL88Y9lncBF0L9GPk59xmGuMqiWT/512jXqWEnsu
+jZOtwh9zQ8RSI/2NXPokyWdy8xJt1vVSmN9Zwid2rj5PLKG10k7FsF8u5RSlsoFz
+6owsOKN74ReYq+RBg9T70GUjlJt+Nr3ECnj+OuGXhra+16m+sbCIKc6HG5OCLZeG
+LyDRo7lSBViUX3SzEsAswiFCdSQokfGYB8mcShZPGt/MdnBBOp2060p295MMkZpG
+V3d/oufmPDMpxkP5e3h5TRlCpV9rvTlg/Cooo4kqinkn56rn+Ql9ExIL4nlWz9zv
+PJBFvW+kAJhLHSYi4oOpn0HL7t0hjG4cnLtFTPqzX6OpRcRYG1eV6x394Y/cvI/H
+OyL1ayg6lRBkuqEpKn5e5hfXaruEjEHyAzHxIkltVsebH6Vk4X5oG76CKuFbsnk4
+GeIa5qRgYlb2J+7TtrwbH0jR2VK476byx8uvq0UTAgMBAAGgADANBgkqhkiG9w0B
+AQsFAAOCAgEAVjGb9+PnSJDYBAXdgVFuG+YawZ5lw/AWm0n/zU7rN1sgTtEDNIdt
+AtYhoAfzKBeo5HL2obpj8pI52LHTnwbickx3u99AnaHrnTPbHTFqFUdC5RjB6g0G
+31ungWJTq3iWA9pq1TPoeC7fQRMss5PPx0vUKjWUBcvsCR7Ss/aUDoWdfPxREt2m
+dfV4g6mFqyspnWoSOFJ+V/3RTEiYDihQ40OPxfq33mfA0gqaO4W4Z1NlekZrmL/n
+cdsuWQ1uveo1O7dslSwSfoFjN9AajgcOfnBLtGp2cIzwNVn931FTrLqXTz6DYhNQ
+qWKIpOQ3FKyEm8NIJhplCFqNDTtkeW3h0u1reo+9t711YjdjjQIC9BxiuNHM8bzK
+DuBK9YxTTPHIv/W/63QSrl4EOrve1Ue+mGRJZG7GV76/sbzqeuzFBgcRAjexwd+q
+XpccTrJN7jRXAMgw/h4eoVLeYh9GPtt7E0rR5j5A0knM0dz/ks3jykdUTVbH+x0Y
+BoRjs1WHnCIDrx4z65EGzvBzwp1cQUa+8f+/dR91rp2nkqF53cihXUMAuYGedFAY
+djip+XGyumkLChq7A43oNKKPH5WBQ0lHTGyZrmVNDh/ujQbZ83d4q9mXyEQfcfj6
+s25qV3xBOf72KUjBD4s1oFexZKWSCntDfxsifKpwhh41L0WloliCEhM=
+-----END CERTIFICATE REQUEST-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device1.key b/test/src/main/resources/org/openremote/test/provisioning/device1.key
new file mode 100644
index 000000000..8fd725757
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device1.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device1.pem b/test/src/main/resources/org/openremote/test/provisioning/device1.pem
new file mode 100644
index 000000000..7cd2b5dbd
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device1.pem
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFdjCCA14CFAFINYMIOiLOII64AG+rMJ6/ECrKMA0GCSqGSIb3DQEBCwUAMIGM
+MQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ
+RWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt
+b3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wIBcN
+MjExMDI2MTExODUzWhgPMjA3MTAyMDYxMTE4NTNaMGAxCzAJBgNVBAYTAk5MMRYw
+FAYDVQQIDA1Ob3J0aCBCcmFiYW50MRIwEAYDVQQHDAlFaW5kaG92ZW4xEzARBgNV
+BAoMCk9wZW5SZW1vdGUxEDAOBgNVBAMMB2RldmljZTEwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQC4iHjdJcQPPkRqFhBQjoKnza7cTqm9ikqf8kxUkSsm
+UgFuTWJmdbbMFh67TKPwZHuavXUGDGGuMvr3LqtmfVoe4HVYtJHR0U5VqH3vRFNi
+RW6cwg5g5SLn633flZHiBqiEcJrpmlTRbbscilIQWM3MSGoaI3UfgV2r7q0HDjFQ
+KPpPfjeueAIMIsscoDnsdAX6+Ka1x5jw6mYTsU6+IA7CpAZoxwS/PGPZZ3ARdC/R
+j5OfcZhrjKolk/+ddo16lhJ7Lo2TrcIfc0PEUiP9jVz6JMlncvMSbdb1UpjfWcIn
+dq4+TyyhtdJOxbBfLuUUpbKBc+qMLDije+EXmKvkQYPU+9BlI5Sbfja9xAp4/jrh
+l4a2vtepvrGwiCnOhxuTgi2Xhi8g0aO5UgVYlF90sxLALMIhQnUkKJHxmAfJnEoW
+TxrfzHZwQTqdtOtKdveTDJGaRld3f6Ln5jwzKcZD+Xt4eU0ZQqVfa705YPwqKKOJ
+Kop5J+eq5/kJfRMSC+J5Vs/c7zyQRb1vpACYSx0mIuKDqZ9By+7dIYxuHJy7RUz6
+s1+jqUXEWBtXlesd/eGP3LyPxzsi9WsoOpUQZLqhKSp+XuYX12q7hIxB8gMx8SJJ
+bVbHmx+lZOF+aBu+girhW7J5OBniGuakYGJW9ifu07a8Gx9I0dlSuO+m8sfLr6tF
+EwIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQBf/T8s31R4OawFtfOuSQt4NOZnKMIC
+VWL0xV2uyoWSMudNmL0qJcLNv5jFOH65igMfdTdYCfhr4mstmFwv2XhyyE/AQpmn
+/1Idc/mnOtYI6Goqlvmdjude+peD5DsvEWXGJ8/wuA9cOSSBZTFJynr/Bps8/8eq
+sH6Wrt9dO39xQKfGP7SR5OF2WmsWaTnCBg9cEOnjoS2IjUML/8boszFbdodBH/8y
+u4PJCe0CLKLLz8hOK9SKZ4IwbyEAC2BVSq0x6yLeK+W2+EaCQgdpAUGOh1ItXai0
+djG41c+KQwrYGn7WsbDOoYhkkSPw70FVVdJyWj9e5o1OwKT+K6Ydy+cqxm6XAtu7
+I5aUe7h8LIv2k/6VttMppWRfp2wG7jfTR/mtglj6cpUjUdNY1/i2IrevRKqbouPk
+OmTjUGFjwsZTGE26BLbmTLlHuF9Rikh+HHxhyMXgk5x6zU0PlcqCU4tXNcnFuLaE
+hWTLqlfMbO5QBa17MxXJp5qws5YLUOWhwrscXfMM6eG/zb6lqFK8BT0rmwonoAtM
+fUUCRkPgP8jqeriU3p76TUc6cjiSsPBQxQz3ll819AecgjJiIOUY2Ipniim4Ives
+tQDykWW8j4Ts7h/IRaFFZHEHnlDiWb1hUmueYfmxIgSY5trJBef1JDMKtiuZRwhJ
+X6Wrw69JQtkUNQ==
+-----END CERTIFICATE-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device2.csr b/test/src/main/resources/org/openremote/test/provisioning/device2.csr
new file mode 100644
index 000000000..d8a072069
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device2.csr
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICpTCCAY0CAQAwYDELMAkGA1UEBhMCTkwxFjAUBgNVBAgMDU5vcnRoIEJyYWJh
+bnQxEjAQBgNVBAcMCUVpbmRob3ZlbjETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4G
+A1UEAwwHZGV2aWNlMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOSQ
+wdJH19AgihxlXU13XzhOIk21kFi1lGSSr/j1BvIzNzh0ofawAgwcAnp/RQs377vx
+0xPc8H25i5lNd3U0vsLarfsZH+q83icpszYlC8QuiM8KQYTFP5uaaLHI6oZRxytO
+pHG7jHOmI1GaPEpO/xTqG4uf299IMXBZsyCKpJAtuRDAEsXQUga1x5GRSB08exeF
+w9220LLbtRJpH/7Nuqs0a9s99kFgVooCnHCSfZ+5zQCr938vRgcitmdq9wKjsy/K
+yyVQE3l7GSvruqSRiqVu2NFQxPN9kmKx8c8PZa4hjNQEB1r742G4IZzO/frhqpL9
+DQXbFgmLoXX9ij8HIucCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQCqKu3l2dGj
+pZWJLNyKsnqFKBy7hzOgmZFyN7SOmuXuNuIvVPEB1nEc66Wv/Qu87Abe1hTEvVPy
+X9jhoUJ24ejv7UnAEj3PZky8Zq9LOwpKC5GKInHXoIYKrPmxnlIValwb/USUpYlR
+WjuJHbrFbwQDT7L8rWs1v4fRC5YK7Pt3z0Xs/lMCtHzKJytQmKt84ArXDuZ3p4Q0
+COhyyYwKieZijlRjP6TkRy9obO2cl4mi6KsIVbaKsL3vsQanGRoaR2m/PSqGvpiN
+ljl7X0B2BbUEG4Q4S4cl5H/P+CBxq0PuuehYBD9GTHKkataUkasXacl2NE+kUaas
+CL2U8FG0qt+m
+-----END CERTIFICATE REQUEST-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device2.key b/test/src/main/resources/org/openremote/test/provisioning/device2.key
new file mode 100644
index 000000000..aac26b4d7
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device2.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA5JDB0kfX0CCKHGVdTXdfOE4iTbWQWLWUZJKv+PUG8jM3OHSh
+9rACDBwCen9FCzfvu/HTE9zwfbmLmU13dTS+wtqt+xkf6rzeJymzNiULxC6IzwpB
+hMU/m5poscjqhlHHK06kcbuMc6YjUZo8Sk7/FOobi5/b30gxcFmzIIqkkC25EMAS
+xdBSBrXHkZFIHTx7F4XD3bbQstu1Emkf/s26qzRr2z32QWBWigKccJJ9n7nNAKv3
+fy9GByK2Z2r3AqOzL8rLJVATeXsZK+u6pJGKpW7Y0VDE832SYrHxzw9lriGM1AQH
+WvvjYbghnM79+uGqkv0NBdsWCYuhdf2KPwci5wIDAQABAoIBAQCps7zktwjKc853
+hN9AjBf7wy9/CQaShscV4T+clbjBjTs7xIUYltf+S7GfZ+1IhhCON99jiRBaGLBI
+c5b1Q+M644h3vdDPxckfxLtVwS26TF6xckjxHk665mtDTQysC/3X7rzz4K9Ikpr4
+lI6dEYgc7DDlexyR7JUgeMkhqS7ECHd36gZsvn+5QFNE1JJKT2Ssmr6RPvWqmKz0
++LGwV2w0fAbHOWUtsOvceY85DbMyQ5SZotty7jlwh/1v81TEm4CEccIS1TG2+6Gv
+z27tqqWapTXCuWm5a/qi0LE3GFk2FQpkr/Gc4Po153xa+1FDWFGUhSKKHIJJ9YyS
+uyMOQocBAoGBAPWvfYQfv+hp52yhf18C71ryGK0Ok10bEtjgL9R9zl2uO3FqPWSO
+2ntq78cdu+Kjs+gyQnIGb8XjyL/gboCAX8VEUwGydwVl2Eq1OtJA2+8GymoCFx5s
+EeX6k7sfTOx02ael28PpKXiQV8hCbFDrkyQl8XduSfn9AFj2fxmjueeBAoGBAO4p
+RMvyb0c+OMIfeoWNgrRoytdOw8oTxsdywMkxAytdrlJlLKJOY0WVPbEbsnR+kr1O
+B0JiGcjM63V+aWv+AqTJFc0o7DaJ9iuf+sO2vLLMb5lFrZI/kOaVxwQUxRYxFoXF
+idmeU+iG/GhjB/qD+VERlnYbuxHslsf6c+HICf5nAoGAZbdjMtlmPZXi/2GZdz+i
+0zdaKgPX1PtJgUrH4qS3VKe26oy+oCxYnjI21WwlBn8aE+8C/WxWyEo3KeGEPmVn
+wSc5aoF1r2Fr+/ouQTAjHkHkeaEl6y1494sXsKgT0+3I0xTi+KhGyCiSf1GowJPX
+lmazIuwhaoNpqmtbUcUsSYECgYEAhqHduk06itOp0lNpN8ZfdQ0oXb6w/7NeU7GT
+Oijy2bkDqqB3MumNRPCxB0XZA/HpkgpiICzE1rbBBJKJlfrqE615HZlcrxgeiVrO
+r4TF922KSOMS0/ILP867yprTL1Bgow6gdt0CIhjs5zXUdNHWRvXiULIsdl2Af1wd
+1iz3OVECgYAbQ8PcbHxKB5xmdeLiGpKjvI8GSRw/XNv2IR17AuOR0zZ5iPUJ7uc+
+2RHLsnw61EB6vnZTUPH7dEAkrrD/lj30JXE7d3ZYBO6RwjLzZmpaeRusr9Fdvh2I
+T1zg4IwY2PdqEEdRuJGUglXSH8whNzLM1QB7Xu3Ar7y5ArpKzy7UXA==
+-----END RSA PRIVATE KEY-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device2_expired.pem b/test/src/main/resources/org/openremote/test/provisioning/device2_expired.pem
new file mode 100644
index 000000000..162e359b8
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device2_expired.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEdDCCAlwCFAFINYMIOiLOII64AG+rMJ6/ECrLMA0GCSqGSIb3DQEBCwUAMIGM
+MQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ
+RWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt
+b3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN
+MjExMDI2MTExOTMxWhcNMjExMDI3MTExOTMxWjBgMQswCQYDVQQGEwJOTDEWMBQG
+A1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJRWluZGhvdmVuMRMwEQYDVQQK
+DApPcGVuUmVtb3RlMRAwDgYDVQQDDAdkZXZpY2UyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA5JDB0kfX0CCKHGVdTXdfOE4iTbWQWLWUZJKv+PUG8jM3
+OHSh9rACDBwCen9FCzfvu/HTE9zwfbmLmU13dTS+wtqt+xkf6rzeJymzNiULxC6I
+zwpBhMU/m5poscjqhlHHK06kcbuMc6YjUZo8Sk7/FOobi5/b30gxcFmzIIqkkC25
+EMASxdBSBrXHkZFIHTx7F4XD3bbQstu1Emkf/s26qzRr2z32QWBWigKccJJ9n7nN
+AKv3fy9GByK2Z2r3AqOzL8rLJVATeXsZK+u6pJGKpW7Y0VDE832SYrHxzw9lriGM
+1AQHWvvjYbghnM79+uGqkv0NBdsWCYuhdf2KPwci5wIDAQABMA0GCSqGSIb3DQEB
+CwUAA4ICAQAB4NP1sy5pkLjf9bkSPWSPGknhtqlm8q5sXMv9fe4bAVXeuezPvB4v
+z9dX4rR24BnbxasnN7e9teztTV+z4lmCBwwzCdy4zoyjaluyXuB+FOhkLVUdaHjP
+JHBls72lxjbJy2PwQGaZDhBOjuv/nNlSQSNM4MB6ANvQVfnRwGYYxpdpGTJ7ymz9
+bav52tJpnHGzLQJ9gaMz+otyzdP+jU/AUCsYbpAaAd9mv7+/ncfTfvWwm5AedHBv
+B6w1oYGdKVajX+MBgkysjau5m9pu7b+BcxJUzzehYKqYUcDxlpRKT0NUlzvwSsQ0
++KpqzVarxqTI8fUWbP/O4OZHZwUYJm4kF4NoRweppmqS6GbISJ46ZVYOuF0YWVYR
+wP9PjENOWUgEdCgySvh3l/VprL6xjnktu7/VH9Yg/ap5OoKhbDgA0CN1N2qgZ7e5
+zugN7CWnJsO7DH3Y3qhhIFajtfxYH4Rs7LQImZHckLFPGcofGcUyHXBLmBaGI1ym
+k4dC5i8rt7CIWKGg0v/NWwINYWLrnF2cOTiOXhkr45qCvYMb2yJkq3KUE7CSnO9x
+cQBDmmA7y8C6LpVbdEVXFdXwsFU0KHDgu2TQMPgrJsPyp87HerrGPPkzI4C42+6U
+Gw5/qVA4dXTOPfRcqNzrlBxGLMCWH2F38lP3gwQmdxaNLP6i98TdZQ==
+-----END CERTIFICATE-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device3.csr b/test/src/main/resources/org/openremote/test/provisioning/device3.csr
new file mode 100644
index 000000000..e1179e71f
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device3.csr
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICpTCCAY0CAQAwYDELMAkGA1UEBhMCTkwxFjAUBgNVBAgMDU5vcnRoIEJyYWJh
+bnQxEjAQBgNVBAcMCUVpbmRob3ZlbjETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4G
+A1UEAwwHZGV2aWNlMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOSQ
+wdJH19AgihxlXU13XzhOIk21kFi1lGSSr/j1BvIzNzh0ofawAgwcAnp/RQs377vx
+0xPc8H25i5lNd3U0vsLarfsZH+q83icpszYlC8QuiM8KQYTFP5uaaLHI6oZRxytO
+pHG7jHOmI1GaPEpO/xTqG4uf299IMXBZsyCKpJAtuRDAEsXQUga1x5GRSB08exeF
+w9220LLbtRJpH/7Nuqs0a9s99kFgVooCnHCSfZ+5zQCr938vRgcitmdq9wKjsy/K
+yyVQE3l7GSvruqSRiqVu2NFQxPN9kmKx8c8PZa4hjNQEB1r742G4IZzO/frhqpL9
+DQXbFgmLoXX9ij8HIucCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQBv1JssGKji
+D1/Q8OXi8bDA9B3TSn8byQFE3u4+/tmNsM892xH26FZY/fPfZSDQH2jH/pYIwQLx
+v0AHy1Ipenf4SBUE01GCNUwZFUI4FDW18+N8kYQujLru/uOd+fRk9Yevl9YeJ1D/
+o3v+n5dUSLhOJrOzLN6jeTij7Oo7WZ8LE8xdlHGcK49FEzmjqRLiEhh0Gbofmsjq
+UpQaeSXtUXD76wUM2ie7dfaVr1gn85x/k3q9u/BSDGrNeEvQkmBNvsiz0qQAt2t4
++2fberkEwvNhUfCUBtwD2l/31L+6zwFzkK3pOmxmYZXsc2eeFzYIc8yMNDWW8jhB
+lHJ7sapBd29p
+-----END CERTIFICATE REQUEST-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device3.key b/test/src/main/resources/org/openremote/test/provisioning/device3.key
new file mode 100644
index 000000000..5e635b07e
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device3.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA+JugmjTLx5g+qAzEuBEBGb9WQvToCP4bL4WUQEkn+s/Z02Hr
+jwYktbRFmWFv0D01y4dlAUpuNDECfVjcWkJnON43ejHH9Tkyw2klAtfbBFypJuLV
+S28ZP8pMBuFEQXnqii2+Mu/xtJT5WZtGKjKC4aSDu4ti53waaopmj/3kgSDGOFnp
+W/4IH6B4D1Tk3X5JZ7U8U8kSNi7QUiN64+O1uNDKzARcgQqQYw6zEHBICppWalMr
+HaJmy4OfHhVz5D6MrYjnauyaXmFRgTeKR7w9AFqxRD/Tke86U7iFzh6T0TzsB5TS
+fjsaxiPo4WHjljOaRLPvkMGiTWI1xODgo8FcGQIDAQABAoIBAQCgzGBLfXyUw7c7
+EM8oUu9ITQapVijCsEC7MwYZsnemdUvpujsXDh0uXcRqmagto3mpBBDjjdXL8isv
+EgusYajMEocFhS9VQELCO77RoPYrUxehbDQTj29gYCNei9OPGiEGcOHFpobKi1Tg
+jVsLrhITikoeQuCc4xte79e4qLpkfZz9vXNmMMfKmnFcWzt0yc6AKEBePkqEuQS8
+lho8iudicKuVlWXAtpbnwbW5tW5bi0KCaYeLmAkjp4eJSkZNkEFOr7D+Je79GXec
+RzX5sGQsGv2oNezo9/lvoV7KHA+f6uHanbP1ExCDgJp9PX7yEGADkJRKa05eOMDp
+CqojPGuBAoGBAP2v+iVTAt8IOCLqD7rUsaeVeW2yn5djRu+TNnAq8mWWwC4+JJGf
+dEsz/QUcjmilOBRnYFb7Nah22+ZEmeR0ugNLy/pqZlKZAseqSHVbVbJUEfkhhAlG
+oZPy+hE7zECQdGKm5BJ8+9uOEqRu6xhlekm5qolUWzdazJ7LRrp12c7xAoGBAPrf
+y95R/sQeNmG6BtVscj147pRURAF+gmJ47/vtpAdMCBupcAuV6yMHjmTsQoBG9D7f
+gO8G2IdNbA13oQS864s0vTlBWEWpviX8vz+5fjj+lKWWd5yemqeVBXaDaVScriug
+aGI1tdlpO5Ke7OvdmNQocpMeuz21xJAJfn58ka+pAoGACjAvE6Cp1Ns3pe9QgmhY
+WiqendE2p5XNG4IGBasz4PCU90Z3oYGN4hdMahAjiABaqDcen1+nYASmADFxHMOz
+VL6OipgLU/XhLrOgBVaNsoO91QuLifPUOWTgtiB4q38hrXSWZEewtbiW9xOdTXWF
+28AhITLKFwcGgLoZNRPWk4ECgYAGg+VhgrOhGD/FTfV7eXOGESvxAjc56rUsJYPm
+AQfvgJP9U+srAdu3byzNhi0785vIPjm0+3KIIQSbXO37l4RuexIm+IF4Xa4ogmXd
+G84hYMsvebblhGDz1TTtHQCRR/hl/aZ4VnjAirEXX7U7cufTKrG/DF9EfQH706NL
+WaTW8QKBgQCaHASUJWaSyT6MIK+y66jIic+19d6FDtWr+Xjepwrb5LsoaM3/dYl8
+UPna50ojQa5MoUEhIGTNM38+RA/aOEz5GY1aU+QJIas9QOqNgTYwwAxtZOPbQtVo
+bnvo+Afa0vLYRdY9gyX0RAiCpFEnpeygKfprxH2+SskInbNBQFV5VA==
+-----END RSA PRIVATE KEY-----
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device3_caexpired.pem b/test/src/main/resources/org/openremote/test/provisioning/device3_caexpired.pem
new file mode 100644
index 000000000..8b55f12a2
--- /dev/null
+++ b/test/src/main/resources/org/openremote/test/provisioning/device3_caexpired.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEdTCCAl0CE3I8XH0o1n1cQoj7DNrZBpYoKEwwDQYJKoZIhvcNAQELBQAwgYwx
+CzAJBgNVBAYTAk5MMRYwFAYDVQQIDA1Ob3J0aCBCcmFiYW50MRIwEAYDVQQHDAlF
+aW5kaG92ZW4xEzARBgNVBAoMCk9wZW5SZW1vdGUxFjAUBgNVBAMMDW9wZW5yZW1v
+dGUuaW8xJDAiBgkqhkiG9w0BCQEWFXN1cHBvcnRAb3BlbnJlbW90ZS5pbzAgFw0y
+MTEwMjYxMTIwNTRaGA8yMDcxMDIwNjExMjA1NFowYDELMAkGA1UEBhMCTkwxFjAU
+BgNVBAgMDU5vcnRoIEJyYWJhbnQxEjAQBgNVBAcMCUVpbmRob3ZlbjETMBEGA1UE
+CgwKT3BlblJlbW90ZTEQMA4GA1UEAwwHZGV2aWNlMzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAOSQwdJH19AgihxlXU13XzhOIk21kFi1lGSSr/j1BvIz
+Nzh0ofawAgwcAnp/RQs377vx0xPc8H25i5lNd3U0vsLarfsZH+q83icpszYlC8Qu
+iM8KQYTFP5uaaLHI6oZRxytOpHG7jHOmI1GaPEpO/xTqG4uf299IMXBZsyCKpJAt
+uRDAEsXQUga1x5GRSB08exeFw9220LLbtRJpH/7Nuqs0a9s99kFgVooCnHCSfZ+5
+zQCr938vRgcitmdq9wKjsy/KyyVQE3l7GSvruqSRiqVu2NFQxPN9kmKx8c8PZa4h
+jNQEB1r742G4IZzO/frhqpL9DQXbFgmLoXX9ij8HIucCAwEAATANBgkqhkiG9w0B
+AQsFAAOCAgEAayhj3IEM+CFK12rFndJCe0md82ELCP0WzdiyXNtq8gdR+awybn5l
+88thTJYauDT/naz/nZ7z8RslaPt7GCRKXfBcHmNW+aYF7kKb73eghUKpVJLCN75O
+tOkKKi77fj1WtIDL9u826iN19a59jadkZDtUSYV7ycB57qc6CPXCkJ5wk4HjpGZW
+lEHeIpptw6pRM0D+GAq3M0R9EuXqk7vmfyAhMMCCR50N/TnlLbJIDxEeiVZBGhnQ
+9WAZrTmxeKJM3fHQX3o6IN62KyTH1gi3zTgc2NjtGRMC7gb6mF/YcJMKNUWd/B5O
+I1YkRHqihXpVCrG3dS2bAryWQmMM1GqejO8XUY1T6TkqQmDMbYQawgcivuTSbEM+
+HqhJ5YpRzwpeBt0/5uBDYZIqUSc6C77Zy0QMe5/SfOWs+Zqh/KlWP5U0sdi1pAl/
+M/5/6Fsq1dUiYvSQ/lJ/oZC0VJvK6Cp5MWKlqQmOyniN21hgSwNytyvdE9hy08Ov
+HRWkyddkd2TJ56YqIR9iRJKdAjdGs6mCnAcCXvv57jS5K8D/wRfBByDpllB0nfWk
+4GVeI8J6y7hj08zqCY4OmEr33xHmjBAjnxT9kDGAQF+XuEIsmz8Q1lzfIfClMYQz
+8EI+aZIb22nTXrz3cBW5pRhGkDopxziqg+mPX91zfNA6CklWWXJVJzY=
+-----END CERTIFICATE-----
diff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy
index 35b1950ec..738d357ac 100644
--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy
@@ -23,41 +23,57 @@ import io.moquette.BrokerConstants
import org.junit.Ignore
import org.openremote.agent.protocol.mqtt.MQTTAgent
import org.openremote.agent.protocol.mqtt.MQTTAgentLink
+import org.openremote.agent.protocol.mqtt.MQTTMessage
import org.openremote.agent.protocol.mqtt.MQTTProtocol
+import org.openremote.agent.protocol.mqtt.MQTT_IOClient
import org.openremote.agent.protocol.simulator.SimulatorProtocol
import org.openremote.container.util.UniqueIdentifierGenerator
import org.openremote.manager.agent.AgentService
import org.openremote.manager.asset.AssetProcessingService
import org.openremote.manager.asset.AssetStorageService
import org.openremote.manager.event.ClientEventService
+import org.openremote.manager.mqtt.MqttBrokerService
+import org.openremote.manager.provisioning.ProvisioningService
+import org.openremote.manager.provisioning.UserAssetProvisioningMQTTHandler
import org.openremote.manager.setup.SetupService
import org.openremote.model.Constants
import org.openremote.model.asset.agent.Agent
import org.openremote.model.asset.agent.ConnectionStatus
import org.openremote.model.asset.agent.Protocol
import org.openremote.model.asset.impl.ThingAsset
+import org.openremote.model.asset.impl.WeatherAsset
import org.openremote.model.attribute.Attribute
import org.openremote.model.attribute.AttributeEvent
import org.openremote.model.attribute.MetaItem
import org.openremote.model.auth.UsernamePassword
+import org.openremote.model.provisioning.ErrorResponseMessage
+import org.openremote.model.provisioning.ProvisioningMessage
+import org.openremote.model.provisioning.SuccessResponseMessage
+import org.openremote.model.provisioning.X509ProvisioningConfig
+import org.openremote.model.provisioning.X509ProvisioningData
+import org.openremote.model.provisioning.X509ProvisioningMessage
+import org.openremote.model.util.ValueUtil
import org.openremote.test.ManagerContainerTrait
import org.openremote.test.setup.KeycloakTestSetup
import org.openremote.test.setup.ManagerTestSetup
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
+import java.util.function.Consumer
+
import static org.openremote.container.util.MapAccess.getInteger
import static org.openremote.container.util.MapAccess.getString
import static org.openremote.manager.mqtt.MqttBrokerService.MQTT_SERVER_LISTEN_HOST
import static org.openremote.manager.mqtt.MqttBrokerService.MQTT_SERVER_LISTEN_PORT
import static org.openremote.model.value.MetaItemType.AGENT_LINK
import static org.openremote.model.value.ValueType.NUMBER
+import static org.openremote.manager.provisioning.UserAssetProvisioningMQTTHandler.*
@Ignore
class UserAndAssetProvisioningTest extends Specification implements ManagerContainerTrait {
@SuppressWarnings("GroovyAccessibility")
- def "Check websocket client protocol and linked attribute deployment"() {
+ def "Check user and asset provisioning functionality"() {
given: "expected conditions"
def conditions = new PollingConditions(timeout: 10, delay: 0.2)
@@ -65,80 +81,76 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta
and: "the container starts"
def container = startContainer(defaultConfig(), defaultServices())
def assetStorageService = container.getService(AssetStorageService.class)
+ def provisioningService = container.getService(ProvisioningService.class)
+ def mqttBrokerService = container.getService(MqttBrokerService.class)
def assetProcessingService = container.getService(AssetProcessingService.class)
- def agentService = container.getService(AgentService.class)
def managerTestSetup = container.getService(SetupService.class).getTaskOfType(ManagerTestSetup.class)
def keycloakTestSetup = container.getService(SetupService.class).getTaskOfType(KeycloakTestSetup.class)
- def clientEventService = container.getService(ClientEventService.class)
def mqttHost = getString(container.getConfig(), MQTT_SERVER_LISTEN_HOST, BrokerConstants.HOST)
def mqttPort = getInteger(container.getConfig(), MQTT_SERVER_LISTEN_PORT, BrokerConstants.PORT)
- when: "an MQTT client agent is created to connect to this tests manager"
- def clientId = UniqueIdentifierGenerator.generateId()
- def agent = new MQTTAgent("Test agent")
- .setRealm(Constants.MASTER_REALM)
- .setClientId(clientId)
- .setHost(mqttHost)
- .setPort(mqttPort)
- .setUsernamePassword(new UsernamePassword(keycloakTestSetup.tenantBuilding.realm + ":" + KeycloakTestSetup.serviceUserId, KeycloakTestSetup.serviceUserSecret))
-
- and: "the agent is added to the asset service"
- agent = assetStorageService.merge(agent)
-
- then: "the protocol should authenticate and the agent status should become CONNECTED"
+ when: "a provisioning realm config is added to the system"
+ // TODO: implement config persistence and resource implementation
+// def provisioningConfig = new X509ProvisioningConfig().setData(
+// new X509ProvisioningData()
+// .setCACertPEM("")
+// ).setAssetTemplate(
+// ValueUtil.asJSON(
+// new WeatherAsset("Weather Asset")
+// ).orElse("")
+// )
+
+ then: "then the config should be available in the system"
conditions.eventually {
- agent = assetStorageService.find(agent.id, Agent.class)
- assert agent.getAgentStatus().orElse(null) == ConnectionStatus.CONNECTED
+ assert provisioningService.getProvisioningConfigs().size() == 1
+ assert provisioningService.getProvisioningConfigs().get(0) instanceof X509ProvisioningConfig
+ assert ((X509ProvisioningConfig)provisioningService.getProvisioningConfigs().get(0)).getData() != null
+ //assert ((X509ProvisioningConfig)provisioningService.getProvisioningConfigs().get(0)).getData().getCACertPEM() == provisioningConfig.getData().getCACertPEM()
}
- when: "an asset is created with attributes linked to the agent"
- def asset = new ThingAsset("Test Asset")
- .setParent(agent)
- .addOrReplaceAttributes(
- // write attribute value
- new Attribute<>("readWriteTargetTemp", NUMBER)
- .addMeta(
- new MetaItem<>(AGENT_LINK, new MQTTAgentLink(agent.id)
- .setSubscriptionTopic("${keycloakTestSetup.tenantBuilding.realm}/$clientId/attributevalue/${managerTestSetup.apartment1LivingroomId}/targetTemperature")
- .setPublishTopic("${keycloakTestSetup.tenantBuilding.realm}/$clientId/attributevalue/${managerTestSetup.apartment1LivingroomId}/targetTemperature")
- .setWriteValue("${Protocol.DYNAMIC_VALUE_PLACEHOLDER}")
- ))
- )
-
- and: "the asset is merged into the asset service"
- asset = assetStorageService.merge(asset)
+ when: "a mqtt client connects"
+ def device1UniqueId = "Device1SerialNumber"
+ def mqttClientId = UniqueIdentifierGenerator.generateId()
+ MQTT_IOClient client = new MQTT_IOClient(mqttClientId, mqttHost, mqttPort, false, null, null)
+ client.connect()
- then: "the linked attributes should be correctly linked"
+ then: "mqtt connection should exist"
conditions.eventually {
- assert !(agentService.getProtocolInstance(agent.id) as MQTTProtocol).protocolMessageConsumers.isEmpty()
+ assert client.getConnectionStatus() == ConnectionStatus.CONNECTED
+ assert mqttBrokerService.clientIdConnectionMap.get(mqttClientId) != null
}
- when: "the source attribute are updated"
- ((SimulatorProtocol)agentService.getProtocolInstance(managerTestSetup.apartment1ServiceAgentId)).updateSensor(new AttributeEvent(managerTestSetup.apartment1LivingroomId, "targetTemperature", 99d))
-
- then: "the values should be stored in the database"
- conditions.eventually {
- def livingRoom = assetStorageService.find(managerTestSetup.apartment1LivingroomId)
- assert livingRoom != null
- assert livingRoom.getAttribute("targetTemperature", Double.class).flatMap{it.value}.orElse(0d) == 99d
+ when: "the client subscribes to the provisioning endpoints"
+ List<ProvisioningMessage> device1Responses = []
+ Consumer<MQTTMessage<String>> device1MessageConsumer = { MQTTMessage<String> msg ->
+ device1Responses.add(ValueUtil.parse(msg.payload, ProvisioningMessage.class).orElse(null))
}
+ def device1RequestTopic = "$PROVISIONING_TOKEN/$device1UniqueId/$REQUEST_TOKEN".toString()
+ def device1ResponseTopic = "$PROVISIONING_TOKEN/$device1UniqueId/$RESPONSE_TOKEN".toString()
+ client.addMessageConsumer(device1ResponseTopic, device1MessageConsumer)
- then: "the linked attributes should also have the updated values of the subscribed attributes"
+ then: "the subscriptions should succeed"
conditions.eventually {
- asset = assetStorageService.find(asset.getId(), true)
- assert asset.getAttribute("readWriteTargetTemp").get().getValue().orElse(null) == 99d
+ assert client.topicConsumerMap.get(device1ResponseTopic) != null
+ assert client.topicConsumerMap.get(device1ResponseTopic).size() == 1
+ assert mqttBrokerService.clientIdConnectionMap.get(mqttClientId) != null
}
- when: "a linked attribute value is updated"
- def attributeEvent = new AttributeEvent(asset.id,
- "readWriteTargetTemp",
- 19.5)
- assetProcessingService.sendAttributeEvent(attributeEvent)
+ when: "the client publishes a valid x509 certificate that has been signed by the CA stored in the provisioning config"
+ client.sendMessage(
+ new MQTTMessage<String>(device1RequestTopic, ValueUtil.asJSON(
+ new X509ProvisioningMessage(getClass().getResource("/org/openremote/test/provisioning/device1.pem").text)
+ ).orElse(null))
+ )
- then: "the linked targetTemperature attribute should contain this written value (it should have been written to the target temp attribute and then read back again)"
+ then: "the broker should have published to the response topic a success message"
conditions.eventually {
- asset = assetStorageService.find(asset.getId(), true)
- assert asset.getAttribute("readWriteTargetTemp", Double.class).flatMap{it.getValue()}.orElse(null) == 19.5d
+ assert device1Responses.size() == 1
+ assert device1Responses.get(0) instanceof SuccessResponseMessage
+ assert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingTenant
+ assert ((SuccessResponseMessage)device1Responses.get(0)).asset != null
}
+
+
}
}