modifying scep utils

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml

@@ -70,6 +70,9 @@
                             org.bouncycastle.operator.jcajce,
                             org.bouncycastle.asn1.x500.style,
                             org.bouncycastle.pkcs,
+                            org.wso2.carbon.user.core.tenant,
+                            org.wso2.carbon.user.api,
+                            org.wso2.carbon.user.core.service,
                             <!--org.bouncycastle.openssl,-->
                             org.bouncycastle.util,
                             org.jscep.message,
@@ -171,6 +174,11 @@
             <artifactId>swagger-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.user.core</artifactId>
+            <version>4.4.3</version>
+        </dependency>
     </dependencies>
 
 </project>

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -16,8 +16,7 @@
  * under the License.
  */
 
-
+package org.wso2.carbon.certificate.mgt.core.scep;
-package org.wso2.carbon.device.mgt.core.scep;
 
 public class SCEPException extends Exception {
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -15,13 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.wso2.carbon.certificate.mgt.core.scep;
-
-package org.wso2.carbon.device.mgt.core.scep;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 
 public interface SCEPManager {
-
     TenantedDeviceWrapper getValidatedDevice(DeviceIdentifier deviceIdentifier) throws SCEPException;
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManagerImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -15,9 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.wso2.carbon.certificate.mgt.core.scep;
-
-package org.wso2.carbon.device.mgt.core.scep;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,7 +33,6 @@ import java.sql.SQLException;
 import java.util.HashMap;
 
 public class SCEPManagerImpl implements SCEPManager {
-
     private DeviceDAO deviceDAO;
     private static final Log log = LogFactory.getLog(SCEPManagerImpl.class);
 
@@ -45,14 +42,13 @@ public class SCEPManagerImpl implements SCEPManager {
 
     @Override
     public TenantedDeviceWrapper getValidatedDevice(DeviceIdentifier deviceIdentifier) throws SCEPException {
-
         TenantedDeviceWrapper tenantedDeviceWrapper = new TenantedDeviceWrapper();
         try {
             DeviceManagementDAOFactory.openConnection();
             HashMap<Integer, Device> deviceHashMap = deviceDAO.getDevice(deviceIdentifier);
             Object[] keySet = deviceHashMap.keySet().toArray();
 
-            if(keySet == null || keySet.length == 0) {
+            if (keySet == null || keySet.length == 0) {
                 throw new SCEPException("Lookup device not found for the device identifier");
             }
 
@@ -75,7 +71,6 @@ public class SCEPManagerImpl implements SCEPManager {
 
             String tenantDomain = realmService.getTenantManager().getDomain(tenantId);
             tenantedDeviceWrapper.setTenantDomain(tenantDomain);
-            
         } catch (SQLException e) {
             throw new SCEPException("Error occurred while getting the datasource connection.", e);
         } catch (DeviceManagementDAOException e) {

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/TenantedDeviceWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -15,15 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.wso2.carbon.certificate.mgt.core.scep;
-
-package org.wso2.carbon.device.mgt.core.scep;
 
 import org.wso2.carbon.device.mgt.common.Device;
 
 public class TenantedDeviceWrapper {
-
+    Device device;
-    private Device device;
     private int tenantId;
     private String tenantDomain;
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/SCEPManagerServiceComponent.java

@@ -1,60 +0,0 @@
-package org.wso2.carbon.device.mgt.core.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderService;
-import org.wso2.carbon.device.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.device.mgt.core.scep.SCEPManagerImpl;
-
-/**
- * @scr.component name="org.wso2.carbon.device.mgt.core.scep" immediate="true"
- * @scr.reference name="app.mgt.service"
- * interface="org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderService"
- * cardinality="1..1"
- * policy="dynamic"
- * bind="setApplicationManagementProviderService"
- * unbind="unsetApplicationManagementProviderService"
- */
-public class SCEPManagerServiceComponent {
-
-    private static final Log log = LogFactory.getLog(SCEPManagerServiceComponent.class);
-
-    protected void activate(ComponentContext componentContext) {
-
-        try {
-            if (log.isDebugEnabled()) {
-                log.debug("Initializing SCEP core bundle");
-            }
-
-            BundleContext bundleContext = componentContext.getBundleContext();
-            bundleContext.registerService(SCEPManager.class.getName(),
-                    new SCEPManagerImpl(), null);
-
-            if (log.isDebugEnabled()) {
-                log.debug("SCEP core bundle has been successfully initialized");
-            }
-        } catch (Throwable e) {
-            String msg = "Error occurred while initializing SCEP core bundle";
-            log.error(msg, e);
-        }
-    }
-
-    protected void deactivate(ComponentContext ctx) {
-        if (log.isDebugEnabled()) {
-            log.debug("Deactivating SCEP core bundle");
-        }
-    }
-
-    protected void unsetApplicationManagementProviderService(ApplicationManagementProviderService
-                                                                     applicationManagementProviderService) {
-        //do nothing
-    }
-
-    protected void setApplicationManagementProviderService(ApplicationManagementProviderService
-                                                                   applicationManagementProviderService) {
-        //do nothing
-    }
-
-}

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/AuthenticatorFrameworkDataHolder.java

@@ -18,8 +18,8 @@
  */
 package org.wso2.carbon.webapp.authenticator.framework;
 
+import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
 import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
-import org.wso2.carbon.device.mgt.core.scep.SCEPManager;
 import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService;
 import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
 import org.wso2.carbon.registry.indexing.service.TenantIndexingLoader;

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java

@@ -6,15 +6,15 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
 import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
+import org.wso2.carbon.certificate.mgt.core.scep.SCEPException;
+import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
+import org.wso2.carbon.certificate.mgt.core.scep.TenantedDeviceWrapper;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.core.scep.SCEPException;
-import org.wso2.carbon.device.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.device.mgt.core.scep.TenantedDeviceWrapper;
 import org.wso2.carbon.webapp.authenticator.framework.AuthenticationException;
-import org.wso2.carbon.webapp.authenticator.framework.AuthenticatorFrameworkDataHolder;
 import org.wso2.carbon.webapp.authenticator.framework.AuthenticationInfo;
+import org.wso2.carbon.webapp.authenticator.framework.AuthenticatorFrameworkDataHolder;
 import org.wso2.carbon.webapp.authenticator.framework.Utils.Utils;
 
 import java.security.cert.X509Certificate;

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java

@@ -1,215 +0,0 @@
-/*
- *   Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *   WSO2 Inc. 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.wso2.carbon.webapp.authenticator.framework.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
-import org.wso2.carbon.device.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService;
-import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
-import org.wso2.carbon.registry.indexing.service.TenantIndexingLoader;
-import org.wso2.carbon.tomcat.ext.valves.CarbonTomcatValve;
-import org.wso2.carbon.tomcat.ext.valves.TomcatValveContainer;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.webapp.authenticator.framework.AuthenticatorFrameworkDataHolder;
-import org.wso2.carbon.webapp.authenticator.framework.WebappAuthenticationValve;
-import org.wso2.carbon.webapp.authenticator.framework.WebappAuthenticatorRepository;
-import org.wso2.carbon.webapp.authenticator.framework.authenticator.WebappAuthenticator;
-import org.wso2.carbon.webapp.authenticator.framework.config.AuthenticatorConfig;
-import org.wso2.carbon.webapp.authenticator.framework.config.AuthenticatorConfigService;
-import org.wso2.carbon.webapp.authenticator.framework.config.WebappAuthenticatorConfig;
-import org.wso2.carbon.webapp.authenticator.framework.config.impl.AuthenticatorConfigServiceImpl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @scr.component name="org.wso2.carbon.webapp.authenticator" immediate="true"
- * @scr.reference name="user.realmservice.default"
- * interface="org.wso2.carbon.user.core.service.RealmService"
- * cardinality="1..1"
- * policy="dynamic"
- * bind="setRealmService"
- * unbind="unsetRealmService"
- * @scr.reference name="org.wso2.carbon.certificate.mgt"
- * interface="org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService"
- * policy="dynamic"
- * cardinality="1..n"
- * bind="setCertificateManagementService"
- * unbind="unsetCertificateManagementService"
- * @scr.reference name="org.wso2.carbon.device.mgt.core.scep"
- * interface="org.wso2.carbon.device.mgt.core.scep.SCEPManager"
- * policy="dynamic"
- * cardinality="1..n"
- * bind="setSCEPManagementService"
- * unbind="unsetSCEPManagementService"
- * @scr.reference name="identity.oauth2.validation.service"
- * interface="org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService"
- * cardinality="1..1"
- * policy="dynamic"
- * bind="setOAuth2ValidationService"
- * unbind="unsetOAuth2ValidationService"
- * @scr.reference name="tenant.indexloader"
- * interface="org.wso2.carbon.registry.indexing.service.TenantIndexingLoader"
- * cardinality="1..1"
- * policy="dynamic"
- * bind="setTenantIndexLoader"
- * unbind="unsetTenantIndexLoader"
- * @scr.reference name="tenant.registryloader"
- * interface="org.wso2.carbon.registry.core.service.TenantRegistryLoader"
- * cardinality="1..1" policy="dynamic"
- * bind="setTenantRegistryLoader"
- * unbind="unsetTenantRegistryLoader"
- */
-public class WebappAuthenticatorFrameworkServiceComponent {
-
-    private static final Log log = LogFactory.getLog(WebappAuthenticatorFrameworkServiceComponent.class);
-
-    @SuppressWarnings("unused")
-    protected void activate(ComponentContext componentContext) {
-        if (log.isDebugEnabled()) {
-            log.debug("Starting Web Application Authenticator Framework Bundle");
-        }
-        try {
-            WebappAuthenticatorConfig.init();
-            WebappAuthenticatorRepository repository = new WebappAuthenticatorRepository();
-            for (AuthenticatorConfig config : WebappAuthenticatorConfig.getInstance().getAuthenticators()) {
-                WebappAuthenticator authenticator =
-                        (WebappAuthenticator) Class.forName(config.getClassName()).newInstance();
-
-                if ((config.getParams() != null) && (!config.getParams().isEmpty())) {
-                    Properties properties = new Properties();
-                    for (AuthenticatorConfig.Parameter param : config.getParams()) {
-                        properties.setProperty(param.getName(), param.getValue());
-                    }
-                    authenticator.setProperties(properties);
-                }
-                authenticator.init();
-                repository.addAuthenticator(authenticator);
-            }
-
-            //Register AuthenticatorConfigService to expose webapp-authenticator configs.
-            BundleContext bundleContext = componentContext.getBundleContext();
-            AuthenticatorConfigService authenticatorConfigService = new AuthenticatorConfigServiceImpl();
-            bundleContext.registerService(AuthenticatorConfigService.class.getName(), authenticatorConfigService, null);
-
-            AuthenticatorFrameworkDataHolder.getInstance().setWebappAuthenticatorRepository(repository);
-
-            List<CarbonTomcatValve> valves = new ArrayList<CarbonTomcatValve>();
-            valves.add(new WebappAuthenticationValve());
-            TomcatValveContainer.addValves(valves);
-
-            if (log.isDebugEnabled()) {
-                log.debug("Web Application Authenticator Framework Bundle has been started successfully");
-            }
-        } catch (Throwable e) {
-            log.error("Error occurred while initializing the bundle", e);
-        }
-    }
-
-    @SuppressWarnings("unused")
-    protected void deactivate(ComponentContext componentContext) {
-        //do nothing
-    }
-
-    protected void setRealmService(RealmService realmService) {
-        if (log.isDebugEnabled()) {
-            log.debug("RealmService acquired");
-        }
-        AuthenticatorFrameworkDataHolder.getInstance().setRealmService(realmService);
-    }
-
-    protected void unsetRealmService(RealmService realmService) {
-        AuthenticatorFrameworkDataHolder.getInstance().setRealmService(null);
-    }
-
-    protected void setCertificateManagementService(CertificateManagementService certificateManagementService) {
-        if (log.isDebugEnabled()) {
-            log.debug("Setting certificate management service");
-        }
-        AuthenticatorFrameworkDataHolder.getInstance().setCertificateManagementService(certificateManagementService);
-    }
-
-    protected void unsetCertificateManagementService(CertificateManagementService certificateManagementService) {
-        if (log.isDebugEnabled()) {
-            log.debug("Removing certificate management service");
-        }
-
-        AuthenticatorFrameworkDataHolder.getInstance().setCertificateManagementService(null);
-    }
-
-    protected void setSCEPManagementService(SCEPManager scepManager) {
-        if (log.isDebugEnabled()) {
-            log.debug("Setting SCEP management service");
-        }
-        AuthenticatorFrameworkDataHolder.getInstance().setScepManager(scepManager);
-    }
-
-    protected void unsetSCEPManagementService(SCEPManager scepManager) {
-        if (log.isDebugEnabled()) {
-            log.debug("Removing SCEP management service");
-        }
-
-        AuthenticatorFrameworkDataHolder.getInstance().setScepManager(null);
-    }
-
-    /**
-     * Sets OAuth2TokenValidation Service.
-     *
-     * @param tokenValidationService An instance of OAuth2TokenValidationService
-     */
-    protected void setOAuth2ValidationService(OAuth2TokenValidationService tokenValidationService) {
-        if (log.isDebugEnabled()) {
-            log.debug("Setting OAuth2TokenValidationService Service");
-        }
-        AuthenticatorFrameworkDataHolder.getInstance().setOAuth2TokenValidationService(tokenValidationService);
-    }
-
-    /**
-     * Unsets OAuth2TokenValidation Service.
-     *
-     * @param tokenValidationService An instance of OAuth2TokenValidationService
-     */
-    protected void unsetOAuth2ValidationService(OAuth2TokenValidationService tokenValidationService) {
-        if (log.isDebugEnabled()) {
-            log.debug("Unsetting OAuth2TokenValidationService Service");
-        }
-        AuthenticatorFrameworkDataHolder.getInstance().setOAuth2TokenValidationService(null);
-    }
-
-    protected void setTenantIndexLoader(TenantIndexingLoader tenantIndexLoader) {
-        AuthenticatorFrameworkDataHolder.getInstance().setTenantIndexingLoader(tenantIndexLoader);
-    }
-
-    protected void unsetTenantIndexLoader(TenantIndexingLoader tenantIndexLoader) {
-        AuthenticatorFrameworkDataHolder.getInstance().setTenantIndexingLoader(null);
-    }
-
-    protected void setTenantRegistryLoader(TenantRegistryLoader tenantRegistryLoader) {
-        AuthenticatorFrameworkDataHolder.getInstance().setTenantRegistryLoader(tenantRegistryLoader);
-    }
-
-    protected void unsetTenantRegistryLoader(TenantRegistryLoader tenantRegistryLoader) {
-        AuthenticatorFrameworkDataHolder.getInstance().setTenantRegistryLoader(null);
-    }
-}