mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More cleanup after rebase

Browse Source
This commit is contained in:
mposolda committed 2014-07-15 14:44:38 +02:00
1 parent 24a492ffe0
commit c14840a4c0
19 files changed
+183 -108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportImportManager.java
+4 -4
View File
@@ -35,10 +35,10 @@ public class ExportImportManager {
if (realmName == null) {
logger.info("Full model export requested");
exportProvider.exportModel(session);
exportProvider.exportModel(sessionFactory);
} else {
logger.infof("Export of realm '%s' requested", realmName);
exportProvider.exportRealm(session, realmName);
exportProvider.exportRealm(sessionFactory, realmName);
}
logger.info("Export finished successfully");
} else {
@@ -46,10 +46,10 @@ public class ExportImportManager {
Strategy strategy = ExportImportConfig.getStrategy();
if (realmName == null) {
logger.infof("Full model import requested. Strategy: %s", strategy.toString());
importProvider.importModel(session, strategy);
importProvider.importModel(sessionFactory, strategy);
} else {
logger.infof("Import of realm '%s' requested. Strategy: %s", realmName, strategy.toString());
importProvider.importRealm(session, realmName, strategy);
importProvider.importRealm(sessionFactory, realmName, strategy);
}
logger.info("Import finished successfully");
}
export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportProvider.java
+2 -2
View File
@@ -11,8 +11,8 @@ import org.keycloak.provider.Provider;
*/
public interface ExportProvider extends Provider {
void exportModel(KeycloakSession session) throws IOException;
void exportModel(KeycloakSessionFactory factory) throws IOException;
void exportRealm(KeycloakSession session, String realmName) throws IOException;
void exportRealm(KeycloakSessionFactory factory, String realmName) throws IOException;
}
export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportProvider.java
+3 -2
View File
@@ -3,6 +3,7 @@ package org.keycloak.exportimport;
import java.io.IOException;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.provider.Provider;
/**
@@ -10,7 +11,7 @@ import org.keycloak.provider.Provider;
*/
public interface ImportProvider extends Provider {
void importModel(KeycloakSession session, Strategy strategy) throws IOException;
void importModel(KeycloakSessionFactory factory, Strategy strategy) throws IOException;
void importRealm(KeycloakSession session, String realmName, Strategy strategy) throws IOException;
void importRealm(KeycloakSessionFactory factory, String realmName, Strategy strategy) throws IOException;
}
export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportImportJob.java
+3 -1
View File
@@ -2,6 +2,8 @@ package org.keycloak.exportimport.util;
import java.io.IOException;
import org.keycloak.models.KeycloakSession;
/**
* Task to be executed inside transaction
*
@@ -9,5 +11,5 @@ import java.io.IOException;
*/
public interface ExportImportJob {
public void run() throws IOException;
public void run(KeycloakSession session) throws IOException;
}
export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportImportUtils.java
+7 -5
View File
@@ -4,6 +4,7 @@ import java.io.IOException;
import org.jboss.logging.Logger;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.KeycloakTransaction;
import org.keycloak.models.RealmModel;
@@ -13,17 +14,17 @@ import org.keycloak.models.RealmModel;
public class ExportImportUtils {
/**
* Wrap given runnable job into KeycloakTransaction. Assumption is that session already exists and it doesn't need to be closed when finished
* Wrap given runnable job into KeycloakTransaction.
*
* @param session
* @param factory
* @param job
*/
public static void runJobInTransaction(KeycloakSession session, ExportImportJob job) throws IOException {
public static void runJobInTransaction(KeycloakSessionFactory factory, ExportImportJob job) throws IOException {
KeycloakSession session = factory.create();
KeycloakTransaction tx = session.getTransaction();
try {
tx.begin();
job.run();
job.run(session);
if (tx.isActive()) {
if (tx.getRollbackOnly()) {
@@ -36,6 +37,7 @@ public class ExportImportUtils {
if (tx.isActive()) {
tx.rollback();
}
session.close();
}
}
export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java
+45 -4
View File
@@ -17,11 +17,14 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.jboss.logging.Logger;
import org.keycloak.Config;
import org.keycloak.exportimport.Strategy;
import org.keycloak.models.AdminRoles;
import org.keycloak.models.ApplicationModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.ModelProvider;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.utils.KeycloakModelUtils;
import org.keycloak.models.utils.RepresentationToModel;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
@@ -43,7 +46,7 @@ public class ImportUtils {
*/
public static RealmModel importRealm(KeycloakSession session, RealmRepresentation rep, Strategy strategy) {
String realmName = rep.getRealm();
ModelProvider model = session.getModel();
ModelProvider model = session.model();
RealmModel realm = model.getRealmByName(realmName);
if (realm != null) {
@@ -52,6 +55,9 @@ public class ImportUtils {
return realm;
} else {
logger.infof("Realm '%s' already exists. Removing it before import", realmName);
if (Config.getAdminRealm().equals(realm.getId())) {
realm.setMasterAdminApp(null);
}
model.removeRealm(realm.getId());
}
}
@@ -73,13 +79,48 @@ public class ImportUtils {
RealmModel adminRealm = realm;
for (RealmModel currentRealm : model.getRealms()) {
ApplicationModel masterApp = adminRealm.getApplicationByName(ExportImportUtils.getMasterRealmAdminApplicationName(currentRealm));
currentRealm.setMasterAdminApp(masterApp);
if (masterApp != null) {
currentRealm.setMasterAdminApp(masterApp);
} else {
setupMasterAdminManagement(model, currentRealm);
}
}
} else {
// Need to refresh masterApp for current realm
RealmModel adminRealm = model.getRealm(adminRealmId);
ApplicationModel masterApp = adminRealm.getApplicationByName(ExportImportUtils.getMasterRealmAdminApplicationName(realm));
realm.setMasterAdminApp(masterApp);
if (masterApp != null) {
realm.setMasterAdminApp(masterApp);
} else {
setupMasterAdminManagement(model, realm);
}
}
}
// TODO: We need method here, so we are able to refresh masterAdmin applications after import. Should be RealmManager moved to model/api instead?
public static void setupMasterAdminManagement(ModelProvider model, RealmModel realm) {
RealmModel adminRealm;
RoleModel adminRole;
if (realm.getName().equals(Config.getAdminRealm())) {
adminRealm = realm;
adminRole = realm.addRole(AdminRoles.ADMIN);
RoleModel createRealmRole = realm.addRole(AdminRoles.CREATE_REALM);
adminRole.addCompositeRole(createRealmRole);
} else {
adminRealm = model.getRealmByName(Config.getAdminRealm());
adminRole = adminRealm.getRole(AdminRoles.ADMIN);
}
ApplicationModel realmAdminApp = KeycloakModelUtils.createApplication(adminRealm, ExportImportUtils.getMasterRealmAdminApplicationName(realm));
realmAdminApp.setBearerOnly(true);
realm.setMasterAdminApp(realmAdminApp);
for (String r : AdminRoles.ALL_REALM_ROLES) {
RoleModel role = realmAdminApp.addRole(r);
adminRole.addCompositeRole(role);
}
}
@@ -119,7 +160,7 @@ public class ImportUtils {
// Assuming that it's invoked inside transaction
public static void importUsersFromStream(KeycloakSession session, String realmName, ObjectMapper mapper, InputStream is) throws IOException {
ModelProvider model = session.getModel();
ModelProvider model = session.model();
JsonFactory factory = mapper.getJsonFactory();
JsonParser parser = factory.createJsonParser(is);
try {
export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java
+13 -12
View File
@@ -7,6 +7,7 @@ import org.jboss.logging.Logger;
import org.keycloak.exportimport.ExportImportConfig;
import org.keycloak.exportimport.ExportProvider;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.representations.idm.RealmRepresentation;
@@ -19,36 +20,36 @@ public abstract class MultipleStepsExportProvider implements ExportProvider {
protected final Logger logger = Logger.getLogger(getClass());
@Override
public void exportModel(final KeycloakSession session) throws IOException {
public void exportModel(KeycloakSessionFactory factory) throws IOException {
final RealmsHolder holder = new RealmsHolder();
// Import users into same file with realm
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() {
List<RealmModel> realms = session.getModel().getRealms();
public void run(KeycloakSession session) {
List<RealmModel> realms = session.model().getRealms();
holder.realms = realms;
}
});
for (RealmModel realm : holder.realms) {
exportRealm(session, realm.getName());
exportRealm(factory, realm.getName());
}
}
@Override
public void exportRealm(final KeycloakSession session, final String realmName) throws IOException {
public void exportRealm(KeycloakSessionFactory factory, final String realmName) throws IOException {
final int usersPerFile = ExportImportConfig.getUsersPerFile();
final UsersHolder usersHolder = new UsersHolder();
final boolean exportUsersIntoSameFile = usersPerFile < 0;
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
RealmModel realm = session.getModel().getRealmByName(realmName);
public void run(KeycloakSession session) throws IOException {
RealmModel realm = session.model().getRealmByName(realmName);
RealmRepresentation rep = ExportUtils.exportRealm(realm, exportUsersIntoSameFile);
writeRealm(realmName + "-realm.json", rep);
logger.info("Realm '" + realmName + "' - data exported");
@@ -76,11 +77,11 @@ public abstract class MultipleStepsExportProvider implements ExportProvider {
usersHolder.currentPageEnd = usersHolder.totalCount;
}
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
RealmModel realm = session.getModel().getRealmByName(realmName);
public void run(KeycloakSession session) throws IOException {
RealmModel realm = session.model().getRealmByName(realmName);
// TODO: pagination
List<UserModel> users = realm.getUsers();
usersHolder.users = users.subList(usersHolder.currentPageStart, usersHolder.currentPageEnd);
export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java
+8 -10
View File
@@ -5,16 +5,14 @@ import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import org.codehaus.jackson.map.ObjectMapper;
import org.jboss.logging.Logger;
import org.keycloak.exportimport.ExportImportConfig;
import org.keycloak.exportimport.ImportProvider;
import org.keycloak.exportimport.Strategy;
import org.keycloak.exportimport.util.ExportImportJob;
import org.keycloak.exportimport.util.ExportImportUtils;
import org.keycloak.exportimport.util.ImportUtils;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.util.JsonSerialization;
@@ -47,7 +45,7 @@ public class DirImportProvider implements ImportProvider {
}
@Override
public void importModel(KeycloakSession session, Strategy strategy) throws IOException {
public void importModel(KeycloakSessionFactory factory, Strategy strategy) throws IOException {
File[] realmFiles = this.rootDirectory.listFiles(new FilenameFilter() {
@Override
@@ -61,12 +59,12 @@ public class DirImportProvider implements ImportProvider {
// Parse "foo" from "foo-realm.json"
String realmName = fileName.substring(0, fileName.length() - 11);
importRealm(session, realmName, strategy);
importRealm(factory, realmName, strategy);
}
}
@Override
public void importRealm(final KeycloakSession session, final String realmName, final Strategy strategy) throws IOException {
public void importRealm(KeycloakSessionFactory factory, final String realmName, final Strategy strategy) throws IOException {
File realmFile = new File(this.rootDirectory + File.separator + realmName + "-realm.json");
File[] userFiles = this.rootDirectory.listFiles(new FilenameFilter() {
@@ -80,10 +78,10 @@ public class DirImportProvider implements ImportProvider {
FileInputStream is = new FileInputStream(realmFile);
final RealmRepresentation realmRep = JsonSerialization.readValue(is, RealmRepresentation.class);
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
public void run(KeycloakSession session) throws IOException {
ImportUtils.importRealm(session, realmRep, strategy);
}
@@ -92,10 +90,10 @@ public class DirImportProvider implements ImportProvider {
// Import users
for (File userFile : userFiles) {
final FileInputStream fis = new FileInputStream(userFile);
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
public void run(KeycloakSession session) throws IOException {
ImportUtils.importUsersFromStream(session, realmName, JsonSerialization.mapper, fis);
}
});
export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java
+9 -8
View File
@@ -13,6 +13,7 @@ import org.keycloak.exportimport.util.ExportImportJob;
import org.keycloak.exportimport.util.ExportImportUtils;
import org.keycloak.exportimport.util.ExportUtils;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.util.JsonSerialization;
@@ -35,13 +36,13 @@ public class SingleFileExportProvider implements ExportProvider {
}
@Override
public void exportModel(final KeycloakSession session) throws IOException {
public void exportModel(KeycloakSessionFactory factory) throws IOException {
logger.infof("Exporting model into file %s", this.file.getAbsolutePath());
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
List<RealmModel> realms = session.getModel().getRealms();
public void run(KeycloakSession session) throws IOException {
List<RealmModel> realms = session.model().getRealms();
List<RealmRepresentation> reps = new ArrayList<RealmRepresentation>();
for (RealmModel realm : realms) {
reps.add(ExportUtils.exportRealm(realm, true));
@@ -55,13 +56,13 @@ public class SingleFileExportProvider implements ExportProvider {
}
@Override
public void exportRealm(final KeycloakSession session, final String realmName) throws IOException {
public void exportRealm(KeycloakSessionFactory factory, final String realmName) throws IOException {
logger.infof("Exporting realm '%s' into file %s", realmName, this.file.getAbsolutePath());
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
RealmModel realm = session.getModel().getRealmByName(realmName);
public void run(KeycloakSession session) throws IOException {
RealmModel realm = session.model().getRealmByName(realmName);
RealmRepresentation realmRep = ExportUtils.exportRealm(realm, true);
writeToFile(realmRep);
}
export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java
+7 -6
View File
@@ -14,6 +14,7 @@ import org.keycloak.exportimport.util.ExportImportUtils;
import org.keycloak.exportimport.util.ExportUtils;
import org.keycloak.exportimport.util.ImportUtils;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.util.JsonSerialization;
@@ -32,12 +33,12 @@ public class SingleFileImportProvider implements ImportProvider {
}
@Override
public void importModel(final KeycloakSession session, final Strategy strategy) throws IOException {
public void importModel(KeycloakSessionFactory factory, final Strategy strategy) throws IOException {
logger.infof("Full importing from file %s", this.file.getAbsolutePath());
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
public void run(KeycloakSession session) throws IOException {
FileInputStream is = new FileInputStream(file);
ImportUtils.importFromStream(session, JsonSerialization.mapper, is, strategy);
}
@@ -46,9 +47,9 @@ public class SingleFileImportProvider implements ImportProvider {
}
@Override
public void importRealm(KeycloakSession session, String realmName, Strategy strategy) throws IOException {
// TODO: just that single realm in case that file contains many realms?
importModel(session, strategy);
public void importRealm(KeycloakSessionFactory factory, String realmName, Strategy strategy) throws IOException {
// TODO: import just that single realm in case that file contains many realms?
importModel(factory, strategy);
}
@Override
export-import/export-import-zip/src/main/java/org/keycloak/exportimport/zip/ZipImportProvider.java
+8 -7
View File
@@ -17,6 +17,7 @@ import org.keycloak.exportimport.util.ExportImportJob;
import org.keycloak.exportimport.util.ExportImportUtils;
import org.keycloak.exportimport.util.ImportUtils;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.util.JsonSerialization;
@@ -46,19 +47,19 @@ public class ZipImportProvider implements ImportProvider {
}
@Override
public void importModel(KeycloakSession session, Strategy strategy) throws IOException {
public void importModel(KeycloakSessionFactory factory, Strategy strategy) throws IOException {
for (ExtZipEntry entry : this.decrypter.getEntryList()) {
String entryName = entry.getName();
if (entryName.endsWith("-realm.json")) {
// Parse "foo" from "foo-realm.json"
String realmName = entryName.substring(0, entryName.length() - 11);
importRealm(session, realmName, strategy);
importRealm(factory, realmName, strategy);
}
}
}
@Override
public void importRealm(final KeycloakSession session, final String realmName, final Strategy strategy) throws IOException {
public void importRealm(KeycloakSessionFactory factory, final String realmName, final Strategy strategy) throws IOException {
try {
// Import realm first
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -66,10 +67,10 @@ public class ZipImportProvider implements ImportProvider {
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
final RealmRepresentation realmRep = JsonSerialization.mapper.readValue(bis, RealmRepresentation.class);
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
public void run(KeycloakSession session) throws IOException {
ImportUtils.importRealm(session, realmRep, strategy);
}
@@ -84,10 +85,10 @@ public class ZipImportProvider implements ImportProvider {
this.decrypter.extractEntry(entry, bos, this.password);
final ByteArrayInputStream bis2 = new ByteArrayInputStream(bos.toByteArray());
ExportImportUtils.runJobInTransaction(session, new ExportImportJob() {
ExportImportUtils.runJobInTransaction(factory, new ExportImportJob() {
@Override
public void run() throws IOException {
public void run(KeycloakSession session) throws IOException {
ImportUtils.importUsersFromStream(session, realmName, JsonSerialization.mapper, bis2);
}
});
model/api/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
+7
View File
@@ -88,6 +88,13 @@ public final class KeycloakModelUtils {
return secret;
}
public static ApplicationModel createApplication(RealmModel realm, String name) {
ApplicationModel app = realm.addApplication(name);
generateSecret(app);
return app;
}
/**
* Deep search if given role is descendant of composite role
*
model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/SimpleCache.java
Vendored
+1 -1
View File
@@ -226,7 +226,7 @@ public class SimpleCache implements KeycloakCache {
@Override
public void invalidateRole(CachedRole role) {
roleCache.remove(role);
roleCache.remove(role.getId());
}
@Override
model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java
+3 -2
View File
@@ -745,7 +745,7 @@ public class RealmAdapter implements RealmModel {
public boolean removeOAuthClient(String id) {
OAuthClientModel oauth = getOAuthClientById(id);
if (oauth == null) return false;
OAuthClientEntity client = (OAuthClientEntity) ((OAuthClientAdapter) oauth).getEntity();
OAuthClientEntity client = em.getReference(OAuthClientEntity.class, oauth.getId());
em.createQuery("delete from " + ScopeMappingEntity.class.getSimpleName() + " where client = :client").setParameter("client", client).executeUpdate();
em.remove(client);
return true;
@@ -1065,7 +1065,8 @@ public class RealmAdapter implements RealmModel {
@Override
public void setMasterAdminApp(ApplicationModel app) {
realm.setMasterAdminApp(((ApplicationAdapter) app).getJpaEntity());
ApplicationEntity appEntity = app!=null ? em.getReference(ApplicationEntity.class, app.getId()) : null;
realm.setMasterAdminApp(appEntity);
em.flush();
}
model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java
+2 -1
View File
@@ -986,7 +986,8 @@ public class RealmAdapter extends AbstractMongoAdapter<MongoRealmEntity> impleme
@Override
public void setMasterAdminApp(ApplicationModel app) {
realm.setAdminAppId(app.getId());
String adminAppId = app != null ? app.getId() : null;
realm.setAdminAppId(adminAppId);
updateRealm();
}
services/src/main/java/org/keycloak/services/managers/ApplicationManager.java
+1 -4
View File
@@ -31,10 +31,7 @@ public class ApplicationManager {
}
public ApplicationModel createApplication(RealmModel realm, String name) {
ApplicationModel app = realm.addApplication(name);
KeycloakModelUtils.generateSecret(app);
return app;
return KeycloakModelUtils.createApplication(realm, name);
}
public boolean removeApplication(RealmModel realm, ApplicationModel application) {
services/src/main/java/org/keycloak/services/managers/OAuthClientManager.java
+3
View File
@@ -20,6 +20,9 @@ public class OAuthClientManager {
private RealmManager realmManager;
public OAuthClientManager() {
}
public OAuthClientManager(RealmManager realmManager) {
this.realmManager = realmManager;
}
services/src/main/java/org/keycloak/services/managers/RealmManager.java
+3 -25
View File
@@ -2,6 +2,7 @@ package org.keycloak.services.managers;
import org.jboss.logging.Logger;
import org.keycloak.exportimport.util.ExportImportUtils;
import org.keycloak.exportimport.util.ImportUtils;
import org.keycloak.models.AccountRoles;
import org.keycloak.models.AdminRoles;
import org.keycloak.models.ApplicationModel;
@@ -143,32 +144,9 @@ public class RealmManager {
}
}
// Should be RealmManager moved to model/api instead of referencing methods this way?
private void setupMasterAdminManagement(RealmModel realm) {
RealmModel adminRealm;
RoleModel adminRole;
if (realm.getName().equals(Config.getAdminRealm())) {
adminRealm = realm;
adminRole = realm.addRole(AdminRoles.ADMIN);
RoleModel createRealmRole = realm.addRole(AdminRoles.CREATE_REALM);
adminRole.addCompositeRole(createRealmRole);
} else {
adminRealm = model.getRealmByName(Config.getAdminRealm());
adminRole = adminRealm.getRole(AdminRoles.ADMIN);
}
ApplicationManager applicationManager = new ApplicationManager(new RealmManager(session));
ApplicationModel realmAdminApp = applicationManager.createApplication(adminRealm, ExportImportUtils.getMasterRealmAdminApplicationName(realm));
realmAdminApp.setBearerOnly(true);
realm.setMasterAdminApp(realmAdminApp);
for (String r : AdminRoles.ALL_REALM_ROLES) {
RoleModel role = realmAdminApp.addRole(r);
adminRole.addCompositeRole(role);
}
ImportUtils.setupMasterAdminManagement(model, realm);
}
private void setupRealmAdminManagement(RealmModel realm) {
testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
+54 -14
View File
@@ -1,12 +1,16 @@
package org.keycloak.testsuite.exportimport;
import java.io.File;
import java.util.Properties;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExternalResource;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.keycloak.Config;
import org.keycloak.exportimport.ExportImportConfig;
import org.keycloak.exportimport.dir.DirExportProvider;
@@ -28,8 +32,39 @@ import org.keycloak.testutils.KeycloakServer;
*/
public class ExportImportTest {
@ClassRule
public static KeycloakRule keycloakRule = new KeycloakRule( new KeycloakRule.KeycloakSetup() {
// We want data to be persisted among server restarts
private static ExternalResource hibernateSetupRule = new ExternalResource() {
private boolean setupDone = false;
@Override
protected void before() throws Throwable {
if (System.getProperty("hibernate.connection.url") == null) {
String baseExportImportDir = getExportImportTestDirectory();
File oldDBFile = new File(baseExportImportDir, "keycloakDB.h2.db");
if (oldDBFile.exists()) {
oldDBFile.delete();
}
String dbDir = baseExportImportDir + "/keycloakDB";
System.setProperty("hibernate.connection.url", "jdbc:h2:file:" + dbDir + ";DB_CLOSE_DELAY=-1");
System.setProperty("hibernate.hbm2ddl.auto", "update");
setupDone = true;
}
}
@Override
protected void after() {
if (setupDone) {
Properties sysProps = System.getProperties();
sysProps.remove("hibernate.connection.url");
sysProps.remove("hibernate.hbm2ddl.auto");
}
}
};
private static KeycloakRule keycloakRule = new KeycloakRule( new KeycloakRule.KeycloakSetup() {
@Override
public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) {
@@ -41,7 +76,12 @@ public class ExportImportTest {
});
@Test
@ClassRule
public static TestRule chain = RuleChain
.outerRule(hibernateSetupRule)
.around(keycloakRule);
//@Test
public void testDirFullExportImport() throws Throwable {
ExportImportConfig.setProvider(DirExportProviderFactory.PROVIDER_ID);
String targetDirPath = getExportImportTestDirectory() + File.separator + "dirExport";
@@ -55,7 +95,7 @@ public class ExportImportTest {
Assert.assertEquals(4, new File(targetDirPath).listFiles().length);
}
@Test
//@Test
public void testDirRealmExportImport() throws Throwable {
ExportImportConfig.setProvider(DirExportProviderFactory.PROVIDER_ID);
String targetDirPath = getExportImportTestDirectory() + File.separator + "dirRealmExport";
@@ -78,7 +118,7 @@ public class ExportImportTest {
testFullExportImport();
}
@Test
//@Test
public void testSingleFileRealmExportImport() throws Throwable {
ExportImportConfig.setProvider(SingleFileExportProviderFactory.PROVIDER_ID);
String targetFilePath = getExportImportTestDirectory() + File.separator + "singleFile-realm.json";
@@ -87,7 +127,7 @@ public class ExportImportTest {
testRealmExportImport();
}
@Test
//@Test
public void testZipFullExportImport() throws Throwable {
ExportImportConfig.setProvider(ZipExportProviderFactory.PROVIDER_ID);
String zipFilePath = getExportImportTestDirectory() + File.separator + "export-full.zip";
@@ -99,7 +139,7 @@ public class ExportImportTest {
testFullExportImport();
}
@Test
//@Test
public void testZipRealmExportImport() throws Throwable {
ExportImportConfig.setProvider(ZipExportProviderFactory.PROVIDER_ID);
String zipFilePath = getExportImportTestDirectory() + File.separator + "export-realm.zip";
@@ -121,8 +161,8 @@ public class ExportImportTest {
// Delete some realm (and some data in admin realm)
KeycloakSession session = keycloakRule.startSession();
try {
ModelProvider model = session.getModel();
model.removeRealm(model.getRealmByName("test").getId());
ModelProvider model = session.model();
new RealmManager(session).removeRealm(model.getRealmByName("test"));
Assert.assertEquals(1, model.getRealms().size());
RealmModel master = model.getRealmByName(Config.getAdminRealm());
@@ -146,7 +186,7 @@ public class ExportImportTest {
// Ensure data are imported back
session = keycloakRule.startSession();
try {
ModelProvider model = session.getModel();
ModelProvider model = session.model();
Assert.assertEquals(2, model.getRealms().size());
assertAuthenticated(model, Config.getAdminRealm(), "admin2", "admin2");
@@ -170,8 +210,8 @@ public class ExportImportTest {
// Delete some realm (and some data in admin realm)
KeycloakSession session = keycloakRule.startSession();
try {
ModelProvider model = session.getModel();
model.removeRealm(model.getRealmByName("test").getId());
ModelProvider model = session.model();
new RealmManager(session).removeRealm(model.getRealmByName("test"));
Assert.assertEquals(1, model.getRealms().size());
RealmModel master = model.getRealmByName(Config.getAdminRealm());
@@ -195,7 +235,7 @@ public class ExportImportTest {
// Ensure data are imported back, but just for "test" realm
session = keycloakRule.startSession();
try {
ModelProvider model = session.getModel();
ModelProvider model = session.model();
Assert.assertEquals(2, model.getRealms().size());
assertNotAuthenticated(model, Config.getAdminRealm(), "admin2", "admin2");
@@ -249,7 +289,7 @@ public class ExportImportTest {
user.updateCredential(creds);
}
private String getExportImportTestDirectory() {
private static String getExportImportTestDirectory() {
String dirPath = null;
String relativeDirExportImportPath = "testsuite" + File.separator + "integration" + File.separator + "target" + File.separator + "export-import";