Skip to content

armgit / core

Public Imported from GitHub
0

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

Setup wipe clean logic tidy up and identity provider improvements, moved to SETUP_WIPE_CLEAN_INSTALL to PersistenceService

Rich Turnerf0028e07e008
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
index 067f07267..656e248df 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -32,19 +32,16 @@ import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityTransaction;
import javax.persistence.Persistence;
import javax.ws.rs.core.UriBuilder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
-import static org.openremote.container.util.MapAccess.getInteger;
-import static org.openremote.container.util.MapAccess.getString;
+import static org.openremote.container.util.MapAccess.*;
/**
- * Uses the SQL database schema {@link #SCHEMA_NAME} for all operations.
+ * Uses the SQL database schema {@link #DEFAULT_SCHEMA_NAME} for all operations.
*/
public class PersistenceService implements ContainerService {
@@ -57,8 +54,8 @@ public class PersistenceService implements ContainerService {
* database artifacts from wipe/migrate in FlywayDB...) you must have it in the 'public'
* schema. Hence we need a different schema here.
*/
- public static final String SCHEMA_NAME = "openremote";
-
+ public static final String DEFAULT_SCHEMA_NAME = "openremote";
+ public static final String SETUP_WIPE_CLEAN_INSTALL = "SETUP_WIPE_CLEAN_INSTALL";
public static final String PERSISTENCE_UNIT_NAME = "PERSISTENCE_UNIT_NAME";
public static final String PERSISTENCE_UNIT_NAME_DEFAULT = "OpenRemotePU";
public static final String DATABASE_PRODUCT = "DATABASE_PRODUCT";
@@ -85,7 +82,8 @@ public class PersistenceService implements ContainerService {
protected Flyway flyway;
protected boolean forceClean;
- protected List<String> defaultSchemaLocations = new ArrayList<>();
+ protected Set<String> defaultSchemaLocations = new HashSet<>();
+ protected Set<String> schemas = new HashSet<>();
@Override
public int getPriority() {
@@ -112,27 +110,19 @@ public class PersistenceService implements ContainerService {
}
persistenceUnitName = getString(container.getConfig(), PERSISTENCE_UNIT_NAME, PERSISTENCE_UNIT_NAME_DEFAULT);
- }
- protected void openDatabase(Container container, Database database) {
- String connectionUrl = getString(container.getConfig(), DATABASE_CONNECTION_URL, DATABASE_CONNECTION_URL_DEFAULT);
- connectionUrl = UriBuilder.fromUri(connectionUrl).replaceQueryParam("currentSchema", SCHEMA_NAME).build().toString();
- String databaseUsername = getString(container.getConfig(), DATABASE_USERNAME, DATABASE_USERNAME_DEFAULT);
- String databasePassword = getString(container.getConfig(), DATABASE_PASSWORD, DATABASE_PASSWORD_DEFAULT);
- int databaseMinPoolSize = getInteger(container.getConfig(), DATABASE_MIN_POOL_SIZE, DATABASE_MIN_POOL_SIZE_DEFAULT);
- int databaseMaxPoolSize = getInteger(container.getConfig(), DATABASE_MAX_POOL_SIZE, DATABASE_MAX_POOL_SIZE_DEFAULT);
- int connectionTimeoutSeconds = getInteger(container.getConfig(), DATABASE_CONNECTION_TIMEOUT_SECONDS, DATABASE_CONNECTION_TIMEOUT_SECONDS_DEFAULT);
- LOG.info("Opening database connection: " + connectionUrl);
- database.open(persistenceUnitProperties, connectionUrl, databaseUsername, databasePassword, connectionTimeoutSeconds, databaseMinPoolSize, databaseMaxPoolSize);
+ forceClean = getBoolean(container.getConfig(), SETUP_WIPE_CLEAN_INSTALL, container.isDevMode());
+
+ openDatabase(container, database);
- prepareSchema(connectionUrl, databaseUsername, databasePassword);
+ this.entityManagerFactory =
+ Persistence.createEntityManagerFactory(persistenceUnitName, persistenceUnitProperties);
}
+
@Override
public void start(Container container) throws Exception {
- openDatabase(container, database);
- this.entityManagerFactory =
- Persistence.createEntityManagerFactory(persistenceUnitName, persistenceUnitProperties);
+
}
@Override
@@ -145,14 +135,10 @@ public class PersistenceService implements ContainerService {
}
}
- public boolean isForceClean() {
+ public boolean isSetupWipeCleanInstall() {
return forceClean;
}
- public void setForceClean(boolean forceClean) {
- this.forceClean = forceClean;
- }
-
public EntityManager createEntityManager() {
EntityManager entityManager = getEntityManagerFactory().createEntityManager();
@@ -202,18 +188,39 @@ public class PersistenceService implements ContainerService {
return entityManagerFactory;
}
- public List<String> getDefaultSchemaLocations() {
+ public Set<String> getDefaultSchemaLocations() {
return defaultSchemaLocations;
}
- protected void prepareSchema(String connectionUrl, String databaseUsername, String databasePassword) {
+ public Set<String> getSchemas() {
+ return schemas;
+ }
+
+ protected void openDatabase(Container container, Database database) {
+ String connectionUrl = getString(container.getConfig(), DATABASE_CONNECTION_URL, DATABASE_CONNECTION_URL_DEFAULT);
+ connectionUrl = UriBuilder.fromUri(connectionUrl).replaceQueryParam("currentSchema", DEFAULT_SCHEMA_NAME).build().toString();
+ String databaseUsername = getString(container.getConfig(), DATABASE_USERNAME, DATABASE_USERNAME_DEFAULT);
+ String databasePassword = getString(container.getConfig(), DATABASE_PASSWORD, DATABASE_PASSWORD_DEFAULT);
+ int databaseMinPoolSize = getInteger(container.getConfig(), DATABASE_MIN_POOL_SIZE, DATABASE_MIN_POOL_SIZE_DEFAULT);
+ int databaseMaxPoolSize = getInteger(container.getConfig(), DATABASE_MAX_POOL_SIZE, DATABASE_MAX_POOL_SIZE_DEFAULT);
+ int connectionTimeoutSeconds = getInteger(container.getConfig(), DATABASE_CONNECTION_TIMEOUT_SECONDS, DATABASE_CONNECTION_TIMEOUT_SECONDS_DEFAULT);
+ LOG.info("Opening database connection: " + connectionUrl);
+ database.open(persistenceUnitProperties, connectionUrl, databaseUsername, databasePassword, connectionTimeoutSeconds, databaseMinPoolSize, databaseMaxPoolSize);
+
+ prepareSchemas(connectionUrl, databaseUsername, databasePassword);
+ }
+
+ protected void prepareSchemas(String connectionUrl, String databaseUsername, String databasePassword) {
LOG.fine("Preparing database schema");
flyway = new Flyway();
flyway.setDataSource(connectionUrl, databaseUsername, databasePassword);
- flyway.setSchemas(SCHEMA_NAME);
List<String> locations = new ArrayList<>();
+ List<String> schemas = new ArrayList<>();
+ schemas.add(DEFAULT_SCHEMA_NAME);
+ appendSchemas(schemas);
appendSchemaLocations(locations);
- flyway.setLocations(locations.toArray(new String[locations.size()]));
+ flyway.setSchemas(schemas.toArray(new String[0]));
+ flyway.setLocations(locations.toArray(new String[0]));
if (forceClean) {
LOG.warning("!!! Cleaning database !!!");
@@ -234,6 +241,10 @@ public class PersistenceService implements ContainerService {
locations.addAll(defaultSchemaLocations);
}
+ protected void appendSchemas(List<String> schemas) {
+ schemas.addAll(this.schemas);
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
diff --git a/container/src/main/java/org/openremote/container/security/IdentityService.java b/container/src/main/java/org/openremote/container/security/IdentityService.java
index 50693e0ff..4e4e58c9d 100644
--- a/container/src/main/java/org/openremote/container/security/IdentityService.java
+++ b/container/src/main/java/org/openremote/container/security/IdentityService.java
@@ -32,7 +32,7 @@ import static org.openremote.container.util.MapAccess.*;
public abstract class IdentityService implements ContainerService {
- public static final int PRIORITY = PersistenceService.PRIORITY + 10; // Run after persistence setup
+ public static final int PRIORITY = PersistenceService.PRIORITY - 10; // Run before persistence service
private static final Logger LOG = Logger.getLogger(IdentityService.class.getName());
public static final String IDENTITY_NETWORK_SECURE = "IDENTITY_NETWORK_SECURE";
diff --git a/container/src/main/java/org/openremote/container/security/basic/BasicIdentityProvider.java b/container/src/main/java/org/openremote/container/security/basic/BasicIdentityProvider.java
index 0d9d57366..4270098ec 100644
--- a/container/src/main/java/org/openremote/container/security/basic/BasicIdentityProvider.java
+++ b/container/src/main/java/org/openremote/container/security/basic/BasicIdentityProvider.java
@@ -43,9 +43,11 @@ public abstract class BasicIdentityProvider implements IdentityProvider {
public BasicIdentityProvider(PersistenceService persistenceService) {
this.persistenceService = persistenceService;
+ // Add schema and scripts for the PUBLIC realm to replicate keycloak user tables
this.persistenceService.getDefaultSchemaLocations().add(
"classpath:org/openremote/container/persistence/schema/basicidentityprovider"
);
+ this.persistenceService.getSchemas().add("public");
}
@Override
diff --git a/container/src/main/java/org/openremote/container/security/basic/PasswordStorage.java b/container/src/main/java/org/openremote/container/security/basic/PasswordStorage.java
index 3df312e87..9a3a943a1 100644
--- a/container/src/main/java/org/openremote/container/security/basic/PasswordStorage.java
+++ b/container/src/main/java/org/openremote/container/security/basic/PasswordStorage.java
@@ -25,93 +25,21 @@
*/
package org.openremote.container.security.basic;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
-import java.util.Arrays;
import java.util.Base64;
-import java.util.concurrent.ExecutionException;
import java.util.logging.Logger;
-import static java.util.concurrent.TimeUnit.DAYS;
-
/**
* https://github.com/defuse/password-hashing
- * <p>
- * TODO: On ARM32 this is very slow, even with only 500 iterations it takes ~2 seconds on an RPI3 to hash a password, so we cache the result
- * TODO: Remove the cache if ARM64 is fast enough and increase iterations
*/
public class PasswordStorage {
private static final Logger LOG = Logger.getLogger(PasswordStorage.class.getName());
- static class CacheKey {
- final public char[] password;
- final public byte[] salt;
- final public int iterations;
- final public int bytes;
-
- public CacheKey(char[] password, byte[] salt, int iterations, int bytes) {
- this.password = password;
- this.salt = salt;
- this.iterations = iterations;
- this.bytes = bytes;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- CacheKey cacheKey = (CacheKey) o;
-
- if (iterations != cacheKey.iterations) return false;
- if (bytes != cacheKey.bytes) return false;
- if (!Arrays.equals(password, cacheKey.password)) return false;
- return Arrays.equals(salt, cacheKey.salt);
- }
-
- @Override
- public int hashCode() {
- int result = Arrays.hashCode(password);
- result = 31 * result + Arrays.hashCode(salt);
- result = 31 * result + iterations;
- result = 31 * result + bytes;
- return result;
- }
- }
-
- static final protected LoadingCache<CacheKey, byte[]> hashedPasswordCache = CacheBuilder.newBuilder()
- .maximumSize(1000)
- .expireAfterWrite(7, DAYS)
- .build(new CacheLoader<CacheKey, byte[]>() {
- @Override
- public byte[] load(CacheKey key) throws Exception {
- try {
- LOG.fine("Cache miss, hashing password...") ;
- PBEKeySpec spec = new PBEKeySpec(key.password, key.salt, key.iterations, key.bytes * 8);
- SecretKeyFactory skf = SecretKeyFactory.getInstance(PBKDF2_ALGORITHM);
- return skf.generateSecret(spec).getEncoded();
- } catch (NoSuchAlgorithmException ex) {
- throw new CannotPerformOperationException(
- "Hash algorithm not supported.",
- ex
- );
- } catch (InvalidKeySpecException ex) {
- throw new CannotPerformOperationException(
- "Invalid key spec.",
- ex
- );
- }
- }
- });
-
@SuppressWarnings("serial")
static public class InvalidHashException extends RuntimeException {
public InvalidHashException(String message) {
@@ -139,7 +67,7 @@ public class PasswordStorage {
// These constants may be changed without breaking existing hashes.
public static final int SALT_BYTE_SIZE = 24;
public static final int HASH_BYTE_SIZE = 18;
- public static final int PBKDF2_ITERATIONS = 500; // TODO Try to increase this to >1000 on ARM64 if fast enough
+ public static final int PBKDF2_ITERATIONS = 1000;
// These constants define the encoding and may not be changed.
public static final int HASH_SECTIONS = 5;
@@ -269,11 +197,20 @@ public class PasswordStorage {
private static byte[] pbkdf2(char[] password, byte[] salt, int iterations, int bytes) {
try {
- return hashedPasswordCache.get(
- new CacheKey(password, salt, iterations, bytes)
+ LOG.fine("Cache miss, hashing password...") ;
+ PBEKeySpec spec = new PBEKeySpec(password, salt, iterations, bytes * 8);
+ SecretKeyFactory skf = SecretKeyFactory.getInstance(PBKDF2_ALGORITHM);
+ return skf.generateSecret(spec).getEncoded();
+ } catch (NoSuchAlgorithmException ex) {
+ throw new CannotPerformOperationException(
+ "Hash algorithm not supported.",
+ ex
+ );
+ } catch (InvalidKeySpecException ex) {
+ throw new CannotPerformOperationException(
+ "Invalid key spec.",
+ ex
);
- } catch (ExecutionException ex) {
- throw new RuntimeException(ex.getCause());
}
}
diff --git a/container/src/main/resources/org/openremote/container/persistence/schema/basicidentityprovider/V20171031_02__BasicIdentityProvider.sql b/container/src/main/resources/org/openremote/container/persistence/schema/basicidentityprovider/V20171031_02__BasicIdentityProvider.sql
index e0b5bba84..e03a9e267 100644
--- a/container/src/main/resources/org/openremote/container/persistence/schema/basicidentityprovider/V20171031_02__BasicIdentityProvider.sql
+++ b/container/src/main/resources/org/openremote/container/persistence/schema/basicidentityprovider/V20171031_02__BasicIdentityProvider.sql
@@ -1,10 +1,3 @@
-DROP SCHEMA IF EXISTS PUBLIC CASCADE;
-CREATE SCHEMA PUBLIC;
-
-drop table if exists PUBLIC.USER_ENTITY;
-drop table if exists PUBLIC.REALM_ATTRIBUTE;
-drop table if exists PUBLIC.REALM;
-
create table PUBLIC.REALM (
ID varchar(36) not null primary key,
NAME varchar(255) unique not null,
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
index bd1ed14bd..e96ab9e3f 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
@@ -19,27 +19,54 @@
*/
package org.openremote.manager.security;
+import org.hibernate.Session;
import org.openremote.container.Container;
import org.openremote.container.security.AuthContext;
import org.openremote.container.security.basic.BasicIdentityProvider;
+import org.openremote.container.security.basic.PasswordStorage;
import org.openremote.container.web.ClientRequestInfo;
import org.openremote.manager.persistence.ManagerPersistenceService;
-import org.openremote.model.Constants;
-import org.openremote.model.asset.Asset;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.query.UserQuery;
+import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.security.*;
+import org.openremote.model.util.TextUtil;
+import java.sql.PreparedStatement;
import java.util.List;
import java.util.Objects;
import java.util.Set;
+import java.util.UUID;
+import java.util.logging.Logger;
+
+import static org.openremote.model.Constants.MASTER_REALM;
public class ManagerBasicIdentityProvider extends BasicIdentityProvider implements ManagerIdentityProvider {
- final protected Tenant masterTenant = new Tenant(Constants.MASTER_REALM, Constants.MASTER_REALM, "Master", true);
+ private static final Logger LOG = Logger.getLogger(ManagerBasicIdentityProvider.class.getName());
+ final protected ManagerIdentityService identityService;
+ final protected String adminPassword;
public ManagerBasicIdentityProvider(Container container) {
super(container.getService(ManagerPersistenceService.class));
+ this.identityService = container.getService(ManagerIdentityService.class);
+ adminPassword = container.getConfig().getOrDefault(SETUP_ADMIN_PASSWORD, SETUP_ADMIN_PASSWORD_DEFAULT);
+ }
+
+ @Override
+ public void start() {
+ super.start();
+
+ // Create master tenant and admin user
+ if (!tenantExists(MASTER_REALM)) {
+ LOG.info("Creating master tenant and admin user");
+
+ createTenant(null, new Tenant(MASTER_REALM, MASTER_REALM, "Master", true));
+ User adminUser = new User();
+ adminUser.setFirstName("Admin");
+ adminUser.setLastName("User");
+ createUser(null, MASTER_REALM, adminUser, adminPassword);
+ }
}
@Override
@@ -49,62 +76,96 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
@Override
public User[] getUsers(ClientRequestInfo clientRequestInfo, String realm) {
- return new User[0];
+ return getUsers(new UserQuery().tenant(new TenantPredicate(realm)));
}
@Override
public User[] getUsers(List<String> userIds) {
- return new User[0];
+ return getUsers(new UserQuery().ids(userIds.toArray(new String[0])));
}
@Override
public User[] getUsers(UserQuery userQuery) {
- return new User[0];
+ return ManagerIdentityProvider.getUsersFromDb(persistenceService, userQuery);
}
@Override
public User getUser(ClientRequestInfo clientRequestInfo, String realm, String userId) {
- return null;
+ return ManagerIdentityProvider.getUserByIdFromDb(persistenceService, realm, userId);
}
@Override
- public User getUser(String realm, String userName) {
- return null;
+ public User getUser(String realm, String username) {
+ return ManagerIdentityProvider.getUserByUsernameFromDb(persistenceService, realm, username);
}
@Override
public void updateUser(ClientRequestInfo clientRequestInfo, String realm, String userId, User user) {
-
+ LOG.info("Updating user: " + user);
+ persistenceService.doTransaction(em -> em.merge(user));
}
@Override
- public void createUser(ClientRequestInfo clientRequestInfo, String realm, User user) {
+ public void createUser(ClientRequestInfo clientRequestInfo, String realm, User user, String password) {
+ if (!realm.equals(MASTER_REALM)) {
+ throw new UnsupportedOperationException("This provider does not support realms other than master");
+ }
+
+ if (TextUtil.isNullOrEmpty(password)) {
+ throw new IllegalStateException("Password must be specified for basic identity provider");
+ }
+ LOG.info("Creating user: " + user);
+ persistenceService.doTransaction(em -> em.unwrap(Session.class).doWork(connection -> {
+ String sql = "insert into PUBLIC.USER_ENTITY(ID, REALM_ID, USERNAME, PASSWORD, FIRST_NAME, LAST_NAME, EMAIL, ENABLED) values (?, ?, ?, ?, ?, ?, ?, ?)";
+ try (PreparedStatement st = connection.prepareStatement(sql)) {
+ st.setString(1, UUID.randomUUID().toString());
+ st.setString(2, MASTER_REALM); // For master REALM NAME and ID are the same
+ st.setString(3, user.getUsername());
+ st.setString(4, PasswordStorage.createHash(password));
+ st.setString(5, user.getFirstName());
+ st.setString(6, user.getLastName());
+ st.setString(7, user.getEmail());
+ st.setBoolean(8, user.getEnabled() != null ? user.getEnabled() : true);
+ st.executeUpdate();
+ }
+ }));
+ persistenceService.doTransaction(em -> em.merge(user));
}
@Override
public void deleteUser(ClientRequestInfo clientRequestInfo, String realm, String userId) {
-
+ LOG.info("Deleting user: " + userId);
+ persistenceService.doTransaction(em -> {
+ User user = em.find(User.class, userId);
+ if (user != null) {
+ em.remove(user);
+ } else {
+ LOG.info("Cannot delete user as ID not found: " + userId);
+ }
+ });
}
@Override
public void resetPassword(ClientRequestInfo clientRequestInfo, String realm, String userId, Credential credential) {
-
+ throw new UnsupportedOperationException("This provider does not support password reset");
}
@Override
public Role[] getRoles(ClientRequestInfo clientRequestInfo, String realm, String userId) {
- return new Role[0];
+ return ClientRole.ALL_ROLES.stream()
+ .map(role -> new Role(UUID.randomUUID().toString(), role, false, true))
+ .toArray(Role[]::new);
}
@Override
public void updateRoles(ClientRequestInfo clientRequestInfo, String realm, String userId, Role[] roles) {
-
+ throw new UnsupportedOperationException("This provider does not support updating roles");
}
@Override
public boolean isMasterRealmAdmin(ClientRequestInfo clientRequestInfo, String userId) {
- return false;
+ return true;
}
@Override
@@ -114,23 +175,22 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
@Override
public boolean isUserInTenant(String userId, String realm) {
- return true;
+ return ManagerIdentityProvider.userInTenantFromDb(persistenceService, userId, realm);
}
@Override
public Tenant[] getTenants() {
- return new Tenant[]{masterTenant};
+ return ManagerIdentityProvider.getTenantsFromDb(persistenceService);
}
@Override
public Tenant getTenant(String realm) {
- return Objects.equals(realm, Constants.MASTER_REALM) ? masterTenant : null;
+ return ManagerIdentityProvider.getTenantFromDb(persistenceService, realm);
}
@Override
public void updateTenant(ClientRequestInfo clientRequestInfo, String realm, Tenant tenant) {
throw new UnsupportedOperationException("This provider does not support multiple tenants");
-
}
@Override
@@ -150,17 +210,17 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
@Override
public boolean isTenantActiveAndAccessible(AuthContext authContext, Tenant tenant) {
- return Objects.equals(tenant.getId(), Constants.MASTER_REALM);
+ return Objects.equals(tenant.getId(), MASTER_REALM);
}
@Override
public boolean isTenantActiveAndAccessible(AuthContext authContext, String realm) {
- return Objects.equals(realm, Constants.MASTER_REALM);
+ return Objects.equals(realm, MASTER_REALM);
}
@Override
public boolean tenantExists(String realm) {
- return Objects.equals(realm, Constants.MASTER_REALM);
+ return Objects.equals(realm, MASTER_REALM);
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
index e8caa02a7..05f05aa6e 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
@@ -19,23 +19,32 @@
*/
package org.openremote.manager.security;
+import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.security.AuthContext;
import org.openremote.container.security.IdentityProvider;
import org.openremote.container.web.ClientRequestInfo;
-import org.openremote.model.asset.Asset;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.query.UserQuery;
import org.openremote.model.security.*;
+import org.openremote.model.util.TextUtil;
-import java.io.IOException;
+import javax.persistence.TypedQuery;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.IntStream;
+import static org.openremote.model.Constants.MASTER_REALM;
+
+// TODO: Remove use of ClientRequestInfo and normalise interface for Basic and Keycloak providers
/**
* SPI for implementations used by {@link ManagerIdentityService}, provides CRUD of
* {@link User} and {@link Tenant}.
*/
public interface ManagerIdentityProvider extends IdentityProvider {
+ String SETUP_ADMIN_PASSWORD = "SETUP_ADMIN_PASSWORD";
+ String SETUP_ADMIN_PASSWORD_DEFAULT = "secret";
+
User[] getUsers(ClientRequestInfo clientRequestInfo, String realm);
User[] getUsers(List<String> userIds);
@@ -44,11 +53,11 @@ public interface ManagerIdentityProvider extends IdentityProvider {
User getUser(ClientRequestInfo clientRequestInfo, String realm, String userId);
- User getUser(String realm, String userName);
+ User getUser(String realm, String username);
void updateUser(ClientRequestInfo clientRequestInfo, String realm, String userId, User user);
- void createUser(ClientRequestInfo clientRequestInfo, String realm, User user);
+ void createUser(ClientRequestInfo clientRequestInfo, String realm, User user, String password);
void deleteUser(ClientRequestInfo clientRequestInfo, String realm, String userId);
@@ -89,4 +98,138 @@ public interface ManagerIdentityProvider extends IdentityProvider {
* @return <code>true</code> if the authenticated party can subscribe to events with the given filter.
*/
boolean canSubscribeWith(AuthContext auth, TenantFilter filter, ClientRole... requiredRoles);
+
+
+ /*
+ * BELOW ARE STATIC HELPER METHODS
+ */
+
+ static User[] getUsersFromDb(PersistenceService persistenceService, UserQuery userQuery) {
+ StringBuilder sb = new StringBuilder();
+ List<Object> parameters = new ArrayList<>();
+
+ // BUILD SELECT
+ sb.append("SELECT DISTINCT(u)");
+
+ // BUILD FROM
+ sb.append(" FROM User u");
+ if (userQuery.assetPredicate != null || userQuery.pathPredicate != null) {
+ sb.append(" join UserAsset ua on ua.id.userId = u.id");
+ }
+
+ // BUILD WHERE
+ sb.append(" WHERE 1=1");
+ if (userQuery.tenantPredicate != null && !TextUtil.isNullOrEmpty(userQuery.tenantPredicate.realm)) {
+ sb.append(" AND u.realm = ?").append(parameters.size() + 1);
+ parameters.add(userQuery.tenantPredicate.realm);
+ }
+ if (userQuery.assetPredicate != null) {
+ sb.append(" AND ua.id.assetId = ?").append(parameters.size() + 1);
+ parameters.add(userQuery.assetPredicate.id);
+ }
+ if (userQuery.pathPredicate != null) {
+ sb.append(" AND ?").append(parameters.size() + 1).append(" <@ get_asset_tree_path(ua.asset_id)");
+ parameters.add(userQuery.pathPredicate.path);
+ }
+ if (userQuery.ids != null && userQuery.ids.length > 0) {
+ sb.append(" AND u.id IN (?").append(parameters.size() + 1);
+ parameters.add(userQuery.ids[0]);
+
+ for (int i = 1; i < userQuery.ids.length; i++) {
+ sb.append(",?").append(parameters.size() + 1);
+ parameters.add(userQuery.ids[i]);
+ }
+ sb.append(")");
+ }
+ if (userQuery.usernames != null && userQuery.usernames.length > 0) {
+ sb.append(" AND u.username IN (?").append(parameters.size() + 1);
+ parameters.add(userQuery.usernames[0]);
+
+ for (int i = 1; i < userQuery.usernames.length; i++) {
+ sb.append(",?").append(parameters.size() + 1);
+ parameters.add(userQuery.usernames[i]);
+ }
+ sb.append(")");
+ }
+
+ // BUILD LIMIT
+ if (userQuery.limit > 0) {
+ sb.append(" LIMIT ").append(userQuery.limit);
+ }
+
+ return persistenceService.doReturningTransaction(entityManager -> {
+ TypedQuery<User> query = entityManager.createQuery(sb.toString(), User.class);
+ IntStream.range(0, parameters.size()).forEach(i -> query.setParameter(i + 1, parameters.get(i)));
+ List<User> users = query.getResultList();
+ return users.toArray(new User[users.size()]);
+ });
+ }
+
+ static User getUserByUsernameFromDb(PersistenceService persistenceService, String realm, String username) {
+ return persistenceService.doReturningTransaction(em -> {
+ List<User> result =
+ em.createQuery("select u from User u where u.realm = :realm and u.username = :username", User.class)
+ .setParameter("realm", realm)
+ .setParameter("username", username)
+ .getResultList();
+ return result.size() > 0 ? result.get(0) : null;
+ });
+ }
+
+ static User getUserByIdFromDb(PersistenceService persistenceService, String realm, String userId) {
+ return persistenceService.doReturningTransaction(em -> {
+ List<User> result =
+ em.createQuery("select u from User u where u.realm = :realm and u.id = :userId", User.class)
+ .setParameter("realm", realm)
+ .setParameter("userId", userId)
+ .getResultList();
+ return result.size() > 0 ? result.get(0) : null;
+ });
+ }
+
+ static Tenant[] getTenantsFromDb(PersistenceService persistenceService) {
+ return persistenceService.doReturningTransaction(entityManager -> {
+ List<Tenant> realms = entityManager.createQuery(
+ "select t from Tenant t where t.enabled = true and (t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now())"
+ , Tenant.class).getResultList();
+
+ // Make sure the master tenant is always on top
+ realms.sort((o1, o2) -> {
+ if (o1.getRealm().equals(MASTER_REALM))
+ return -1;
+ if (o2.getRealm().equals(MASTER_REALM))
+ return 1;
+ return o1.getRealm().compareTo(o2.getRealm());
+ });
+
+ return realms.toArray(new Tenant[realms.size()]);
+ });
+ }
+
+ static Tenant getTenantFromDb(PersistenceService persistenceService, String realm) {
+ return persistenceService.doReturningTransaction(em -> {
+ List<Tenant> tenants = em.createQuery("select t from Tenant t where t.realm = :realm and t.enabled = true and (t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now())", Tenant.class)
+ .setParameter("realm", realm).getResultList();
+ return tenants.size() == 1 ? tenants.get(0) : null;
+ }
+ );
+ }
+
+ static boolean tenantExistsFromDb(PersistenceService persistenceService, String realm) {
+ return persistenceService.doReturningTransaction(em -> {
+
+ long count = em.createQuery(
+ "select count(t) from Tenant t where t.realm = :realm and t.enabled = true and (t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now())",
+ Long.class).setParameter("realm", realm).getSingleResult();
+
+ return count > 0;
+ });
+ }
+
+ static boolean userInTenantFromDb(PersistenceService persistenceService, String userId, String realm) {
+ return persistenceService.doReturningTransaction(em -> {
+ User user = em.find(User.class, userId);
+ return (user != null && realm.equals(user.getRealm()));
+ });
+ }
}
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 56d61e8db..749f25ceb 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -41,10 +41,10 @@ import org.openremote.model.Constants;
import org.openremote.model.asset.AssetTreeModifiedEvent;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.query.UserQuery;
+import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.security.*;
import org.openremote.model.util.TextUtil;
-import javax.persistence.TypedQuery;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
@@ -53,7 +53,6 @@ import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.stream.IntStream;
import static org.openremote.container.util.JsonUtil.convert;
import static org.openremote.container.web.WebClient.getTarget;
@@ -104,120 +103,27 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public User[] getUsers(ClientRequestInfo clientRequestInfo, String realm) {
- List<UserRepresentation> userRepresentations =
- getRealms(clientRequestInfo)
- .realm(realm).users().search(null, 0, Integer.MAX_VALUE);
- List<User> users = new ArrayList<>();
- for (UserRepresentation userRepresentation : userRepresentations) {
- users.add(convertUser(realm, userRepresentation));
- }
- return users.toArray(new User[users.size()]);
+ return getUsers(new UserQuery().tenant(new TenantPredicate(realm)));
}
@Override
public User[] getUsers(List<String> userIds) {
- return persistenceService.doReturningTransaction(em -> {
- List<User> result =
- em.createQuery("select u from User u where u.id IN :userIds", User.class)
- .setParameter("userIds", userIds)
- .getResultList();
-
- return result.toArray(new User[result.size()]);
- });
+ return getUsers(new UserQuery().ids(userIds.toArray(new String[0])));
}
@Override
public User[] getUsers(UserQuery userQuery) {
-
- LOG.fine("Building: " + userQuery);
- StringBuilder sb = new StringBuilder();
- List<Object> parameters = new ArrayList<>();
- sb.append(buildSelectString(userQuery));
- sb.append(buildFromString(userQuery));
- sb.append(buildWhereString(userQuery, parameters));
- sb.append(buildLimit(userQuery));
-
- return persistenceService.doReturningTransaction(entityManager -> {
- TypedQuery<User> query = entityManager.createQuery(sb.toString(), User.class);
- IntStream.range(0, parameters.size()).forEach(i -> query.setParameter(i + 1, parameters.get(i)));
- List<User> users = query.getResultList();
- return users.toArray(new User[users.size()]);
- });
- }
-
- protected String buildSelectString(UserQuery query) {
- return "SELECT DISTINCT(u)";
- }
-
- protected String buildFromString(UserQuery query) {
- StringBuilder sb = new StringBuilder();
-
- sb.append(" FROM User u");
-
- if (query.assetPredicate != null || query.pathPredicate != null) {
- sb.append(" join UserAsset ua on ua.id.userId = u.id");
- }
-
- return sb.toString();
- }
-
- protected String buildWhereString(UserQuery query, List<Object> parameters) {
- StringBuilder sb = new StringBuilder();
-
- sb.append(" WHERE 1=1");
-
- if (query.tenantPredicate != null && !TextUtil.isNullOrEmpty(query.tenantPredicate.realm)) {
- sb.append(" AND u.realm = ?").append(parameters.size() + 1);
- parameters.add(query.tenantPredicate.realm);
- }
- if (query.assetPredicate != null) {
- sb.append(" AND ua.id.assetId = ?").append(parameters.size() + 1);
- parameters.add(query.assetPredicate.id);
- }
- if (query.pathPredicate != null) {
- sb.append(" AND ?").append(parameters.size() + 1).append(" <@ get_asset_tree_path(ua.asset_id)");
- parameters.add(query.pathPredicate.path);
- }
- if (query.ids != null && query.ids.length > 0) {
- sb.append(" AND u.id IN (?").append(parameters.size() + 1);
- parameters.add(query.ids[0]);
-
- for (int i = 1; i < query.ids.length; i++) {
- sb.append(",?").append(parameters.size() + 1);
- parameters.add(query.ids[i]);
- }
- sb.append(")");
- }
-
- return sb.toString();
- }
-
- protected String buildLimit(UserQuery userQuery) {
- if (userQuery.limit > 0) {
- return " LIMIT " + userQuery.limit;
- }
- return "";
+ return ManagerIdentityProvider.getUsersFromDb(persistenceService, userQuery);
}
@Override
public User getUser(ClientRequestInfo clientRequestInfo, String realm, String userId) {
- return convertUser(
- realm,
- getRealms(clientRequestInfo)
- .realm(realm).users().get(userId).toRepresentation()
- );
+ return ManagerIdentityProvider.getUserByIdFromDb(persistenceService, realm, userId);
}
@Override
- public User getUser(String realm, String userName) {
- return persistenceService.doReturningTransaction(em -> {
- List<User> result =
- em.createQuery("select u from User u where u.realm = :realm and u.username = :username", User.class)
- .setParameter("realm", realm)
- .setParameter("username", userName)
- .getResultList();
- return result.size() > 0 ? result.get(0) : null;
- });
+ public User getUser(String realm, String username) {
+ return ManagerIdentityProvider.getUserByUsernameFromDb(persistenceService, realm, username);
}
@Override
@@ -229,7 +135,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
}
@Override
- public void createUser(ClientRequestInfo clientRequestInfo, String realm, User user) {
+ public void createUser(ClientRequestInfo clientRequestInfo, String realm, User user, String password) {
Response response = getRealms(clientRequestInfo)
.realm(realm).users().create(
convert(Container.JSON, UserRepresentation.class, user)
@@ -296,7 +202,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
));
}
- return roles.toArray(new Role[roles.size()]);
+ return roles.toArray(new Role[0]);
}
@Override
@@ -340,33 +246,12 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public Tenant[] getTenants() {
-
- return persistenceService.doReturningTransaction(entityManager -> {
- List<Tenant> realms = entityManager.createQuery(
- "select t from Tenant t where t.enabled = true and (t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now())"
- , Tenant.class).getResultList();
-
- // Make sure the master tenant is always on top
- realms.sort((o1, o2) -> {
- if (o1.getRealm().equals(MASTER_REALM))
- return -1;
- if (o2.getRealm().equals(MASTER_REALM))
- return 1;
- return o1.getRealm().compareTo(o2.getRealm());
- });
-
- return realms.toArray(new Tenant[realms.size()]);
- });
+ return ManagerIdentityProvider.getTenantsFromDb(persistenceService);
}
@Override
public Tenant getTenant(String realm) {
- return persistenceService.doReturningTransaction(em -> {
- List<Tenant> tenants = em.createQuery("select t from Tenant t where t.realm = :realm and t.enabled = true and (t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now())", Tenant.class)
- .setParameter("realm", realm).getResultList();
- return tenants.size() == 1 ? tenants.get(0) : null;
- }
- );
+ return ManagerIdentityProvider.getTenantFromDb(persistenceService, realm);
}
@Override
@@ -428,14 +313,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public boolean tenantExists(String realm) {
- return persistenceService.doReturningTransaction(em -> {
-
- long count = em.createQuery(
- "select count(t) from Tenant t where t.realm = :realm and t.enabled = true and (t.notBefore is null or t.notBefore = 0 or to_timestamp(t.notBefore) <= now())",
- Long.class).setParameter("realm", realm).getSingleResult();
-
- return count > 0;
- });
+ return ManagerIdentityProvider.tenantExistsFromDb(persistenceService, realm);
}
@Override
@@ -446,10 +324,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public boolean isUserInTenant(String userId, String realm) {
- return persistenceService.doReturningTransaction(em -> {
- User user = em.find(User.class, userId);
- return (user != null && realm.equals(user.getRealm()));
- });
+ return ManagerIdentityProvider.userInTenantFromDb(persistenceService, userId, realm);
}
@Override
@@ -575,7 +450,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
}
}
- protected User convertUser(String realm, UserRepresentation userRepresentation) {
+ public static User convertUser(String realm, UserRepresentation userRepresentation) {
User user = convert(Container.JSON, User.class, userRepresentation);
user.setRealm(realm);
return user;
diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
index 54e96584d..eb18bd0cf 100644
--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
@@ -113,8 +113,8 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
try {
identityService.getIdentityProvider().createUser(
- new ClientRequestInfo(getClientRemoteAddress(), requestParams.getBearerAuth()), realm, user
- );
+ new ClientRequestInfo(getClientRemoteAddress(), requestParams.getBearerAuth()), realm, user,
+ null);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (WebApplicationException ex) {
diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
index 5e543058e..b8db33e9e 100644
--- a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
@@ -35,12 +35,12 @@ import static org.openremote.container.security.IdentityService.IDENTITY_NETWORK
import static org.openremote.container.security.IdentityService.IDENTITY_NETWORK_HOST_DEFAULT;
import static org.openremote.container.util.MapAccess.getBoolean;
import static org.openremote.container.util.MapAccess.getInteger;
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD;
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT;
import static org.openremote.model.Constants.*;
public abstract class AbstractKeycloakSetup implements Setup {
- public static final String SETUP_ADMIN_PASSWORD = "SETUP_ADMIN_PASSWORD";
- public static final String SETUP_ADMIN_PASSWORD_DEFAULT = "secret";
public static final String SETUP_EMAIL_FROM_KEYCLOAK = "SETUP_EMAIL_FROM_KEYCLOAK";
public static final String SETUP_EMAIL_FROM_KEYCLOAK_DEFAULT = "no-reply@";
diff --git a/manager/src/main/java/org/openremote/manager/setup/SetupService.java b/manager/src/main/java/org/openremote/manager/setup/SetupService.java
index 8b516e8c0..cefc8bc7b 100644
--- a/manager/src/main/java/org/openremote/manager/setup/SetupService.java
+++ b/manager/src/main/java/org/openremote/manager/setup/SetupService.java
@@ -21,6 +21,7 @@ package org.openremote.manager.setup;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
+import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.security.IdentityService;
import org.openremote.container.timer.TimerService;
import org.openremote.manager.setup.builtin.BuiltinSetupTasks;
@@ -33,7 +34,7 @@ import java.util.logging.Logger;
/**
* Executes setup tasks for a clean installation when the application starts.
* <p>
- * This service is disabled when {@link AbstractSetupTasks#SETUP_WIPE_CLEAN_INSTALL} is <code>false</code>.
+ * This service is disabled when {@link PersistenceService#SETUP_WIPE_CLEAN_INSTALL} is <code>false</code>.
* <p>
* First, this service will load an implementation of {@link SetupTasks} from the
* classpath using {@link ServiceLoader}. If multiple providers are found, an error
@@ -52,14 +53,16 @@ public class SetupService implements ContainerService {
@Override
public int getPriority() {
- return IdentityService.PRIORITY + 10; // Start just after identity service so we know what tasks to run
+ return IdentityService.PRIORITY + 10; // Start just after identity service
}
@Override
public void init(Container container) throws Exception {
- if (!SetupTasks.isSetupWipeCleanInstall(container)) {
- LOG.info("Setup service disabled, " + SetupTasks.SETUP_WIPE_CLEAN_INSTALL + "=false");
+ boolean isClean = container.getService(PersistenceService.class).isSetupWipeCleanInstall();
+
+ if (!isClean) {
+ LOG.info("Setup service disabled, " + PersistenceService.SETUP_WIPE_CLEAN_INSTALL + "=false");
return;
}
diff --git a/manager/src/main/java/org/openremote/manager/setup/SetupTasks.java b/manager/src/main/java/org/openremote/manager/setup/SetupTasks.java
index 0455874dd..af17ea21a 100644
--- a/manager/src/main/java/org/openremote/manager/setup/SetupTasks.java
+++ b/manager/src/main/java/org/openremote/manager/setup/SetupTasks.java
@@ -64,17 +64,13 @@ import static org.openremote.container.util.MapAccess.getBoolean;
*/
public interface SetupTasks {
- String SETUP_WIPE_CLEAN_INSTALL = "SETUP_WIPE_CLEAN_INSTALL";
+
String SETUP_IMPORT_DEMO_USERS = "SETUP_IMPORT_DEMO_USERS";
String SETUP_IMPORT_DEMO_ASSETS = "SETUP_IMPORT_DEMO_ASSETS";
String SETUP_IMPORT_DEMO_RULES = "SETUP_IMPORT_DEMO_RULES";
String SETUP_IMPORT_DEMO_SCENES = "SETUP_IMPORT_DEMO_SCENES";
String SETUP_IMPORT_DEMO_AGENT = "SETUP_IMPORT_DEMO_AGENT";
- static boolean isSetupWipeCleanInstall(Container container) {
- return getBoolean(container.getConfig(), SETUP_WIPE_CLEAN_INSTALL, container.isDevMode());
- }
-
static boolean isImportDemoUsers(Container container) {
return isImportDemoAssets(container)
|| getBoolean(container.getConfig(), SETUP_IMPORT_DEMO_USERS, container.isDevMode());
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/BasicIdentityDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/BasicIdentityDemoSetup.java
deleted file mode 100644
index e69db5615..000000000
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/BasicIdentityDemoSetup.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2016, 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.setup.builtin;
-
-import org.hibernate.Session;
-import org.openremote.container.Container;
-import org.openremote.container.security.basic.PasswordStorage;
-import org.openremote.container.util.UniqueIdentifierGenerator;
-import org.openremote.manager.persistence.ManagerPersistenceService;
-import org.openremote.manager.security.ManagerIdentityService;
-import org.openremote.manager.setup.Setup;
-import org.openremote.model.security.Tenant;
-import org.openremote.model.Constants;
-
-import java.sql.PreparedStatement;
-
-/**
- * We have the following demo users:
- * <ul>
- * <li><code>admin</code> - The superuser in the "master" realm with all access</li>
- * </ul>
- */
-public class BasicIdentityDemoSetup implements Setup {
-
- public static final String SETUP_ADMIN_PASSWORD = "SETUP_ADMIN_PASSWORD";
- public static final String SETUP_ADMIN_PASSWORD_DEFAULT = "secret";
-
- final protected ManagerPersistenceService persistenceService;
- final protected ManagerIdentityService identityService;
- final protected String demoAdminPassword;
-
- public Tenant masterTenant;
-
- public BasicIdentityDemoSetup(Container container) {
- this.persistenceService = container.getService(ManagerPersistenceService.class);
- this.identityService = container.getService(ManagerIdentityService.class);
-
- this.demoAdminPassword = container.getConfig().getOrDefault(SETUP_ADMIN_PASSWORD, SETUP_ADMIN_PASSWORD_DEFAULT);
- }
-
- @Override
- public void onStart() throws Exception {
-
- // Tenants
- masterTenant = identityService.getIdentityProvider().getTenant(Constants.MASTER_REALM);
-
- // Users
-
-
- persistenceService.doTransaction(em -> em.unwrap(Session.class).doWork(connection -> {
- String sql = "insert into PUBLIC.USER_ENTITY(ID, REALM_ID, USERNAME, PASSWORD, ENABLED) values (?, 'master', 'admin', ?, true)";
- try (PreparedStatement st = connection.prepareStatement(sql)) {
- st.setString(1, UniqueIdentifierGenerator.generateId());
- st.setString(2, PasswordStorage.createHash(demoAdminPassword));
- st.executeUpdate();
- }
- }));
-
- }
-}
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/BuiltinSetupTasks.java b/manager/src/main/java/org/openremote/manager/setup/builtin/BuiltinSetupTasks.java
index 46f1077b1..d8c65739c 100644
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/BuiltinSetupTasks.java
+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/BuiltinSetupTasks.java
@@ -38,7 +38,7 @@ public class BuiltinSetupTasks extends AbstractSetupTasks {
// Basic vs Keycloak identity provider
if (container.getService(ManagerIdentityService.class).isKeycloakEnabled()) {
- addTask(new ManagerCleanSetup(container));
+ // Keycloak is not managed by persistence service so need separate clean task
addTask(new KeycloakCleanSetup(container));
addTask(new KeycloakInitSetup(container));
if (isImportDemoUsers(container)) {
@@ -55,11 +55,7 @@ public class BuiltinSetupTasks extends AbstractSetupTasks {
addTask(new ManagerDemoAgentSetup(container));
}
} else {
- addTask(new ManagerCleanSetup(container));
addTask(new BasicIdentityInitSetup(container));
- if (isImportDemoUsers(container)) {
- addTask(new BasicIdentityDemoSetup(container));
- }
}
return getTasks();
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerCleanSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerCleanSetup.java
deleted file mode 100644
index 21cf953a3..000000000
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerCleanSetup.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2016, 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.setup.builtin;
-
-import org.openremote.container.Container;
-import org.openremote.manager.persistence.ManagerPersistenceService;
-import org.openremote.manager.setup.AbstractManagerSetup;
-
-public class ManagerCleanSetup extends AbstractManagerSetup {
-
- final protected ManagerPersistenceService persistenceService;
-
- public ManagerCleanSetup(Container container) {
- super(container);
- this.persistenceService = container.getService(ManagerPersistenceService.class);
- }
-
- @Override
- public void onInit() throws Exception {
- persistenceService.setForceClean(true);
- }
-}
\ No newline at end of file
diff --git a/model/src/main/java/org/openremote/model/query/UserQuery.java b/model/src/main/java/org/openremote/model/query/UserQuery.java
index 095874005..2b8e00ee7 100644
--- a/model/src/main/java/org/openremote/model/query/UserQuery.java
+++ b/model/src/main/java/org/openremote/model/query/UserQuery.java
@@ -14,6 +14,7 @@ public class UserQuery {
public UserAssetPredicate assetPredicate;
public PathPredicate pathPredicate;
public String[] ids;
+ public String[] usernames;
public int limit;
public UserQuery() {
@@ -39,6 +40,11 @@ public class UserQuery {
return this;
}
+ public UserQuery usernames(String...usernames) {
+ this.usernames = usernames;
+ return this;
+ }
+
public UserQuery limit(int limit) {
this.limit = limit;
return this;
@@ -51,6 +57,7 @@ public class UserQuery {
", assetPredicate=" + assetPredicate +
", pathPredicate=" + pathPredicate +
", ids=" + (ids != null ? Arrays.toString(ids) : "null") +
+ ", usernames=" + (usernames != null ? Arrays.toString(usernames) : "null") +
", limit=" + limit +
'}';
}
diff --git a/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy b/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
index c471d5e8c..96410c965 100644
--- a/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
@@ -34,8 +34,8 @@ import spock.lang.Specification
import spock.util.concurrent.PollingConditions
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
class AdminTenantsActivityTest extends Specification implements ManagerContainerTrait, GwtClientTrait {
diff --git a/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy b/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy
index ca53cf308..1b932c838 100644
--- a/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/admin/AdminUsersActivityTest.groovy
@@ -39,8 +39,8 @@ import spock.util.concurrent.BlockingVariables
import spock.util.concurrent.PollingConditions
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
class AdminUsersActivityTest extends Specification implements ManagerContainerTrait, GwtClientTrait {
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetBrowserPresenterTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetBrowserPresenterTest.groovy
index 382b85688..b63ab0d3c 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetBrowserPresenterTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetBrowserPresenterTest.groovy
@@ -33,8 +33,8 @@ import spock.util.concurrent.PollingConditions
import static org.openremote.container.util.MapAccess.getString
import static org.openremote.manager.event.ClientEventService.WEBSOCKET_EVENTS
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
class AssetBrowserPresenterTest extends Specification implements ManagerContainerTrait, GwtClientTrait {
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy
index 02e6cabbe..50a5ed1c7 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy
@@ -16,8 +16,8 @@ import spock.util.concurrent.PollingConditions
import javax.ws.rs.WebApplicationException
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
class AssetIntegrityTest extends Specification implements ManagerContainerTrait {
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
index dfeaa0716..31b4bfc31 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
@@ -22,8 +22,8 @@ import spock.util.concurrent.PollingConditions
import javax.ws.rs.WebApplicationException
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.attribute.MetaItemType.*
import static org.openremote.model.attribute.AttributeValueType.BOOLEAN
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
index 8d83644af..11d707691 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
@@ -13,8 +13,8 @@ import spock.lang.Specification
import javax.ws.rs.WebApplicationException
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
class AssetUserLinkingTest extends Specification implements ManagerContainerTrait {
diff --git a/test/src/test/groovy/org/openremote/test/event/ClientEventTest.groovy b/test/src/test/groovy/org/openremote/test/event/ClientEventTest.groovy
index c404b8055..73a5d02ca 100644
--- a/test/src/test/groovy/org/openremote/test/event/ClientEventTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/event/ClientEventTest.groovy
@@ -44,8 +44,8 @@ import spock.util.concurrent.PollingConditions
import static org.openremote.container.util.MapAccess.getString
import static org.openremote.manager.event.ClientEventService.CLIENT_EVENT_QUEUE
import static org.openremote.manager.event.ClientEventService.WEBSOCKET_EVENTS
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.attribute.MetaItem.isMetaNameEqualTo
diff --git a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
index 89055f473..1aef5513e 100644
--- a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
@@ -40,8 +40,8 @@ import java.util.stream.Collectors
import java.util.stream.IntStream
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.util.TextUtil.isNullOrEmpty
diff --git a/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy b/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy
index 590b35ec9..f3c0a31d9 100644
--- a/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/map/MapResourceTest.groovy
@@ -6,7 +6,7 @@ import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.*
+import static org.openremote.manager.security.ManagerIdentityProvider.*
import static org.openremote.model.Constants.*
class MapResourceTest extends Specification implements ManagerContainerTrait {
diff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
index 73b704d6a..941bec426 100644
--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
@@ -33,8 +33,8 @@ import java.time.temporal.ChronoUnit
import java.util.concurrent.TimeUnit
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.notification.PushNotificationAction.writeAttributeValueAction
import static org.openremote.model.value.Values.parse
diff --git a/test/src/test/groovy/org/openremote/test/protocol/KNXImportTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/KNXImportTest.groovy
index d95193f5e..c5ac1f798 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/KNXImportTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/KNXImportTest.groovy
@@ -23,8 +23,8 @@ import org.openremote.model.asset.Asset
import spock.lang.Ignore
import static org.openremote.model.Constants.*
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.container.util.MapAccess.getString
import org.openremote.agent.protocol.knx.KNXProtocol
diff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
index 1734e4f7a..a97e39d0e 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
@@ -46,8 +46,8 @@ import javax.ws.rs.client.ClientRequestFilter
import javax.ws.rs.core.*
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.asset.agent.ProtocolConfiguration.initProtocolConfiguration
diff --git a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy
index 25d1ef054..b365f3302 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/velbus/VelbusProtocolTest.groovy
@@ -28,8 +28,8 @@ import spock.lang.Specification
import spock.util.concurrent.PollingConditions
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.asset.agent.ProtocolConfiguration.initProtocolConfiguration
diff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy
index 5dbd8627e..e0412bf2b 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy
@@ -53,8 +53,8 @@ import javax.ws.rs.core.MediaType
import javax.ws.rs.core.Response
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID
import static org.openremote.model.Constants.MASTER_REALM_ADMIN_USER
import static org.openremote.model.asset.agent.ProtocolConfiguration.initProtocolConfiguration
diff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy
index e7fc1cbf4..262ebd00b 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy
@@ -41,8 +41,8 @@ import spock.lang.Specification
import spock.util.concurrent.PollingConditions
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID
import static org.openremote.model.Constants.MASTER_REALM_ADMIN_USER
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
index f10046fc4..52c8246db 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
@@ -20,8 +20,8 @@ import spock.util.concurrent.PollingConditions
import static org.openremote.container.util.MapAccess.getString
import static org.openremote.model.rules.RulesetStatus.*
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.rules.Ruleset.Lang.GROOVY
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
index 564fd4697..4835773c0 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
@@ -17,8 +17,8 @@ import spock.util.concurrent.PollingConditions
import javax.ws.rs.WebApplicationException
import static org.openremote.container.util.MapAccess.getString
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD
-import static org.openremote.manager.setup.AbstractKeycloakSetup.SETUP_ADMIN_PASSWORD_DEFAULT
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD
+import static org.openremote.manager.security.ManagerIdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
import static org.openremote.model.Constants.*
import static org.openremote.model.rules.Ruleset.Lang.GROOVY
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy
index 918ba650d..025ec9346 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/FlowRulesTest.groovy
@@ -77,5 +77,8 @@ class FlowRulesTest extends Specification implements ManagerContainerTrait {
println(bedroomTargetTemp)
assert bedroomTargetTemp.intValue() == (startTemperature.intValue() + 10) : ("it was actually " + bedroomTargetTemp.intValue())//convert to int considering floating point inaccuracy
}
+
+ cleanup: "the container is stopped"
+ container.stop()
}
}