You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/05/13 12:13:00 UTC

[syncope] 01/02: [SYNCOPE-1460] Checking domain removal

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 3a9ed4e4fdee40979c3fb08c4a6e83137d296857
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon May 13 14:06:58 2019 +0200

    [SYNCOPE-1460] Checking domain removal
---
 .../common/keymaster/client/api/DomainWatcher.java |  4 +-
 .../client/zookeper/ZookeeperDomainOps.java        |  5 +-
 .../client/zookeper/LoggingDomainWatcher.java      |  9 ++-
 .../core/persistence/api/DomainRegistry.java       |  2 +
 .../core/persistence/api/SyncopeCoreLoader.java    |  9 +++
 .../core/persistence/jpa/DomainConfFactory.java    | 54 +++++++++++++-
 .../core/persistence/jpa/RuntimeDomainLoader.java  | 33 +++++++--
 .../jpa/spring/CommonEntityManagerFactoryConf.java |  4 --
 .../jpa/spring/DomainEntityManagerFactoryBean.java |  2 +-
 .../core/provisioning/java/job/JobManagerImpl.java | 29 ++++++++
 .../core/provisioning/java/job/TaskJob.java        | 50 +++++++------
 .../UsernamePasswordAuthenticationProvider.java    | 40 ++++++-----
 .../org/apache/syncope/core/logic/DomainLogic.java |  4 +-
 ext/self-keymaster/rest-cxf/pom.xml                | 24 +------
 .../self/keymaster/cxf/SelfKeymasterContext.java   | 17 ++---
 .../cxf/SelfKeymasterExceptionMapper.java          | 83 ----------------------
 16 files changed, 197 insertions(+), 172 deletions(-)

diff --git a/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/DomainWatcher.java b/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/DomainWatcher.java
index e850202..627fe0b 100644
--- a/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/DomainWatcher.java
+++ b/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/DomainWatcher.java
@@ -25,5 +25,7 @@ import org.apache.syncope.common.keymaster.client.api.model.Domain;
  */
 public interface DomainWatcher {
 
-    void process(Domain domain);
+    void added(Domain domain);
+
+    void removed(String domain);
 }
diff --git a/common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeper/ZookeeperDomainOps.java b/common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeper/ZookeeperDomainOps.java
index fd04051..2ff4726 100644
--- a/common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeper/ZookeeperDomainOps.java
+++ b/common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeper/ZookeeperDomainOps.java
@@ -67,9 +67,9 @@ public class ZookeeperDomainOps implements DomainOps, InitializingBean {
                         LOG.debug("Domain {} added", event.getData().getPath());
                         try {
                             Domain domain = MAPPER.readValue(event.getData().getData(), Domain.class);
-                            
+
                             LOG.info("Domain {} created", domain.getKey());
-                            watcher.process(domain);
+                            watcher.added(domain);
                         } catch (IOException e) {
                             LOG.debug("Could not parse {}", new String(event.getData().getData()), e);
                         }
@@ -81,6 +81,7 @@ public class ZookeeperDomainOps implements DomainOps, InitializingBean {
 
                     case NODE_REMOVED:
                         LOG.debug("Domain {} removed", event.getData().getPath());
+                        watcher.removed(StringUtils.substringAfter(event.getData().getPath(), DOMAIN_PATH + "/"));
                         break;
 
                     default:
diff --git a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeper/LoggingDomainWatcher.java b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeper/LoggingDomainWatcher.java
index f340f35..330798b 100644
--- a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeper/LoggingDomainWatcher.java
+++ b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeper/LoggingDomainWatcher.java
@@ -28,7 +28,12 @@ public class LoggingDomainWatcher implements DomainWatcher {
     private static final Logger LOG = LoggerFactory.getLogger(LoggingDomainWatcher.class);
 
     @Override
-    public void process(final Domain domain) {
-        LOG.info("Domain {} created", domain);
+    public void added(final Domain domain) {
+        LOG.info("Domain {} added", domain);
+    }
+
+    @Override
+    public void removed(final String domain) {
+        LOG.info("Domain {} removed", domain);
     }
 }
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/DomainRegistry.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/DomainRegistry.java
index 3d7e656..59189e8 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/DomainRegistry.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/DomainRegistry.java
@@ -26,4 +26,6 @@ import org.apache.syncope.common.keymaster.client.api.model.Domain;
 public interface DomainRegistry {
 
     void register(Domain req);
+
+    void unregister(String domain);
 }
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/SyncopeCoreLoader.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/SyncopeCoreLoader.java
index a5debbb..00e0260 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/SyncopeCoreLoader.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/SyncopeCoreLoader.java
@@ -39,4 +39,13 @@ public interface SyncopeCoreLoader extends Ordered {
     default void load(String domain, DataSource datasource) {
         // nothing to do        
     }
+
+    /**
+     * Perform closing operations on the given domain.
+     *
+     * @param domain domain to unload
+     */
+    default void unload(String domain) {
+        // nothing to do        
+    }
 }
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/DomainConfFactory.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/DomainConfFactory.java
index e0eeab1..68a6982 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/DomainConfFactory.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/DomainConfFactory.java
@@ -23,6 +23,7 @@ import com.zaxxer.hikari.HikariDataSource;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
+import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import org.apache.syncope.common.keymaster.client.api.model.Domain;
 import org.apache.syncope.core.persistence.jpa.spring.DomainEntityManagerFactoryBean;
@@ -42,10 +43,14 @@ import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter;
 import org.springframework.stereotype.Component;
 import org.apache.syncope.core.persistence.api.DomainRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component
 public class DomainConfFactory implements DomainRegistry, EnvironmentAware {
 
+    private static final Logger LOG = LoggerFactory.getLogger(DomainConfFactory.class);
+
     private Environment env;
 
     @Override
@@ -53,17 +58,25 @@ public class DomainConfFactory implements DomainRegistry, EnvironmentAware {
         this.env = env;
     }
 
-    private void registerSingleton(final String name, final Object bean) {
+    private void unregisterSingleton(final String name) {
         if (ApplicationContextProvider.getBeanFactory().containsSingleton(name)) {
             ApplicationContextProvider.getBeanFactory().destroySingleton(name);
         }
+    }
+
+    private void registerSingleton(final String name, final Object bean) {
+        unregisterSingleton(name);
         ApplicationContextProvider.getBeanFactory().registerSingleton(name, bean);
     }
 
-    private void registerBeanDefinition(final String name, final BeanDefinition beanDefinition) {
+    private void unregisterBeanDefinition(final String name) {
         if (ApplicationContextProvider.getBeanFactory().containsBeanDefinition(name)) {
             ApplicationContextProvider.getBeanFactory().removeBeanDefinition(name);
         }
+    }
+
+    private void registerBeanDefinition(final String name, final BeanDefinition beanDefinition) {
+        unregisterBeanDefinition(name);
         ApplicationContextProvider.getBeanFactory().registerBeanDefinition(name, beanDefinition);
     }
 
@@ -98,7 +111,6 @@ public class DomainConfFactory implements DomainRegistry, EnvironmentAware {
         databasePopulator.setIgnoreFailedDrops(true);
         databasePopulator.setSqlScriptEncoding(StandardCharsets.UTF_8.name());
         databasePopulator.addScript(new ClassPathResource("/audit/" + domain.getAuditSql()));
-
         registerSingleton(domain.getKey().toLowerCase() + "ResourceDatabasePopulator", databasePopulator);
 
         // domainDataSourceInitializer
@@ -148,4 +160,40 @@ public class DomainConfFactory implements DomainRegistry, EnvironmentAware {
                         addConstructorArgValue(domain.getKeymasterConfParams().getBytes()).
                         getBeanDefinition());
     }
+
+    @Override
+    public void unregister(final String domain) {
+        // domainKeymasterConfParamsJSON
+        unregisterSingleton(domain + "KeymasterConfParamsJSON");
+        unregisterBeanDefinition(domain + "KeymasterConfParamsJSON");
+
+        // domainContentXML
+        unregisterSingleton(domain + "ContentXML");
+        unregisterBeanDefinition(domain + "ContentXML");
+
+        // domainEntityManagerFactory
+        try {
+            EntityManagerFactory emf = ApplicationContextProvider.getBeanFactory().
+                    getBean(domain + "EntityManagerFactory", EntityManagerFactory.class);
+            emf.close();
+        } catch (Exception e) {
+            LOG.error("Could not close EntityManagerFactory for Domain {}", domain, e);
+        }
+        unregisterSingleton(domain + "EntityManagerFactory");
+        unregisterBeanDefinition(domain + "EntityManagerFactory");
+
+        // domainTransactionManager
+        unregisterSingleton(domain + "TransactionManager");
+        unregisterBeanDefinition(domain + "TransactionManager");
+
+        // domainDataSourceInitializer
+        unregisterSingleton(domain.toLowerCase() + "DataSourceInitializer");
+
+        // domainResourceDatabasePopulator
+        unregisterSingleton(domain.toLowerCase() + "ResourceDatabasePopulator");
+
+        // domainDataSource
+        unregisterSingleton(domain + "DataSource");
+        unregisterBeanDefinition(domain + "DataSource");
+    }
 }
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/RuntimeDomainLoader.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/RuntimeDomainLoader.java
index 901980e..ffc258d 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/RuntimeDomainLoader.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/RuntimeDomainLoader.java
@@ -43,11 +43,11 @@ public class RuntimeDomainLoader implements DomainWatcher {
     private DomainRegistry domainRegistry;
 
     @Override
-    public void process(final Domain domain) {
+    public void added(final Domain domain) {
         if (domainHolder.getDomains().containsKey(domain.getKey())) {
             LOG.debug("Domain {} already inited, skipping", domain.getKey());
         } else {
-            LOG.info("Domain {} initialization", domain.getKey());
+            LOG.info("Domain {} registration", domain.getKey());
 
             domainRegistry.register(domain);
 
@@ -56,14 +56,37 @@ public class RuntimeDomainLoader implements DomainWatcher {
                     forEach(loader -> {
                         String loaderName = AopUtils.getTargetClass(loader).getName();
 
-                        loader.load();
-
                         LOG.debug("[{}] Starting on domain '{}'", loaderName, domain);
                         loader.load(domain.getKey(), domainHolder.getDomains().get(domain.getKey()));
                         LOG.debug("[{}] Completed on domain '{}'", loaderName, domain);
                     });
 
-            LOG.info("Domain {} successfully inited", domain.getKey());
+            LOG.info("Domain {} successfully deployed", domain.getKey());
+        }
+    }
+
+    @Override
+    public void removed(final String domain) {
+        if (domainHolder.getDomains().containsKey(domain)) {
+            LOG.info("Domain {} unregistration", domain);
+
+            ApplicationContextProvider.getApplicationContext().getBeansOfType(SyncopeCoreLoader.class).values().
+                    stream().sorted(Comparator.comparing(SyncopeCoreLoader::getOrder).reversed()).
+                    forEach(loader -> {
+                        String loaderName = AopUtils.getTargetClass(loader).getName();
+
+                        LOG.debug("[{}] Starting on domain '{}'", loaderName, domain);
+                        loader.unload(domain);
+                        LOG.debug("[{}] Completed on domain '{}'", loaderName, domain);
+                    });
+
+            domainRegistry.unregister(domain);
+
+            domainHolder.getDomains().remove(domain);
+
+            LOG.info("Domain {} successfully undeployed", domain);
+        } else {
+            LOG.debug("Domain {} not inited, skipping", domain);
         }
     }
 }
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java
index 536a367..35a014c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java
@@ -42,10 +42,6 @@ public class CommonEntityManagerFactoryConf implements DomainHolder {
 
     private final Map<String, Object> jpaPropertyMap = new HashMap<>();
 
-    public void addDomain(final String domain, final DataSource datasource) {
-        this.domains.put(domain, datasource);
-    }
-
     @Override
     public Map<String, DataSource> getDomains() {
         return domains;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainEntityManagerFactoryBean.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainEntityManagerFactoryBean.java
index e7ae681..dc9623a 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainEntityManagerFactoryBean.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainEntityManagerFactoryBean.java
@@ -41,6 +41,6 @@ public class DomainEntityManagerFactoryBean extends LocalContainerEntityManagerF
             super.setPersistenceUnitPostProcessors(commonEMFConf.getPersistenceUnitPostProcessors());
         }
 
-        commonEMFConf.addDomain(this.getPersistenceUnitName(), this.getDataSource());
+        commonEMFConf.getDomains().put(this.getPersistenceUnitName(), this.getDataSource());
     }
 }
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/JobManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/JobManagerImpl.java
index 8ea7a40..4d09755 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/JobManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/JobManagerImpl.java
@@ -403,4 +403,33 @@ public class JobManagerImpl implements JobManager, SyncopeCoreLoader {
             }
         }
     }
+
+    @Override
+    public void unload(final String domain) {
+        AuthContextUtils.callAsAdmin(domain, () -> {
+            // 1. jobs for SchedTasks
+            Set<SchedTask> tasks = new HashSet<>(taskDAO.<SchedTask>findAll(TaskType.SCHEDULED));
+            tasks.addAll(taskDAO.<PullTask>findAll(TaskType.PULL));
+            tasks.addAll(taskDAO.<PushTask>findAll(TaskType.PUSH));
+
+            tasks.forEach(task -> {
+                try {
+                    unregister(task);
+                } catch (Exception e) {
+                    LOG.error("While unloading job instance for task " + task.getKey(), e);
+                }
+            });
+
+            // 2. jobs for Reports
+            reportDAO.findAll().forEach(report -> {
+                try {
+                    unregister(report);
+                } catch (Exception e) {
+                    LOG.error("While unloading job instance for report " + report.getName(), e);
+                }
+            });
+
+            return null;
+        });
+    }
 }
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java
index 5cf13e5..2596a13 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.core.provisioning.java.job;
 
+import org.apache.syncope.core.persistence.api.DomainHolder;
 import org.apache.syncope.core.persistence.api.dao.ImplementationDAO;
 import org.apache.syncope.core.persistence.api.entity.Implementation;
 import org.apache.syncope.core.provisioning.api.job.JobDelegate;
@@ -30,6 +31,7 @@ import org.apache.syncope.core.provisioning.api.job.JobManager;
 import org.apache.syncope.core.spring.ImplementationManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 public class TaskJob extends AbstractInterruptableJob {
 
@@ -49,6 +51,9 @@ public class TaskJob extends AbstractInterruptableJob {
 
     }
 
+    @Autowired
+    private DomainHolder domainHolder;
+
     /**
      * Key, set by the caller, for identifying the task to be executed.
      */
@@ -73,29 +78,34 @@ public class TaskJob extends AbstractInterruptableJob {
     @Override
     public void execute(final JobExecutionContext context) throws JobExecutionException {
         try {
-            AuthContextUtils.callAsAdmin(context.getMergedJobDataMap().getString(JobManager.DOMAIN_KEY), () -> {
-                try {
-                    ImplementationDAO implementationDAO =
-                            ApplicationContextProvider.getApplicationContext().getBean(ImplementationDAO.class);
-                    Implementation implementation = implementationDAO.find(
-                            context.getMergedJobDataMap().getString(DELEGATE_IMPLEMENTATION));
-                    if (implementation == null) {
-                        LOG.error("Could not find Implementation '{}', aborting",
+            String domain = context.getMergedJobDataMap().getString(JobManager.DOMAIN_KEY);
+            if (domainHolder.getDomains().containsKey(domain)) {
+                AuthContextUtils.callAsAdmin(domain, () -> {
+                    try {
+                        ImplementationDAO implementationDAO =
+                                ApplicationContextProvider.getApplicationContext().getBean(ImplementationDAO.class);
+                        Implementation implementation = implementationDAO.find(
                                 context.getMergedJobDataMap().getString(DELEGATE_IMPLEMENTATION));
-                    } else {
-                        delegate = ImplementationManager.<SchedTaskJobDelegate>build(implementation);
-                        delegate.execute(
-                                taskKey,
-                                context.getMergedJobDataMap().getBoolean(DRY_RUN_JOBDETAIL_KEY),
-                                context);
+                        if (implementation == null) {
+                            LOG.error("Could not find Implementation '{}', aborting",
+                                    context.getMergedJobDataMap().getString(DELEGATE_IMPLEMENTATION));
+                        } else {
+                            delegate = ImplementationManager.<SchedTaskJobDelegate>build(implementation);
+                            delegate.execute(
+                                    taskKey,
+                                    context.getMergedJobDataMap().getBoolean(DRY_RUN_JOBDETAIL_KEY),
+                                    context);
+                        }
+                    } catch (Exception e) {
+                        LOG.error("While executing task {}", taskKey, e);
+                        throw new RuntimeException(e);
                     }
-                } catch (Exception e) {
-                    LOG.error("While executing task {}", taskKey, e);
-                    throw new RuntimeException(e);
-                }
 
-                return null;
-            });
+                    return null;
+                });
+            } else {
+                LOG.debug("Domain {} not found, skipping", domain);
+            }
         } catch (RuntimeException e) {
             LOG.error("While executing task {}", taskKey, e);
             throw new JobExecutionException("While executing task " + taskKey, e);
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/UsernamePasswordAuthenticationProvider.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/UsernamePasswordAuthenticationProvider.java
index a54691c..862340c 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/UsernamePasswordAuthenticationProvider.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/UsernamePasswordAuthenticationProvider.java
@@ -28,6 +28,7 @@ import org.apache.syncope.common.lib.SyncopeConstants;
 import org.apache.syncope.common.lib.types.AuditElements;
 import org.apache.syncope.common.lib.types.AuditElements.Result;
 import org.apache.syncope.common.lib.types.CipherAlgorithm;
+import org.apache.syncope.core.persistence.api.dao.NotFoundException;
 import org.apache.syncope.core.persistence.api.entity.user.User;
 import org.apache.syncope.core.provisioning.api.UserProvisioningManager;
 import org.slf4j.Logger;
@@ -96,7 +97,20 @@ public class UsernamePasswordAuthenticationProvider implements AuthenticationPro
 
     @Override
     public Authentication authenticate(final Authentication authentication) {
-        String domain = SyncopeAuthenticationDetails.class.cast(authentication.getDetails()).getDomain();
+        Domain domain;
+        if (SyncopeConstants.MASTER_DOMAIN.equals(
+                SyncopeAuthenticationDetails.class.cast(authentication.getDetails()).getDomain())) {
+
+            domain = new Domain.Builder(SyncopeConstants.MASTER_DOMAIN).build();
+        } else {
+            try {
+                domain = domainOps.read(
+                        SyncopeAuthenticationDetails.class.cast(authentication.getDetails()).getDomain());
+            } catch (NotFoundException | KeymasterException e) {
+                throw new BadCredentialsException("Could not find domain "
+                        + SyncopeAuthenticationDetails.class.cast(authentication.getDetails()).getDomain(), e);
+            }
+        }
 
         String[] username = new String[1];
         boolean authenticated;
@@ -107,33 +121,27 @@ public class UsernamePasswordAuthenticationProvider implements AuthenticationPro
             authenticated = authentication.getCredentials().toString().equals(anonymousKey);
         } else if (adminUser.equals(authentication.getName())) {
             username[0] = adminUser;
-            if (SyncopeConstants.MASTER_DOMAIN.equals(domain)) {
+            if (SyncopeConstants.MASTER_DOMAIN.equals(domain.getKey())) {
                 credentialChecker.checkIsDefaultAdminPasswordInUse();
                 authenticated = ENCRYPTOR.verify(
                         authentication.getCredentials().toString(),
                         CipherAlgorithm.valueOf(adminPasswordAlgorithm),
                         adminPassword);
             } else {
-                try {
-                    Domain domainObj = domainOps.read(domain);
-                    authenticated = ENCRYPTOR.verify(
-                            authentication.getCredentials().toString(),
-                            domainObj.getAdminCipherAlgorithm(),
-                            domainObj.getAdminPassword());
-                } catch (KeymasterException e) {
-                    LOG.error("While attempting to read domain {}", domain, e);
-                    authenticated = false;
-                }
+                authenticated = ENCRYPTOR.verify(
+                        authentication.getCredentials().toString(),
+                        domain.getAdminCipherAlgorithm(),
+                        domain.getAdminPassword());
             }
         } else {
-            Pair<User, Boolean> authResult = AuthContextUtils.callAsAdmin(domain,
-                    () -> dataAccessor.authenticate(domain, authentication));
+            Pair<User, Boolean> authResult = AuthContextUtils.callAsAdmin(domain.getKey(),
+                    () -> dataAccessor.authenticate(domain.getKey(), authentication));
             authenticated = BooleanUtils.toBoolean(authResult.getRight());
             if (authResult.getLeft() != null && authResult.getRight() != null) {
                 username[0] = authResult.getLeft().getUsername();
 
                 if (!authResult.getRight()) {
-                    AuthContextUtils.callAsAdmin(domain, () -> {
+                    AuthContextUtils.callAsAdmin(domain.getKey(), () -> {
                         provisioningManager.internalSuspend(authResult.getLeft().getKey());
                         return null;
                     });
@@ -144,7 +152,7 @@ public class UsernamePasswordAuthenticationProvider implements AuthenticationPro
             username[0] = authentication.getPrincipal().toString();
         }
 
-        return finalizeAuthentication(authenticated, domain, username[0], authentication);
+        return finalizeAuthentication(authenticated, domain.getKey(), username[0], authentication);
     }
 
     protected Authentication finalizeAuthentication(
diff --git a/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/DomainLogic.java b/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/DomainLogic.java
index 585ecf7..789f39d 100644
--- a/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/DomainLogic.java
+++ b/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/DomainLogic.java
@@ -74,7 +74,7 @@ public class DomainLogic extends AbstractTransactionalLogic<EntityTO> {
         domainEntity.set(domain);
         domainEntity = domainDAO.save(domainEntity);
 
-        domainWatcher.process(domain);
+        domainWatcher.added(domain);
 
         return domainEntity.get();
     }
@@ -110,6 +110,8 @@ public class DomainLogic extends AbstractTransactionalLogic<EntityTO> {
     @PreAuthorize("@environment.getProperty('keymaster.username') == authentication.name and not(isAnonymous())")
     public void delete(final String key) {
         domainDAO.delete(key);
+
+        domainWatcher.removed(key);
     }
 
     @Override
diff --git a/ext/self-keymaster/rest-cxf/pom.xml b/ext/self-keymaster/rest-cxf/pom.xml
index 0066010..0526e52 100644
--- a/ext/self-keymaster/rest-cxf/pom.xml
+++ b/ext/self-keymaster/rest-cxf/pom.xml
@@ -39,27 +39,9 @@ under the License.
 
   <dependencies>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-service-description</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-afterburner</artifactId>
+      <groupId>org.apache.syncope.core.idrepo</groupId>
+      <artifactId>syncope-core-idrepo-rest-cxf</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
diff --git a/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/SelfKeymasterContext.java b/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/SelfKeymasterContext.java
index 9088a83..f7671eb 100644
--- a/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/SelfKeymasterContext.java
+++ b/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/SelfKeymasterContext.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.ext.self.keymaster.cxf;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import java.util.Arrays;
 import java.util.Collections;
 import javax.annotation.Resource;
@@ -33,6 +33,7 @@ import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
 import org.apache.syncope.common.keymaster.client.api.ConfParamOps;
 import org.apache.syncope.common.keymaster.client.api.DomainOps;
 import org.apache.syncope.common.keymaster.client.api.ServiceOps;
+import org.apache.syncope.core.rest.cxf.RestServiceExceptionMapper;
 import org.apache.syncope.core.spring.security.UsernamePasswordAuthenticationProvider;
 import org.apache.syncope.core.spring.security.WebSecurityContext;
 import org.apache.syncope.ext.self.keymaster.cxf.client.SelfKeymasterInternalConfParamOps;
@@ -66,16 +67,6 @@ public class SelfKeymasterContext {
     private String version;
 
     @Bean
-    public JacksonJsonProvider selfKeymasterJacksonJsonProvider() {
-        return new JacksonJsonProvider();
-    }
-
-    @Bean
-    public SelfKeymasterExceptionMapper selfKeymasterExceptionMapper() {
-        return new SelfKeymasterExceptionMapper();
-    }
-
-    @Bean
     public WadlGenerator selfKeymasterWADLGenerator() {
         WadlGenerator wadlGenerator = new WadlGenerator();
         wadlGenerator.setApplicationTitle("Apache Syncope Self Keymaster " + version);
@@ -109,8 +100,8 @@ public class SelfKeymasterContext {
                 ctx.getBean(JAXRSBeanValidationOutInterceptor.class)));
 
         selfKeymasterContainer.setProviders(Arrays.asList(
-                selfKeymasterJacksonJsonProvider(),
-                selfKeymasterExceptionMapper(),
+                ctx.getBean(RestServiceExceptionMapper.class),
+                ctx.getBean(JacksonJaxbJsonProvider.class),
                 selfKeymasterWADLGenerator()));
 
         selfKeymasterContainer.setApplicationContext(ctx);
diff --git a/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/SelfKeymasterExceptionMapper.java b/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/SelfKeymasterExceptionMapper.java
deleted file mode 100644
index 6415f50..0000000
--- a/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/SelfKeymasterExceptionMapper.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.ext.self.keymaster.cxf;
-
-import javax.validation.ValidationException;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.syncope.common.keymaster.client.api.KeymasterException;
-import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.types.ClientExceptionType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.access.AccessDeniedException;
-
-@Provider
-public class SelfKeymasterExceptionMapper implements ExceptionMapper<Exception> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(SelfKeymasterExceptionMapper.class);
-
-    @Override
-    public Response toResponse(final Exception ex) {
-        LOG.error("Exception thrown", ex);
-
-        ResponseBuilder builder = null;
-
-        if (ex instanceof AccessDeniedException
-                || ex instanceof ForbiddenException
-                || ex instanceof NotAuthorizedException) {
-
-            // leaves the default exception processing
-            builder = null;
-        } else if (ex instanceof NotFoundException) {
-            builder = Response.status(Response.Status.NOT_FOUND).
-                    entity(ExceptionUtils.getRootCauseMessage(ex));
-        } else if (ex instanceof KeymasterException) {
-            builder = Response.status(Response.Status.BAD_REQUEST).
-                    entity(ExceptionUtils.getRootCauseMessage(ex));
-        } else if (ex instanceof SyncopeClientException) {
-            SyncopeClientException sce = (SyncopeClientException) ex;
-            builder = builder(sce.getType(), ExceptionUtils.getRootCauseMessage(ex));
-        } else {
-            // process JAX-RS validation errors
-            if (ex instanceof ValidationException) {
-                builder = builder(ClientExceptionType.RESTValidation, ExceptionUtils.getRootCauseMessage(ex));
-            }
-            // ...or just report as InternalServerError
-            if (builder == null) {
-                builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-                        entity(ExceptionUtils.getRootCauseMessage(ex));
-            }
-        }
-
-        return builder == null ? null : builder.build();
-    }
-
-    private ResponseBuilder builder(final ClientExceptionType type, final String msg) {
-        ResponseBuilder builder = Response.status(type.getResponseStatus());
-
-        return builder.entity(msg);
-    }
-}