From a570f1c965ce9344373968de0e6d2a9ad4dbb00e Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Thu, 28 Sep 2017 16:02:56 +0530 Subject: [PATCH 1/8] CertificateManagementService Test cases added --- .../pom.xml | 5 + .../BaseDeviceManagementCertificateTest.java | 154 +++ .../mgt/core/common/DataSourceConfig.java | 60 + ...CertificateManagementServiceImplTests.java | 350 +++++ .../mgt/core/util/CSRGenerator.java | 80 ++ .../certificate/mgt/core/util/TestUtils.java | 56 + .../src/test/resources/ca_cert.der | Bin 0 -> 1535 bytes .../repository/conf/axis2/axis2.xml | 723 ++++++++++ .../repository/conf/axis2/axis2_client.xml | 300 ++++ .../repository/conf/axis2/tenant-axis2.xml | 285 ++++ .../carbon-home/repository/conf/carbon.xml | 656 +++++++++ .../repository/conf/cdm-config.xml | 62 + .../repository/conf/certificate-config.xml | 19 + .../conf/datasources/master-datasources.xml | 68 + .../conf/etc/bundle-config/README.txt | 12 + .../carboncontext-osgi-services.properties | 3 + .../repository/conf/etc/config-validation.xml | 37 + .../carbon-home/repository/conf/etc/jmx.xml | 32 + .../repository/conf/etc/launch.ini | 258 ++++ .../conf/etc/logging-bridge.properties | 65 + .../repository/conf/etc/mime.mappings | 27 + .../repository/conf/etc/mime.types | 734 ++++++++++ .../repository/conf/etc/osgi-debug.options | 95 ++ .../repository/conf/etc/tasks-config.xml | 51 + .../repository/conf/log4j.properties | 165 +++ .../repository/conf/notification-messages.xml | 39 + .../carbon-home/repository/conf/registry.xml | 100 ++ .../conf/security/authenticators.xml | 73 + .../repository/conf/security/wso2certs.jks | Bin 0 -> 9521 bytes .../conf/tomcat/carbon/META-INF/context.xml | 31 + .../conf/tomcat/carbon/WEB-INF/web.xml | 61 + .../conf/tomcat/catalina-server.xml | 97 ++ .../repository/conf/tomcat/tomcat-users.xml | 16 + .../repository/conf/tomcat/web.xml | 1220 +++++++++++++++++ .../carbon-home/repository/conf/user-mgt.xml | 379 +++++ .../src/test/resources/certificate-config.xml | 2 +- .../src/test/resources/data-source-config.xml | 33 + .../src/test/resources/sql/h2.sql | 8 + .../src/test/resources/testng.xml | 5 +- 39 files changed, 6359 insertions(+), 2 deletions(-) create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/TestUtils.java create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_cert.der create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml create mode 100755 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/certificate-config.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties create mode 100755 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/notification-messages.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/wso2certs.jks create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/data-source-config.xml create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml index 33ef9a193b..e3274d71ae 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml @@ -162,6 +162,11 @@ org.testng testng + + com.h2database.wso2 + h2-database-engine + test + org.wso2.carbon org.wso2.carbon.logging diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java new file mode 100644 index 0000000000..b1a09026b1 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java @@ -0,0 +1,154 @@ +package org.wso2.carbon.certificate.mgt.core.common; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.tomcat.jdbc.pool.PoolProperties; +import org.testng.Assert; +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeSuite; +import org.w3c.dom.Document; +import org.wso2.carbon.base.MultitenantConstants; +import org.wso2.carbon.certificate.mgt.core.util.TestUtils; +import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.common.DeviceManagementException; +import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; +import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory; +import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; + +import javax.sql.DataSource; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import java.io.File; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; + +public abstract class BaseDeviceManagementCertificateTest { + private DataSource dataSource; + private static final Log log = LogFactory.getLog(BaseDeviceManagementCertificateTest.class); + + private static final String DATASOURCE_LOCATION = "src/test/resources/data-source-config.xml"; + + @BeforeSuite + public void setupDataSource() throws Exception { + this.initDataSource(); + this.initSQLScript(); + initializeCarbonContext(); + } + + public void initDataSource() throws Exception { + this.dataSource = this.getDataSource(this.readDataSourceConfig()); + DeviceManagementDAOFactory.init(dataSource); + GroupManagementDAOFactory.init(dataSource); + } + + @BeforeClass + public abstract void init() throws Exception; + + private DataSource getDataSource(DataSourceConfig config) { + PoolProperties properties = new PoolProperties(); + properties.setUrl(config.getUrl()); + properties.setDriverClassName(config.getDriverClassName()); + properties.setUsername(config.getUser()); + properties.setPassword(config.getPassword()); + return new org.apache.tomcat.jdbc.pool.DataSource(properties); + } + + + private DataSourceConfig readDataSourceConfig() throws DeviceManagementException { + try { + File file = new File(DATASOURCE_LOCATION); + Document doc = DeviceManagerUtil.convertToDocument(file); + JAXBContext testDBContext = JAXBContext.newInstance(DataSourceConfig.class); + Unmarshaller unmarshaller = testDBContext.createUnmarshaller(); + return (DataSourceConfig) unmarshaller.unmarshal(doc); + } catch (JAXBException e) { + throw new DeviceManagementException("Error occurred while reading data source configuration", e); + } + } + + private void initSQLScript() throws Exception { + Connection conn = null; + Statement stmt = null; + try { + conn = this.getDataSource().getConnection(); + stmt = conn.createStatement(); + stmt.executeUpdate("RUNSCRIPT FROM './src/test/resources/sql/h2.sql'"); + } finally { + TestUtils.cleanupResources(conn, stmt, null); + } + } + + private void initializeCarbonContext() { + + if (System.getProperty("carbon.home") == null) { + File file = new File("src/test/resources/carbon-home"); + if (file.exists()) { + System.setProperty("carbon.home", file.getAbsolutePath()); + } + file = new File("../resources/carbon-home"); + if (file.exists()) { + System.setProperty("carbon.home", file.getAbsolutePath()); + } + file = new File("../../resources/carbon-home"); + if (file.exists()) { + System.setProperty("carbon.home", file.getAbsolutePath()); + } + file = new File("../../../resources/carbon-home"); + if (file.exists()) { + System.setProperty("carbon.home", file.getAbsolutePath()); + } + } + + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(MultitenantConstants + .SUPER_TENANT_DOMAIN_NAME); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); + } + + + + private void cleanApplicationMappingData(Connection conn) throws SQLException { + try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_APPLICATION_MAPPING")) { + stmt.execute(); + } + } + + private void cleanApplicationData(Connection conn) throws SQLException { + try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_APPLICATION")) { + stmt.execute(); + } + } + + + private void cleanupEnrolmentData(Connection conn) throws SQLException { + try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_ENROLMENT")) { + stmt.execute(); + } + } + + private void cleanupDeviceData(Connection conn) throws SQLException { + try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE")) { + stmt.execute(); + } + } + + private void cleanupDeviceTypeData(Connection conn) throws SQLException { + try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_TYPE")) { + stmt.execute(); + } + } + + private void cleanupGroupData(Connection conn) throws SQLException { + try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_GROUP")) { + stmt.execute(); + } + } + + public DataSource getDataSource() { + return dataSource; + } + +} diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java new file mode 100644 index 0000000000..f48e6add84 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java @@ -0,0 +1,60 @@ +package org.wso2.carbon.certificate.mgt.core.common; + + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "DataSourceConfig") +public class DataSourceConfig { + + private String url; + private String driverClassName; + private String user; + private String password; + + @Override public String toString() { + return "DataSourceConfig[" + + " Url ='" + url + '\'' + + ", DriverClassName ='" + driverClassName + '\'' + + ", UserName ='" + user + '\'' + + ", Password ='" + password + '\'' + + "]"; + } + + @XmlElement(name = "Url", nillable = false) + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + @XmlElement(name = "DriverClassName", nillable = false) + public String getDriverClassName() { + return driverClassName; + } + + public void setDriverClassName(String driverClassName) { + this.driverClassName = driverClassName; + } + + @XmlElement(name = "User", nillable = false) + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + @XmlElement(name = "Password", nillable = false) + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + +} diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java new file mode 100644 index 0000000000..ad144b7f9c --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java @@ -0,0 +1,350 @@ +package org.wso2.carbon.certificate.mgt.core.impl; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.io.FileUtils; +import org.apache.woden.tool.converter.Convert; +import org.bouncycastle.asn1.x500.X500Name; +import org.bouncycastle.cert.jcajce.JcaCertStore; +import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; +import org.bouncycastle.cms.CMSAbsentContent; +import org.bouncycastle.cms.CMSException; +import org.bouncycastle.cms.CMSSignedData; +import org.bouncycastle.cms.CMSSignedDataGenerator; +import org.bouncycastle.openssl.PEMReader; +import org.bouncycastle.operator.ContentSigner; +import org.bouncycastle.operator.OperatorCreationException; +import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; +import org.bouncycastle.pkcs.PKCS10CertificationRequest; +import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder; +import org.bouncycastle.util.io.pem.PemReader; +import org.eclipse.wst.xml.core.internal.contenttype.ByteReader; +import org.testng.Assert; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; +import org.wso2.carbon.certificate.mgt.core.common.BaseDeviceManagementCertificateTest; +import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory; +import org.wso2.carbon.certificate.mgt.core.dto.CAStatus; +import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse; +import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse; +import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException; +import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException; +import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementServiceImpl; +import org.wso2.carbon.certificate.mgt.core.util.CSRGenerator; +import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants; +import org.wso2.carbon.device.mgt.common.DeviceManagementException; +import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; +import sun.misc.BASE64Decoder; +import sun.misc.BASE64Encoder; + + +import javax.xml.bind.DatatypeConverter; +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.security.KeyPair; +import java.security.KeyStore; +import java.security.PrivateKey; +import java.security.Security; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.security.interfaces.RSAPublicKey; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Base64; +import java.util.List; + +public class CertificateManagementServiceImplTests extends BaseDeviceManagementCertificateTest { + + private static Log log = LogFactory.getLog(CertificateManagementServiceImplTests.class); + private static final String CA_CERT_PEM = "src/test/resources/ca_cert.pem"; + private static final String RA_CERT_PEM = "src/test/resources/ra_cert.pem"; + private static final String CA_CERT_DER = "src/test/resources/ca_cert.der"; + CertificateManagementServiceImpl managementService = null; + + @Test + public void testGetInstance() { + try { + CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); + Assert.assertNotNull(instance); + log.info("Successfully created instance"); + + } catch (NullPointerException e) { + log.error("Error while initializing CertificateManagementService", e); + Assert.fail(); + } + + + } + + @BeforeClass + public void initCertificateManagementService() throws DeviceManagementException { + managementService = CertificateManagementServiceImpl.getInstance(); + Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + + } + + @Test + public void testGetCACertificate() { + try { + CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); + Certificate caCertificate = instance.getCACertificate(); + Assert.assertNotNull(caCertificate); + Assert.assertEquals(caCertificate.getType(), CertificateManagementConstants.X_509); + log.info("Successfully returned CA Certificate"); + + } catch (KeystoreException e) { + String msg = "Error while getting the CA Certificate"; + log.error(msg, e); + Assert.fail(msg, e); + } + } + + @Test + public void testGetRACertificate() { + try { + Certificate raCertificate = managementService.getRACertificate(); + Assert.assertNotNull(raCertificate); + Assert.assertEquals(raCertificate.getType(), CertificateManagementConstants.X_509); + log.info("Successfully returned RA Certificate"); + } catch (KeystoreException e) { + String msg = "Error while getting the RA Certificate"; + log.error(msg, e); + Assert.fail(msg, e); + } + } + + @Test + public void testGetRootCertificate() { + File caCert = new File(CA_CERT_PEM); + File raCert = new File(RA_CERT_PEM); + + try { + byte[] caBytes = FileUtils.readFileToByteArray(caCert); + byte[] raBytes = FileUtils.readFileToByteArray(raCert); + + List rootCertificates = managementService.getRootCertificates(caBytes, raBytes); + Assert.assertNotNull(rootCertificates); + Assert.assertEquals(rootCertificates.get(0).getType(), CertificateManagementConstants.X_509); + Assert.assertEquals(rootCertificates.get(1).getType(), CertificateManagementConstants.X_509); + log.info("Successfully returned root Certificate"); + + } catch (IOException e) { + String msg = "Error reading byte streams"; + log.error(msg, e); + Assert.fail(msg, e); + } catch (KeystoreException e) { + String msg = "Error retrieving root certificates"; + log.error(msg, e); + Assert.fail(msg, e); + } + + } + + @Test + public void testGenerateX509Certificate() { + try { + + X509Certificate x509Certificate = managementService.generateX509Certificate(); + Assert.assertNotNull(x509Certificate); + Assert.assertEquals(x509Certificate.getType(), CertificateManagementConstants.X_509); + + } catch (KeystoreException e) { + String msg = "Error while generating X509 Certificate"; + log.error(msg, e); + Assert.fail(msg, e); + } + } + + @Test + public void testGetCACertSCEP() { + try { + + SCEPResponse caCertSCEP = managementService.getCACertSCEP(); + Assert.assertNotNull(caCertSCEP); + Assert.assertEquals(caCertSCEP.getResultCriteria(), CAStatus.CA_RA_CERT_RECEIVED); + + } catch (KeystoreException e) { + String msg = "Error while Retrieving CA Certificate"; + log.error(msg, e); + Assert.fail(msg, e); + } + + } + + @Test + public void testGetCACapsSCEP() { + + byte[] caCapsSCEP = managementService.getCACapsSCEP(); + Assert.assertNotNull(caCapsSCEP); + Assert.assertEquals(caCapsSCEP, CertificateManagementConstants.POST_BODY_CA_CAPS.getBytes()); + + + } + + @Test + public void testGenerateCertificateFromCSR() { + CSRGenerator csrGeneration = new CSRGenerator(); + KeyStoreReader keyStoreReader = new KeyStoreReader(); + + // Generate key pair + KeyPair keyPair = csrGeneration.generateKeyPair("RSA", 1024); + byte[] csrData = csrGeneration.generateCSR("SHA256WithRSA", keyPair); + + //remove headers from csr + String csrString = new String(csrData); + csrString = csrString.replace("-----BEGIN NEW CERTIFICATE REQUEST-----", "") + .replace("-----END NEW CERTIFICATE REQUEST-----", ""); + + byte[] byteArrayBst = DatatypeConverter.parseBase64Binary(csrString); + PKCS10CertificationRequest certificationRequest; + + try { + PrivateKey privateKeyCA = keyStoreReader.getCAPrivateKey(); + X509Certificate certCA = (X509Certificate) keyStoreReader.getCACertificate(); + certificationRequest = new PKCS10CertificationRequest(byteArrayBst); + X509Certificate x509Certificate = managementService.generateCertificateFromCSR(privateKeyCA, + certificationRequest, certCA.getIssuerX500Principal().getName()); + + Assert.assertNotNull(x509Certificate); + Assert.assertEquals(x509Certificate.getType(), CertificateManagementConstants.X_509); + + } catch (KeystoreException e) { + String msg = "Error while reading Certificates from the keystore"; + log.error(msg, e); + Assert.fail(msg, e); + + } catch (IOException e) { + String msg = "Error while reading byte streams"; + log.error(msg, e); + Assert.fail(msg, e); + } + + } + + @Test + public void testGetCertificateBySerial() { + + X509Certificate x509Certificate = null; + try { + //generate and save a certificate + x509Certificate = managementService.generateX509Certificate(); + //initialize DeviceConfigurationManager + DeviceConfigurationManager.getInstance().initConfig(); + CertificateResponse certificateBySerial = managementService.getCertificateBySerial(x509Certificate.getSerialNumber().toString()); + + Assert.assertNotNull(certificateBySerial); + Assert.assertEquals(certificateBySerial.getSerialNumber(), x509Certificate.getSerialNumber().toString()); + + } catch (KeystoreException e) { + String msg = "Error while receiving the certificate"; + log.error(msg, e); + Assert.fail(msg, e); + + } catch (DeviceManagementException e) { + String msg = "Error while initilizing DeviceConfigurationManager"; + log.error(msg, e); + } + + + } + + @Test + public void testGetCertificateByAlias() { + X509Certificate x509Certificate = null; + try { + //generate and save a certificate + x509Certificate = managementService.generateX509Certificate(); + + //initialize DeviceConfigurationManager + DeviceConfigurationManager.getInstance().initConfig(); + Certificate certificateByAlias = managementService.getCertificateByAlias(x509Certificate.getSerialNumber().toString()); + + + Assert.assertNotNull(certificateByAlias); + Assert.assertEquals(certificateByAlias.getType(), CertificateManagementConstants.X_509); + + } catch (KeystoreException e) { + String msg = "Error while receiving the certificate"; + log.error(msg, e); + Assert.fail(msg, e); + + } catch (DeviceManagementException e) { + String msg = "Error while initilizing DeviceConfigurationManager"; + log.error(msg, e); + } + } + + @Test + public void testVerifySignature() { + BASE64Encoder encoder = new BASE64Encoder(); + + try { + //generate and save a certificate in the keystore + X509Certificate x509Certificate = managementService.generateX509Certificate(); + + //Generate CMSdata + CMSSignedDataGenerator generator = new CMSSignedDataGenerator(); + List list = new ArrayList<>(); + list.add(x509Certificate); + JcaCertStore store = new JcaCertStore(list); + generator.addCertificates(store); + CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); + byte[] signature = degenerateSd.getEncoded(); + + boolean verifySignature = managementService.verifySignature(encoder.encode(signature)); + + Assert.assertNotNull(verifySignature); + Assert.assertTrue(verifySignature); + + } catch (CertificateEncodingException e) { + String msg = "Error in Certificate encoding"; + log.error(msg, e); + Assert.fail(msg, e); + } catch (IOException e) { + String msg = "Error reading encoded signature"; + log.error(msg, e); + Assert.fail(msg, e); + } catch (CMSException e) { + String msg = "Error Adding certificates"; + log.error(msg, e); + Assert.fail(msg, e); + } catch (KeystoreException e) { + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); + } + + + } + + @Test + public void testVerifyPEMSignature() { + + + } + + @Test + public void testVerifySubjectDN() { + try { + DeviceConfigurationManager.getInstance().initConfig(); + X509Certificate x509Certificate = managementService.generateX509Certificate(); + log.info(x509Certificate.getIssuerDN().getName()); + managementService.verifySubjectDN(x509Certificate.getIssuerDN().getName()); + + } catch (KeystoreException e) { + e.printStackTrace(); + } catch (DeviceManagementException e) { + e.printStackTrace(); + } + } + + + @BeforeClass + @Override + public void init() throws Exception { + initDataSource(); + CertificateManagementDAOFactory.init(this.getDataSource()); + } +} diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java new file mode 100644 index 0000000000..76dd9e2d0e --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java @@ -0,0 +1,80 @@ +package org.wso2.carbon.certificate.mgt.core.util; + +import sun.security.pkcs10.PKCS10; +import sun.security.x509.X500Name; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.Signature; + +public class CSRGenerator { + + /** + * Generate the desired CSR for signing + * + * @param sigAlg + * @param keyPair + * @return + */ + public byte[] generateCSR(String sigAlg, KeyPair keyPair) { + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); + PrintStream printStream = new PrintStream(outStream); + + try { + X500Name x500Name = new X500Name("C=DE,O=Organiztion,CN=WSO2"); + + Signature sig = Signature.getInstance(sigAlg); + + sig.initSign(keyPair.getPrivate()); + + PKCS10 pkcs10 = new PKCS10(keyPair.getPublic()); + pkcs10.encodeAndSign(x500Name, sig); // For Java 7 and Java 8 + pkcs10.print(printStream); + + byte[] csrBytes = outStream.toByteArray(); + + return csrBytes; + } catch (Exception ex) { + ex.printStackTrace(); + } finally { + if (null != outStream) { + try { + outStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + if (null != printStream) { + printStream.close(); + } + } + + return new byte[0]; + } + + /** + * Generate the desired keypair + * + * @param alg + * @param keySize + * @return + */ + public KeyPair generateKeyPair(String alg, int keySize) { + try { + KeyPairGenerator keyPairGenerator = null; + keyPairGenerator = KeyPairGenerator.getInstance(alg); + + keyPairGenerator.initialize(keySize); + + return keyPairGenerator.generateKeyPair(); + } catch (Exception ex) { + ex.printStackTrace(); + } + + return null; + } +} diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/TestUtils.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/TestUtils.java new file mode 100644 index 0000000000..34d6936676 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/TestUtils.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2014, 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.certificate.mgt.core.util; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +public class TestUtils { + + private static final Log log = LogFactory.getLog(TestUtils.class); + + public static void cleanupResources(Connection conn, Statement stmt, ResultSet rs) { + if (rs != null) { + try { + rs.close(); + } catch (SQLException e) { + log.warn("Error occurred while closing result set", e); + } + } + if (stmt != null) { + try { + stmt.close(); + } catch (SQLException e) { + log.warn("Error occurred while closing prepared statement", e); + } + } + if (conn != null) { + try { + conn.close(); + } catch (SQLException e) { + log.warn("Error occurred while closing database connection", e); + } + } + } + +} diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_cert.der b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_cert.der new file mode 100644 index 0000000000000000000000000000000000000000..72684b1820507f1797d8c513d4de743f7a93bb06 GIT binary patch literal 1535 zcmXqLV*PE<#Qb;xGZP~d6DPw&i|0qg&0cgH@Un4gwRyCC=VfGMWo0mE>^9^!;ACSC zWnmL$3Jo^oHQ)wuID}b3Qj1GqTy`i|(10H#%O%VKl2!08N;ecU5CI8s3-f}7@{7_H zO7k*H3`GruLE_B9JmJCqMhZds`6UX@j)pP@Qg8=wGK%pQ0mU84i}Q{2lJj#7qf4g|gU7w}!a$c^y@7(n{ ziNnCL?uFaY{YVR%QD8rbmm+6U!<} zlYATIcIk||$I_ePZ~!`#4V(+ttYUQzjx_UrtY9t`5>Q-db|Ua(3^X zB9mpWeH>+GG1#5%i#u{vc+rXzzW?n_SWns{=^fE|x$5U3zpnj1IM|l;A6eHpS1GQ) z?AFO_&zIBmZzr4Doe|488kfOQ8#zlQ?%a_z8|8%eG)$U2)wj!IlKTyvGlvT2xDmIGOMbfN9V+$7wwiK4uyFq)-g;Ndr@O`d{vEor*GkcC zGTWcTBTLlI**jJ;Zirym#?`0uY{%qVx0Cj&q{eBSS8%vomwn{#kH-&|UvPMGiE2RG|&EcGz@YU?e+oT7*jR$u;5n{G|df@Xb+x}ggE9La_3!;@Dyqmb$eWg!f zlWyR}lRIt;cUhYpU;60EyCkJY-xhm6{Se~*>zeEA>cv}>*q80N(s=S$#*pv4SBLm~&1cNvOSzuO>BFiQi|AS1&mufENK zS05J?-tOPc`^Vd~XI72aCfVfzkKX7`y(4#Ag|VimQ_G?_)n)zky3Z}a4^@TS7cqL2 zoo`*VY{G_k{yqISJXV_rwj}nxU8cJ7_qRZXHR^Tu4UWw=QJnQUbn%9*IVyU)OluN0 zaZ3HZGv_$_oI@{*C(Q4+?6{$~%5YwI)5MQ|P9)8}nYwDPWZ18XUEjAbXX{5tTD&c7 zd?O@({M(B3=tnjMXA`4mq_6mI!kGX0W8S^`%eBp&&-Q!)=7Pk^XQC(Aj$ISpJ$sk) zHPI5IoBMBOC2kh)Fx z52utc_c@3LNIrV~?V{X@@1L)vTUG@8G+BE5hg;M2;H6XYUl%`ST5_nwKr!32p&|d; z&pRP4JR3Tmu~$|sFM8c9C~LIL{aE2r{ha&tGqc^)euw?o?>E)ryDn!qfAYjCnV(%( zwpYe7hk46zJop%Mo|5Ds1 THQ~d}%H%_btbFz}aCHIz + + + + + + + + + + + + ${hotdeployment} + ${hotupdate} + optional + true + work/mtom + 4000 + + ${childfirstCL} + + + true + + + true + + + + false + + inmemory + + + + + + + services + + + axis2services + + + axis2modules + + + @product.name@-@product.version@ + + + @product.name@-@product.version@ + + + + + + + false + + + + + + false + + + true + + + repository/deployment/server/synapse-configs + + + . + + + . + + + WSO2 Carbon Server + + + + + + + ${jaxwsparam} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 9763 + + + + + + + + + + + + 9443 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HTTP/1.1 + chunked + + true + + + HTTP/1.1 + chunked + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + multicast + + + + + wso2.carbon.domain + + + + + + 45564 + + 100 + + 60 + + + + + + 127.0.0.1 + + + + + + 4000 + + + + + + + + + + + + + + + + + + 127.0.0.1 + 4000 + + + + + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml new file mode 100644 index 0000000000..a8b584d086 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml @@ -0,0 +1,300 @@ + + + + + + + true + false + false + + + 500 + + 15000 + + + false + + + + true + + + + + + false + + + admin + axis2 + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6071 + + + + + + + + + + + + + + + + + + + + + + HTTP/1.1 + chunked + 60000 + 60000 + + + HTTP/1.1 + chunked + 60000 + 60000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml new file mode 100644 index 0000000000..c6fe9d23d3 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml @@ -0,0 +1,285 @@ + + + + + + + + + true + true + optional + + + true + + + false + + + + true + + + + + + false + + + false + + + axis2services + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml new file mode 100644 index 0000000000..ca5863d18d --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml @@ -0,0 +1,656 @@ + + + + + + + + + ${product.name} + + + ${product.key} + + + ${product.version} + + + + + + + + + local:/${carbon.context}/services/ + + + + + + + ${default.server.role} + + + + + + + org.wso2.carbon + + + / + + + + + + + + + 15 + + + + + + + + + 0 + + + + + 9999 + + 11111 + + + + + + 10389 + + 8000 + + + + + + 10500 + + + + + + + org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory + + + + + + + + + java + + + + + + + + + + false + + + false + + + 600 + + + + false + + + + + + + + 30 + + + + + + + + + 15 + + + + + + ${carbon.home}/repository/deployment/server/ + + + 15 + + + ${carbon.home}/repository/conf/axis2/axis2.xml + + + 30000 + + + ${carbon.home}/repository/deployment/client/ + + ${carbon.home}/repository/conf/axis2/axis2_client.xml + + true + + + + + + + + + + admin + Default Administrator Role + + + user + Default User Role + + + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + + + + + ${carbon.home}/repository/resources/security/client-truststore.jks + + JKS + + wso2carbon + + + + + + + + + + + + + + + + + + + UserManager + + + false + + + + + + + ${carbon.home}/tmp/work + + + + + + true + + + 10 + + + 30 + + + + + + 100 + + + + keystore + certificate + * + + org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor + + + + + jarZip + + org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor + + + + dbs + + org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor + + + + tools + + org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor + + + + toolsAny + + org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor + + + + + + + info + org.wso2.carbon.core.transports.util.InfoProcessor + + + wsdl + org.wso2.carbon.core.transports.util.Wsdl11Processor + + + wsdl2 + org.wso2.carbon.core.transports.util.Wsdl20Processor + + + xsd + org.wso2.carbon.core.transports.util.XsdProcessor + + + + + + false + false + true + svn + http://svnrepo.example.com/repos/ + username + password + true + + + + + + + + + + + + + + + ${require.carbon.servlet} + + + + + true + + + + + + + default repository + ${p2.repo.url} + + + + + + + + true + + + + + + true + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml new file mode 100644 index 0000000000..a4f2358d9f --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -0,0 +1,62 @@ + + + + + + + + jdbc/DM_DS + + + + + 8 + 100 + 20 + 1000 + + + https://localhost:9443 + admin + admin + + + org.wso2.carbon.policy.mgt + true + 60000 + 5 + 8 + 20 + + Simple + + + + true + + + true + 86400 + + + true + 300 + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/certificate-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/certificate-config.xml new file mode 100755 index 0000000000..42e70bb8da --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/certificate-config.xml @@ -0,0 +1,19 @@ + + + + + ${carbon.home}/repository/conf/security/wso2certs.jks + + JKS + + wso2carbon + + cacert + + cacert + + racert + + racert + + \ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml new file mode 100644 index 0000000000..897e33581c --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml @@ -0,0 +1,68 @@ + + + + org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader + + + + + + WSO2_CARBON_DB + The datasource used for registry and user manager + + jdbc/WSO2CarbonDB + + + + jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + false + + + + + + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt new file mode 100644 index 0000000000..ffa7c79264 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt @@ -0,0 +1,12 @@ +This directory supports adding third-pary config files to specific bundles during runtime. + +Explanation: Each OSGi bundle has its own classLoader. Some thirdpary libs read configs from classPath. This scenario fails in OSGi runtime, since OSGi runtime does not share a common classPath for individual bundles. Bundling config files during the bundle creation process itself will solve the issue. However it limits the ability to edit the configs during restarts. + +Here we are providing a workaround for such scenarios. The given config file will get resolved to a fragment bundle and will get attached to the specified host bundle. The host bundle name(symbolic name) is resolved by looking at the directory structure. Hence host bundle name should be directory name of the config file directory. + + +Example: The bundle with symbolic name, 'org.foo.bar' expects a config file named 'foobar.properties' from its classPath. + +create a directory named 'org.foo.bar' inside 'repository/conf/etc/bundle-config' - (this directory) and place the foobar.properties file. + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties new file mode 100644 index 0000000000..f52d194001 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties @@ -0,0 +1,3 @@ +#osgi.service.1 = org.wso2.carbon.client.configcontext.provider.Axis2ClientConfigContextProvider +#osgi.service.2 = org.wso2.carbon.user.core.UserManager +#osgi.service.3 = org.wso2.carbon.user.api.UserRealmService \ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml new file mode 100644 index 0000000000..3b5b3484bb --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml @@ -0,0 +1,37 @@ + + + + + + 800 + 2047 + 2047 + 1024 + 4096 + 02:FB:AA:5F:20:64:49:4A:27:29:55:71:83:F7:46:CD + + + 256 + 512 + 256 + + + carbon.home + carbon.config.dir.path + axis2.home + + + Linux + Unix + Mac OS + Windows Server 2003 + Windows XP + Windows Vista + Windows 7 + Mac OS X + Windows Server 2008 + Windows Server 2008 R2 + AIX + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml new file mode 100644 index 0000000000..13cdfa301e --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml @@ -0,0 +1,32 @@ + + + + + true + + + localhost + + + ${Ports.JMX.RMIRegistryPort} + + + ${Ports.JMX.RMIServerPort} + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini new file mode 100644 index 0000000000..8b9f5ad190 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini @@ -0,0 +1,258 @@ +# Eclipse Runtime Configuration Overrides +# These properties are loaded prior to starting the framework and can also be used to override System Properties +# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework +# "*" can be used together with @null to clear System Properties that match a prefix name. + +osgi.*=@null +org.osgi.*=@null +eclipse.*=@null + +osgi.parentClassloader=app +osgi.contextClassLoaderParent=app + +# When osgi.clean is set to "true", any cached data used by the OSGi framework +# will be wiped clean. This will clean the caches used to store bundle +# dependency resolution and eclipse extension registry data. Using this +# option will force OSGi framework to reinitialize these caches. +# The following setting is put in place to get rid of the problems +# faced when re-starting the system. Please note that, when this setting is +# true, if you manually start a bundle, it would not be available when +# you re-start the system. To avid this, copy the bundle jar to the plugins +# folder, before you re-start the system. +osgi.clean=true + +# Uncomment the following line to turn on Eclipse Equinox debugging. +# You may also edit the osgi-debug.options file and fine tune the debugging +# options to suite your needs. +#osgi.debug=./repository/conf/osgi-debug.options + +# Following system property allows us to control the public JDK packages exported through the system bundle. +org.osgi.framework.system.packages=javax.accessibility,\ +javax.activity,\ +javax.crypto,\ +javax.crypto.interfaces,\ +javax.crypto.spec,\ +javax.imageio,\ +javax.imageio.event,\ +javax.imageio.metadata,\ +javax.imageio.plugins.bmp,\ +javax.imageio.plugins.jpeg,\ +javax.imageio.spi,\ +javax.imageio.stream,\ +javax.jms,\ +javax.management,\ +javax.management.loading,\ +javax.management.modelmbean,\ +javax.management.monitor,\ +javax.management.openmbean,\ +javax.management.relation,\ +javax.management.remote,\ +javax.management.remote.rmi,\ +javax.management.timer,\ +javax.naming,\ +javax.naming.directory,\ +javax.naming.event,\ +javax.naming.ldap,\ +javax.naming.spi,\ +javax.net,\ +javax.net.ssl,\ +javax.print,\ +javax.print.attribute,\ +javax.print.attribute.standard,\ +javax.print.event,\ +javax.rmi,\ +javax.rmi.CORBA,\ +javax.rmi.ssl,\ +javax.script,\ +javax.security.auth,\ +javax.security.auth.callback,\ +javax.security.auth.kerberos,\ +javax.security.auth.login,\ +javax.security.auth.spi,\ +javax.security.auth.x500,\ +javax.security.cert,\ +javax.security.sasl,\ +javax.sound.midi,\ +javax.sound.midi.spi,\ +javax.sound.sampled,\ +javax.sound.sampled.spi,\ +javax.sql,\ +javax.sql.rowset,\ +javax.sql.rowset.serial,\ +javax.sql.rowset.spi,\ +javax.swing,\ +javax.swing.border,\ +javax.swing.colorchooser,\ +javax.swing.event,\ +javax.swing.filechooser,\ +javax.swing.plaf,\ +javax.swing.plaf.basic,\ +javax.swing.plaf.metal,\ +javax.swing.plaf.multi,\ +javax.swing.plaf.synth,\ +javax.swing.table,\ +javax.swing.text,\ +javax.swing.text.html,\ +javax.swing.text.html.parser,\ +javax.swing.text.rtf,\ +javax.swing.tree,\ +javax.swing.undo,\ +javax.transaction,\ +javax.transaction.xa,\ +javax.xml.namespace,\ +javax.xml.parsers,\ +javax.xml.stream,\ +javax.xml.stream.events,\ +javax.xml.stream.util,\ +javax.xml.transform,\ +javax.xml.transform.stream,\ +javax.xml.transform.dom,\ +javax.xml.transform.sax,\ +javax.xml,\ +javax.xml.validation,\ +javax.xml.datatype,\ +javax.xml.xpath,\ +javax.activation,\ +com.sun.activation.registries,\ +com.sun.activation.viewers,\ +org.ietf.jgss,\ +org.omg.CORBA,\ +org.omg.CORBA_2_3,\ +org.omg.CORBA_2_3.portable,\ +org.omg.CORBA.DynAnyPackage,\ +org.omg.CORBA.ORBPackage,\ +org.omg.CORBA.portable,\ +org.omg.CORBA.TypeCodePackage,\ +org.omg.CosNaming,\ +org.omg.CosNaming.NamingContextExtPackage,\ +org.omg.CosNaming.NamingContextPackage,\ +org.omg.Dynamic,\ +org.omg.DynamicAny,\ +org.omg.DynamicAny.DynAnyFactoryPackage,\ +org.omg.DynamicAny.DynAnyPackage,\ +org.omg.IOP,\ +org.omg.IOP.CodecFactoryPackage,\ +org.omg.IOP.CodecPackage,\ +org.omg.Messaging,\ +org.omg.PortableInterceptor,\ +org.omg.PortableInterceptor.ORBInitInfoPackage,\ +org.omg.PortableServer,\ +org.omg.PortableServer.CurrentPackage,\ +org.omg.PortableServer.POAManagerPackage,\ +org.omg.PortableServer.POAPackage,\ +org.omg.PortableServer.portable,\ +org.omg.PortableServer.ServantLocatorPackage,\ +org.omg.SendingContext,\ +org.omg.stub.java.rmi,\ +org.w3c.dom,\ +org.w3c.dom.bootstrap,\ +org.w3c.dom.css,\ +org.w3c.dom.events,\ +org.w3c.dom.html,\ +org.w3c.dom.ls,\ +org.w3c.dom.ranges,\ +org.w3c.dom.stylesheets,\ +org.w3c.dom.traversal,\ +org.w3c.dom.views ,\ +org.xml.sax,\ +org.xml.sax.ext,\ +org.xml.sax.helpers,\ +org.apache.xerces.xpointer,\ +org.apache.xerces.xni.grammars,\ +org.apache.xerces.impl.xs.util,\ +org.apache.xerces.jaxp.validation,\ +org.apache.xerces.impl.dtd.models,\ +org.apache.xerces.impl.xpath,\ +org.apache.xerces.dom3.as,\ +org.apache.xerces.impl.dv.xs,\ +org.apache.xerces.util,\ +org.apache.xerces.impl.xs.identity,\ +org.apache.xerces.impl.xs.opti,\ +org.apache.xerces.jaxp,\ +org.apache.xerces.impl.dv,\ +org.apache.xerces.xs.datatypes,\ +org.apache.xerces.dom.events,\ +org.apache.xerces.impl.msg,\ +org.apache.xerces.xni,\ +org.apache.xerces.impl.xs,\ +org.apache.xerces.impl,\ +org.apache.xerces.impl.io,\ +org.apache.xerces.xinclude,\ +org.apache.xerces.jaxp.datatype,\ +org.apache.xerces.parsers,\ +org.apache.xerces.impl.dv.util,\ +org.apache.xerces.xni.parser,\ +org.apache.xerces.impl.xs.traversers,\ +org.apache.xerces.impl.dv.dtd,\ +org.apache.xerces.xs,\ +org.apache.xerces.impl.dtd,\ +org.apache.xerces.impl.validation,\ +org.apache.xerces.impl.xs.models,\ +org.apache.xerces.impl.xpath.regex,\ +org.apache.xml.serialize,\ +org.apache.xerces.dom,\ +org.apache.xalan,\ +org.apache.xalan.xslt,\ +org.apache.xalan.templates,\ +org.apache.xalan.xsltc,\ +org.apache.xalan.xsltc.cmdline,\ +org.apache.xalan.xsltc.cmdline.getopt,\ +org.apache.xalan.xsltc.trax,\ +org.apache.xalan.xsltc.dom,\ +org.apache.xalan.xsltc.runtime,\ +org.apache.xalan.xsltc.runtime.output,\ +org.apache.xalan.xsltc.util,\ +org.apache.xalan.xsltc.compiler,\ +org.apache.xalan.xsltc.compiler.util,\ +org.apache.xalan.serialize,\ +org.apache.xalan.client,\ +org.apache.xalan.res,\ +org.apache.xalan.transformer,\ +org.apache.xalan.extensions,\ +org.apache.xalan.lib,\ +org.apache.xalan.lib.sql,\ +org.apache.xalan.processor,\ +org.apache.xalan.trace,\ +org.apache.xml.dtm,\ +org.apache.xml.dtm.ref,\ +org.apache.xml.dtm.ref.sax2dtm,\ +org.apache.xml.dtm.ref.dom2dtm,\ +org.apache.xml.utils,\ +org.apache.xml.utils.res,\ +org.apache.xml.res,\ +org.apache.xml.serializer,\ +org.apache.xml.serializer.utils,\ +org.apache.xpath,\ +org.apache.xpath.domapi,\ +org.apache.xpath.objects,\ +org.apache.xpath.patterns,\ +org.apache.xpath.jaxp,\ +org.apache.xpath.res,\ +org.apache.xpath.operations,\ +org.apache.xpath.functions,\ +org.apache.xpath.axes,\ +org.apache.xpath.compiler,\ +org.apache.xml.resolver,\ +org.apache.xml.resolver.tools,\ +org.apache.xml.resolver.helpers,\ +org.apache.xml.resolver.readers,\ +org.apache.xml.resolver.etc,\ +org.apache.xml.resolver.apps,\ +javax.xml.ws,\ +javax.xml.ws.handler,\ +javax.xml.ws.handler.soap,\ +javax.xml.ws.http,\ +javax.xml.ws.soap,\ +javax.xml.ws.spi,\ +javax.xml.ws.spi.http,\ +javax.xml.ws.wsaddressing,\ +javax.xml.bind,\ +javax.xml.bind.annotation,\ +javax.xml.bind.annotation.adapters,\ +javax.annotation,\ +javax.jws,\ +javax.jws.soap,\ +com.sun.xml.internal.messaging.saaj.soap.ver1_1,\ +com.sun.xml.internal.messaging.saaj.soap,\ +com.sun.tools.internal.ws.spi,\ +org.wso2.carbon.bootstrap diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties new file mode 100644 index 0000000000..7b63190ae4 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties @@ -0,0 +1,65 @@ +############################################################ +# Default Logging Configuration File +# +# You can use a different file by specifying a filename +# with the java.util.logging.config.file system property. +# For example java -Djava.util.logging.config.file=myfile +############################################################ + +############################################################ +# Global properties +# NOTE: this configuration file use to get the handler list, +# Properties(except level property) define for each handler +# may be not available because LogRecords handover to log4j +# appenders in runtime. +############################################################ + +# "handlers" specifies a comma separated list of log Handler +# classes. These handlers will be installed during VM startup. +# Note that these classes must be on the system classpath. +# By default we only configure a ConsoleHandler, which will only +# show messages at the INFO and above levels. +#handlers= java.util.logging.ConsoleHandler + +# To also add the FileHandler, use the following line instead. +#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler +# Add org.wso2.carbon.bootstrap.logging.handlers.LogEventHandler to handlers if you need to push java logs to LOGEVENT appender + +handlers= org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler, org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler + +# Default global logging level. +# This specifies which kinds of events are logged across +# all loggers. For any given facility this global level +# can be overriden by a facility specific level +# Note that the ConsoleHandler also has a separate level +# setting to limit messages printed to the console. +.level= INFO + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +# + +############################################################ +# This FileHandler pushed LogRecords to a log4j FileAppander in runtime +org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler.level = INFO +#org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler.formatter = java.util.logging.SimpleFormatter + +# This ConsoleHandler pushed LogRecords to q log4j ConsoleAppander in runtime +org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler.level = INFO +#org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler.formatter = java.util.logging.SimpleFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +#com.xyz.foo.level = SEVERE +org.apache.coyote.level = SEVERE +org.apache.catalina.level = SEVERE +com.hazelcast.level = SEVERE + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings new file mode 100755 index 0000000000..97a5c5a5fc --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings @@ -0,0 +1,27 @@ +# +# Copyright 2005-2011 WSO2, Inc. (http://wso2.com) +# +# Licensed 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. +# + +# This file is to define the human readable media type for a mime type. +# Eg:- +# text/plain txt text +application/wsdl+xml WSDL +application/x-xsd+xml Schema +application/policy+xml Policy +application/vnd.wso2-service+xml Service +application/vnd.wso2-hyperlink Hyperlink +application/vnd.wso2.endpoint Endpoint +application/vnd.wso2-api+xml API +application/vnd.wso2-uri+xml URI diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types new file mode 100644 index 0000000000..21c386da00 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types @@ -0,0 +1,734 @@ +# +# Copyright 2005-2009 WSO2, Inc. (http://wso2.com) +# +# Licensed 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. +# + +# Media type for wsdl files. This is not defined in the original mime.types file. +chemical/x-alchemy alc +application/andrew-inset ez +application/wsdl+xml wsdl +application/vnd.sun.wadl+xml wadl +application/activemessage +application/applefile +application/atomicmail +application/batch-SMTP +application/beep+xml +application/cals-1840 +application/commonground +application/cu-seeme cu +application/cybercash +application/dca-rft +application/dec-dx +application/docbook+xml +application/dsptype tsp +application/dvcs +application/edi-consent +application/edi-x12 +application/edifact +application/eshop +application/font-tdpfr +application/futuresplash spl +application/ghostview +application/hta hta +application/http +application/hyperstudio +application/iges +application/index +application/index.cmd +application/index.obj +application/index.response +application/index.vnd +application/iotp +application/ipp +application/isup +application/java-archive jar +application/java-serialized-object ser +application/java-vm class +application/mac-binhex40 hqx +application/mac-compactpro cpt +application/macwriteii +application/marc +application/mathematica nb +application/mathematica-old +application/msaccess mdb +application/msword doc dot +application/news-message-id +application/news-transmission +application/ocsp-request +application/ocsp-response +application/octet-stream bin +application/oda oda +application/ogg ogg +application/parityfec +application/pdf pdf +application/pgp-encrypted +application/pgp-keys key +application/pgp-signature pgp +application/pics-rules prf +application/pkcs10 +application/pkcs7-mime +application/pkcs7-signature +application/pkix-cert +application/pkix-crl +application/pkixcmp +application/policy+xml +application/postscript ps ai eps +application/prs.alvestrand.titrax-sheet +application/prs.cww +application/prs.nprend +application/qsig +application/rar rar +application/rdf+xml rdf +application/remote-printing +application/riscos +application/rss+xml rss +application/rtf +application/sdp +application/set-payment +application/set-payment-initiation +application/set-registration +application/set-registration-initiation +application/sgml +application/sgml-open-catalog +application/sieve +application/slate +application/smil smi smil +application/timestamp-query +application/timestamp-reply +application/vemmi +application/whoispp-query +application/whoispp-response +application/wita +application/wordperfect wpd +application/wordperfect5.1 wp5 +application/x400-bp +application/xhtml+xml xhtml xht +application/xml xml xsl xslt jrxml +application/xml-dtd +application/xml-external-parsed-entity +application/zip zip +application/vnd.3M.Post-it-Notes +application/vnd.accpac.simply.aso +application/vnd.accpac.simply.imp +application/vnd.acucobol +application/vnd.aether.imp +application/vnd.anser-web-certificate-issue-initiation +application/vnd.anser-web-funds-transfer-initiation +application/vnd.audiograph +application/vnd.bmi +application/vnd.businessobjects +application/vnd.canon-cpdl +application/vnd.canon-lips +application/vnd.cinderella cdy +application/vnd.claymore +application/vnd.commerce-battelle +application/vnd.commonspace +application/vnd.comsocaller +application/vnd.contact.cmsg +application/vnd.cosmocaller +application/vnd.ctc-posml +application/vnd.cups-postscript +application/vnd.cups-raster +application/vnd.cups-raw +application/vnd.cybank +application/vnd.dna +application/vnd.dpgraph +application/vnd.dxr +application/vnd.ecdis-update +application/vnd.ecowin.chart +application/vnd.ecowin.filerequest +application/vnd.ecowin.fileupdate +application/vnd.ecowin.series +application/vnd.ecowin.seriesrequest +application/vnd.ecowin.seriesupdate +application/vnd.enliven +application/vnd.epson.esf +application/vnd.epson.msf +application/vnd.epson.quickanime +application/vnd.epson.salt +application/vnd.epson.ssf +application/vnd.ericsson.quickcall +application/vnd.eudora.data +application/vnd.fdf +application/vnd.ffsns +application/vnd.flographit +application/vnd.framemaker +application/vnd.fsc.weblaunch +application/vnd.fujitsu.oasys +application/vnd.fujitsu.oasys2 +application/vnd.fujitsu.oasys3 +application/vnd.fujitsu.oasysgp +application/vnd.fujitsu.oasysprs +application/vnd.fujixerox.ddd +application/vnd.fujixerox.docuworks +application/vnd.fujixerox.docuworks.binder +application/vnd.fut-misnet +application/vnd.grafeq +application/vnd.groove-account +application/vnd.groove-identity-message +application/vnd.groove-injector +application/vnd.groove-tool-message +application/vnd.groove-tool-template +application/vnd.groove-vcard +application/vnd.hhe.lesson-player +application/vnd.hp-HPGL +application/vnd.hp-PCL +application/vnd.hp-PCLXL +application/vnd.hp-hpid +application/vnd.hp-hps +application/vnd.httphone +application/vnd.hzn-3d-crossword +application/vnd.ibm.MiniPay +application/vnd.ibm.afplinedata +application/vnd.ibm.modcap +application/vnd.informix-visionary +application/vnd.intercon.formnet +application/vnd.intertrust.digibox +application/vnd.intertrust.nncp +application/vnd.intu.qbo +application/vnd.intu.qfx +application/vnd.irepository.package+xml +application/vnd.is-xpr +application/vnd.japannet-directory-service +application/vnd.japannet-jpnstore-wakeup +application/vnd.japannet-payment-wakeup +application/vnd.japannet-registration +application/vnd.japannet-registration-wakeup +application/vnd.japannet-setstore-wakeup +application/vnd.japannet-verification +application/vnd.japannet-verification-wakeup +application/vnd.koan +application/vnd.lotus-1-2-3 +application/vnd.lotus-approach +application/vnd.lotus-freelance +application/vnd.lotus-notes +application/vnd.lotus-organizer +application/vnd.lotus-screencam +application/vnd.lotus-wordpro +application/vnd.mcd +application/vnd.mediastation.cdkey +application/vnd.meridian-slingshot +application/vnd.mif +application/vnd.minisoft-hp3000-save +application/vnd.mitsubishi.misty-guard.trustweb +application/vnd.mobius.daf +application/vnd.mobius.dis +application/vnd.mobius.msl +application/vnd.mobius.plc +application/vnd.mobius.txf +application/vnd.motorola.flexsuite +application/vnd.motorola.flexsuite.adsi +application/vnd.motorola.flexsuite.fis +application/vnd.motorola.flexsuite.gotap +application/vnd.motorola.flexsuite.kmr +application/vnd.motorola.flexsuite.ttc +application/vnd.motorola.flexsuite.wem +application/vnd.mozilla.xul+xml xul +application/vnd.ms-artgalry +application/vnd.ms-asf +application/vnd.ms-excel xls xlb xlt +application/vnd.ms-lrm +application/vnd.ms-pki.seccat cat +application/vnd.ms-pki.stl stl +application/vnd.ms-powerpoint ppt pps +application/vnd.ms-project +application/vnd.ms-tnef +application/vnd.ms-works +application/vnd.mseq +application/vnd.msign +application/vnd.music-niff +application/vnd.musician +application/vnd.netfpx +application/vnd.noblenet-directory +application/vnd.noblenet-sealer +application/vnd.noblenet-web +application/vnd.novadigm.EDM +application/vnd.novadigm.EDX +application/vnd.novadigm.EXT +application/vnd.oasis.opendocument.chart odc +application/vnd.oasis.opendocument.database odb +application/vnd.oasis.opendocument.formula odf +application/vnd.oasis.opendocument.graphics odg +application/vnd.oasis.opendocument.graphics-template otg +application/vnd.oasis.opendocument.image odi +application/vnd.oasis.opendocument.presentation odp +application/vnd.oasis.opendocument.presentation-template otp +application/vnd.oasis.opendocument.spreadsheet ods +application/vnd.oasis.opendocument.spreadsheet-template ots +application/vnd.oasis.opendocument.text odt +application/vnd.oasis.opendocument.text-master odm +application/vnd.oasis.opendocument.text-template ott +application/vnd.oasis.opendocument.text-web oth +application/vnd.osa.netdeploy +application/vnd.palm +application/vnd.pg.format +application/vnd.pg.osasli +application/vnd.powerbuilder6 +application/vnd.powerbuilder6-s +application/vnd.powerbuilder7 +application/vnd.powerbuilder7-s +application/vnd.powerbuilder75 +application/vnd.powerbuilder75-s +application/vnd.previewsystems.box +application/vnd.publishare-delta-tree +application/vnd.pvi.ptid1 +application/vnd.pwg-xhtml-print+xml +application/vnd.rapid +application/vnd.rim.cod cod +application/vnd.s3sms +application/vnd.seemail +application/vnd.shana.informed.formdata +application/vnd.shana.informed.formtemplate +application/vnd.shana.informed.interchange +application/vnd.shana.informed.package +application/vnd.smaf mmf +application/vnd.sss-cod +application/vnd.sss-dtf +application/vnd.sss-ntf +application/vnd.stardivision.calc sdc +application/vnd.stardivision.draw sda +application/vnd.stardivision.impress sdd sdp +application/vnd.stardivision.math smf +application/vnd.stardivision.writer sdw vor +application/vnd.stardivision.writer-global sgl +application/vnd.street-stream +application/vnd.sun.xml.calc sxc +application/vnd.sun.xml.calc.template stc +application/vnd.sun.xml.draw sxd +application/vnd.sun.xml.draw.template std +application/vnd.sun.xml.impress sxi +application/vnd.sun.xml.impress.template sti +application/vnd.sun.xml.math sxm +application/vnd.sun.xml.writer sxw +application/vnd.sun.xml.writer.global sxg +application/vnd.sun.xml.writer.template stw +application/vnd.svd +application/vnd.swiftview-ics +application/vnd.symbian.install sis +application/vnd.triscape.mxs +application/vnd.trueapp +application/vnd.truedoc +application/vnd.tve-trigger +application/vnd.ufdl +application/vnd.uplanet.alert +application/vnd.uplanet.alert-wbxml +application/vnd.uplanet.bearer-choice +application/vnd.uplanet.bearer-choice-wbxml +application/vnd.uplanet.cacheop +application/vnd.uplanet.cacheop-wbxml +application/vnd.uplanet.channel +application/vnd.uplanet.channel-wbxml +application/vnd.uplanet.list +application/vnd.uplanet.list-wbxml +application/vnd.uplanet.listcmd +application/vnd.uplanet.listcmd-wbxml +application/vnd.uplanet.signal +application/vnd.vcx +application/vnd.vectorworks +application/vnd.vidsoft.vidconference +application/vnd.visio vsd +application/vnd.vividence.scriptfile +application/vnd.wap.sic +application/vnd.wap.slc +application/vnd.wap.wbxml wbxml +application/vnd.wap.wmlc wmlc +application/vnd.wap.wmlscriptc wmlsc +application/vnd.webturbo +application/vnd.wrq-hp3000-labelled +application/vnd.wso2.bpel+xml bpel +application/vnd.wso2.bpmn+xml bpmn +application/vnd.wso2.endpoint +application/vnd.wso2.governance-archive gar +application/vnd.wso2-hyperlink +application/vnd.wso2.registry-ext-type+xml rxt +application/vnd.wso2-service+xml +application/vnd.wso2.xpdl+xml xpdl +application/vnd.wt.stf +application/vnd.xara +application/vnd.xfdl +application/vnd.yellowriver-custom-menu +application/x-123 wk +application/x-abiword abw +application/x-apple-diskimage dmg +application/x-bcpio bcpio +application/x-bittorrent torrent +application/x-cdf cdf +application/x-cdlink vcd +application/x-chess-pgn pgn +application/x-core +application/x-cpio cpio +application/x-csh csh +application/x-debian-package deb udeb +application/x-director dcr dir dxr +application/x-dms dms +application/x-doom wad +application/x-dvi dvi +application/x-executable +application/x-flac flac +application/x-font pfa pfb gsf pcf pcf.Z +application/x-freemind mm +application/x-futuresplash spl +application/x-gnumeric gnumeric +application/x-go-sgf sgf +application/x-graphing-calculator gcf +application/x-gtar gtar tgz taz +application/x-hdf hdf +application/x-httpd-php phtml pht php +application/x-httpd-php-source phps +application/x-httpd-php3 php3 +application/x-httpd-php3-preprocessed php3p +application/x-httpd-php4 php4 +application/x-httpd-eruby rhtml +application/x-ica ica +application/x-internet-signup ins isp +application/x-iphone iii +application/x-iso9660-image iso +application/x-java-applet +application/x-java-bean +application/x-java-jnlp-file jnlp +application/x-javascript js +application/x-jmol jmz +application/x-kchart chrt +application/x-kdelnk +application/x-killustrator kil +application/x-koan skp skd skt skm +application/x-kpresenter kpr kpt +application/x-kspread ksp +application/x-kword kwd kwt +application/x-latex latex +application/x-lha lha +application/x-lzh lzh +application/x-lzx lzx +application/x-maker frm maker frame fm fb book fbdoc +application/x-mif mif +application/x-ms-wmd wmd +application/x-ms-wmz wmz +application/x-msdos-program com exe bat dll +application/x-msi msi +application/x-netcdf nc +application/x-ns-proxy-autoconfig pac +application/x-nwc nwc +application/x-object o +application/x-oz-application oza +application/x-pkcs7-certreqresp p7r +application/x-pkcs7-crl crl +application/x-python-code pyc pyo +application/x-quicktimeplayer qtl +application/x-redhat-package-manager rpm +application/x-rx +application/x-sh sh +application/x-shar shar +application/x-shellscript +application/x-shockwave-flash swf swfl +application/x-stuffit sit +application/x-sv4cpio sv4cpio +application/x-sv4crc sv4crc +application/x-tar tar +application/x-tcl tcl +application/x-tex-gf gf +application/x-tex-pk pk +application/x-texinfo texinfo texi +application/x-trash ~ % bak old sik +application/x-troff t tr roff +application/x-troff-man man +application/x-troff-me me +application/x-troff-ms ms +application/x-ustar ustar +application/x-videolan +application/x-wais-source src +application/x-wingz wz +application/x-x509-ca-cert crt +application/x-xcf xcf +application/x-xfig fig +application/x-xpinstall xpi +application/x-xsd+xml xsd + +audio/32kadpcm +audio/basic au snd +audio/g.722.1 +audio/l16 +audio/midi mid midi kar +audio/mp4a-latm +audio/mpa-robust +audio/mpeg mpga mpega mp2 mp3 m4a +audio/mpegurl m3u +audio/parityfec +audio/prs.sid sid +audio/telephone-event +audio/tone +audio/vnd.cisco.nse +audio/vnd.cns.anp1 +audio/vnd.cns.inf1 +audio/vnd.digital-winds +audio/vnd.everad.plj +audio/vnd.lucent.voice +audio/vnd.nortel.vbk +audio/vnd.nuera.ecelp4800 +audio/vnd.nuera.ecelp7470 +audio/vnd.nuera.ecelp9600 +audio/vnd.octel.sbc +audio/vnd.qcelp +audio/vnd.rhetorex.32kadpcm +audio/vnd.vmx.cvsd +audio/x-aiff aif aiff aifc +audio/x-gsm gsm +audio/x-mpegurl m3u +audio/x-ms-wma wma +audio/x-ms-wax wax +audio/x-pn-realaudio-plugin +audio/x-pn-realaudio ra rm ram +audio/x-realaudio ra +audio/x-scpls pls +audio/x-sd2 sd2 +audio/x-wav wav + +chemical/x-alchemy alc +chemical/x-cache cac cache +chemical/x-cache-csf csf +chemical/x-cactvs-binary cbin cascii ctab +chemical/x-cdx cdx +chemical/x-cerius cer +chemical/x-chem3d c3d +chemical/x-chemdraw chm +chemical/x-cif cif +chemical/x-cmdf cmdf +chemical/x-cml cml +chemical/x-compass cpa +chemical/x-crossfire bsd +chemical/x-csml csml csm +chemical/x-ctx ctx +chemical/x-cxf cxf cef +#chemical/x-daylight-smiles smi +chemical/x-embl-dl-nucleotide emb embl +chemical/x-galactic-spc spc +chemical/x-gamess-input inp gam gamin +chemical/x-gaussian-checkpoint fch fchk +chemical/x-gaussian-cube cub +chemical/x-gaussian-input gau gjc gjf +chemical/x-gaussian-log gal +chemical/x-gcg8-sequence gcg +chemical/x-genbank gen +chemical/x-hin hin +chemical/x-isostar istr ist +chemical/x-jcamp-dx jdx dx +chemical/x-kinemage kin +chemical/x-macmolecule mcm +chemical/x-macromodel-input mmd mmod +chemical/x-mdl-molfile mol +chemical/x-mdl-rdfile rd +chemical/x-mdl-rxnfile rxn +chemical/x-mdl-sdfile sd sdf +chemical/x-mdl-tgf tgf +#chemical/x-mif mif +chemical/x-mmcif mcif +chemical/x-mol2 mol2 +chemical/x-molconn-Z b +chemical/x-mopac-graph gpt +chemical/x-mopac-input mop mopcrt mpc dat zmt +chemical/x-mopac-out moo +chemical/x-mopac-vib mvb +chemical/x-ncbi-asn1 asn +chemical/x-ncbi-asn1-ascii prt ent +chemical/x-ncbi-asn1-binary val aso +chemical/x-ncbi-asn1-spec asn +chemical/x-pdb pdb ent +chemical/x-rosdal ros +chemical/x-swissprot sw +chemical/x-vamas-iso14976 vms +chemical/x-vmd vmd +chemical/x-xtel xtel +chemical/x-xyz xyz + +image/cgm +image/g3fax +image/gif gif +image/ief ief +image/jpeg jpeg jpg jpe +image/naplps +image/pcx pcx +image/png png +image/prs.btif +image/prs.pti +image/svg+xml svg svgz +image/tiff tiff tif +image/vnd.cns.inf2 +image/vnd.djvu djvu djv +image/vnd.dwg +image/vnd.dxf +image/vnd.fastbidsheet +image/vnd.fpx +image/vnd.fst +image/vnd.fujixerox.edmics-mmr +image/vnd.fujixerox.edmics-rlc +image/vnd.mix +image/vnd.net-fpx +image/vnd.svf +image/vnd.wap.wbmp wbmp +image/vnd.xiff +image/x-cmu-raster ras +image/x-coreldraw cdr +image/x-coreldrawpattern pat +image/x-coreldrawtemplate cdt +image/x-corelphotopaint cpt +image/x-icon ico +image/x-jg art +image/x-jng jng +image/x-ms-bmp bmp +image/x-photoshop psd +image/x-portable-anymap pnm +image/x-portable-bitmap pbm +image/x-portable-graymap pgm +image/x-portable-pixmap ppm +image/x-rgb rgb +image/x-xbitmap xbm +image/x-xpixmap xpm +image/x-xwindowdump xwd + +inode/chardevice +inode/blockdevice +inode/directory-locked +inode/directory +inode/fifo +inode/socket + +message/delivery-status +message/disposition-notification +message/external-body +message/http +message/s-http +message/news +message/partial +message/rfc822 + +model/iges igs iges +model/mesh msh mesh silo +model/vnd.dwf +model/vnd.flatland.3dml +model/vnd.gdl +model/vnd.gs-gdl +model/vnd.gtw +model/vnd.mts +model/vnd.vtu +model/vrml wrl vrml + +multipart/alternative +multipart/appledouble +multipart/byteranges +multipart/digest +multipart/encrypted +multipart/form-data +multipart/header-set +multipart/mixed +multipart/parallel +multipart/related +multipart/report +multipart/signed +multipart/voice-message + +text/calendar ics icz +text/comma-separated-values csv +text/css css +text/directory +text/english +text/enriched +text/h323 323 +text/html html htm shtml +text/iuls uls +text/mathml mml +text/parityfec +text/plain asc txt text diff pot sql +text/prs.lines.tag +text/rfc822-headers +text/richtext rtx +text/rtf rtf +text/scriptlet sct wsc +text/t140 +text/texmacs tm ts +text/tab-separated-values tsv +text/uri-list +text/vnd.abc +text/vnd.curl +text/vnd.DMClientScript +text/vnd.flatland.3dml +text/vnd.fly +text/vnd.fmi.flexstor +text/vnd.in3d.3dml +text/vnd.in3d.spot +text/vnd.IPTC.NewsML +text/vnd.IPTC.NITF +text/vnd.latex-z +text/vnd.motorola.reflex +text/vnd.ms-mediapackage +text/vnd.sun.j2me.app-descriptor jad +text/vnd.wap.si +text/vnd.wap.sl +text/vnd.wap.wml wml +text/vnd.wap.wmlscript wmls +text/x-bibtex bib +text/x-boo boo +text/x-c++hdr h++ hpp hxx hh +text/x-c++src c++ cpp cxx cc +text/x-chdr h +text/x-component htc +text/x-crontab +text/x-csh csh +text/x-csrc c +text/x-dsrc d +text/x-haskell hs +text/x-java java +text/x-literate-haskell lhs +text/x-makefile +text/x-moc moc +text/x-pascal p pas +text/x-pcs-gcd gcd +text/x-perl pl pm +text/x-python py +text/x-server-parsed-html +text/x-setext etx +text/x-sh sh +text/x-tcl tcl tk +text/x-tex tex ltx sty cls +text/x-vcalendar vcs +text/x-vcard vcf + +video/dl dl +video/dv dif dv +video/fli fli +video/gl gl +video/mpeg mpeg mpg mpe +video/mp4 mp4 +video/quicktime qt mov +video/mp4v-es +video/parityfec +video/pointer +video/vnd.fvt +video/vnd.motorola.video +video/vnd.motorola.videop +video/vnd.mpegurl mxu +video/vnd.mts +video/vnd.nokia.interleaved-multimedia +video/vnd.vivo +video/x-la-asf lsf lsx +video/x-mng mng +video/x-ms-asf asf asx +video/x-ms-wm wm +video/x-ms-wmv wmv +video/x-ms-wmx wmx +video/x-ms-wvx wvx +video/x-msvideo avi +video/x-sgi-movie movie + +x-conference/x-cooltalk ice + +x-world/x-vrml vrm vrml wrl diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options new file mode 100644 index 0000000000..ba8e3c6c20 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options @@ -0,0 +1,95 @@ +#### Debugging options for org.eclipse.osgi + +# Turn on general debugging for org.eclipse.osgi +org.eclipse.osgi/debug=true +# Prints out class loading debug information +org.eclipse.osgi/debug/loader=false +# Prints out event (FrameworkEvent/BundleEvent/ServiceEvent) and listener debug information +org.eclipse.osgi/debug/events=false +# Prints out OSGi service debug information (registration/getting/ungetting etc.) +org.eclipse.osgi/debug/services=false +# Prints out bundle manifest parsing debug information +org.eclipse.osgi/debug/manifest=false +# Prints out LDAP filter debug information +org.eclipse.osgi/debug/filter=false +# Prints out security (PermissionAdmin service) debug information +org.eclipse.osgi/debug/security=false +# Prints out start level service debug information +org.eclipse.osgi/debug/startlevel=true +# Prints out package admin service debug information +org.eclipse.osgi/debug/packageadmin=false +# Prints out timing information for bundle activation +org.eclipse.osgi/debug/bundleTime=false +# Debug the loading of message bundles +org.eclipse.osgi/debug/messageBundles=false + +# Eclipse adaptor options +org.eclipse.osgi/eclipseadaptor/debug = false +org.eclipse.osgi/eclipseadaptor/debug/location = false +org.eclipse.osgi/eclipseadaptor/debug/platformadmin=false +org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver=false +org.eclipse.osgi/eclipseadaptor/converter/debug = false + +### OSGi resolver options +# Turns on debugging for the resolver +org.eclipse.osgi/resolver/debug = false +# Prints out wiring information after the resolver has completed the resolve process +org.eclipse.osgi/resolver/wiring = false +# Prints out Import-Package information +org.eclipse.osgi/resolver/imports = false +# Prints out Require-Bundle information +org.eclipse.osgi/resolver/requires = false +# Prints out package grouping information form the "uses" clause +org.eclipse.osgi/resolver/grouping = false +# Prints out cycle information +org.eclipse.osgi/resolver/cycles = false +# Prints out Eclipse-GenericRequire information +org.eclipse.osgi/resolver/generics = false + +#### Profile settings +org.eclipse.osgi/profile/startup = false +org.eclipse.osgi/profile/benchmark = false +org.eclipse.osgi/profile/debug = true + +# Override the default implemenation +org.eclipse.osgi/profile/impl = org.eclipse.osgi.internal.profile.DefaultProfileLogger + +# Append all profile messages to the filename specified +org.eclipse.osgi/defaultprofile/logfilename = + +# Output all profile log messages synchronously to the jvm console. +# By default, all log messages are cached until the log buffer is +# requested. +org.eclipse.osgi/defaultprofile/logsynchronously = false + +# Specify the size of the default profile implementation log buffer. +org.eclipse.osgi/defaultprofile/buffersize = 256 + +#### Monitoring settings +# monitor class loading +org.eclipse.osgi/monitor/classes=false + +# monitor bundle activation +org.eclipse.osgi/monitor/activation=false + +# monitor resource bundle (*.properties) loading +org.eclipse.osgi/monitor/resources=false + + +#### Trace settings +# trace class loading - snapshot the execution stack when a class is loaded +org.eclipse.osgi/trace/classLoading=false + +# trace location - file in which execution traces are written +org.eclipse.osgi/trace/filename=runtime.traces + +# trace filters - Java properties file defining which classes should +# be traced (if trace/classLoading is true) +# File format: +# plugins= +# packages= +# Note that there may be many 'plugins' and 'packages' lines in one file. +org.eclipse.osgi/trace/filters=trace.properties + +# trace bundle activation - snapshot the execution stack when a bundle is activated +org.eclipse.osgi/trace/activation=false diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml new file mode 100644 index 0000000000..dec2307f1d --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml @@ -0,0 +1,51 @@ + + + + AUTO + + + 2 + + + + org.wso2.carbon.ntask.core.impl.RoundRobinTaskLocationResolver + + + + + + + https://localhost:9448 + + + https://localhost:9443 + + + admin + + + admin + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties new file mode 100644 index 0000000000..9cff0ddf72 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties @@ -0,0 +1,165 @@ +# +# Copyright 2009 WSO2, Inc. (http://wso2.com) +# +# Licensed 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. +# + +# +# This is the log4j configuration file used by WSO2 Carbon +# +# IMPORTANT : Please do not remove or change the names of any +# of the Appenders defined here. The layout pattern & log file +# can be changed using the WSO2 Carbon Management Console, and those +# settings will override the settings in this file. +# + +log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG + +log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE +log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE +log4j.logger.org.apache=INFO, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.catalina=WARN +log4j.logger.org.apache.tomcat=WARN +log4j.logger.org.wso2.carbon.apacheds=WARN +log4j.logger.org.apache.directory.server.ldap=ERROR +log4j.logger.org.apache.directory.server.core.event=WARN +log4j.logger.com.atomikos=INFO,ATOMIKOS +log4j.logger.org.quartz=WARN +log4j.logger.org.apache.jackrabbit.webdav=WARN +log4j.logger.org.apache.juddi=ERROR +log4j.logger.org.apache.commons.digester.Digester=WARN +log4j.logger.org.apache.jasper.compiler.TldLocationsCache=WARN +log4j.logger.org.apache.qpid=WARN +log4j.logger.org.apache.qpid.server.Main=INFO +log4j.logger.qpid.message=WARN +log4j.logger.qpid.message.broker.listening=INFO +log4j.logger.org.apache.tiles=WARN +log4j.logger.org.apache.commons.httpclient=ERROR +log4j.logger.org.apache.coyote=WARN +log4j.logger.org.apache.solr=ERROR +log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=ERROR +log4j.logger.org.wso2=INFO +log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_LOGFILE, CARBON_MEMORY +#Following are to remove false error messages from startup (IS) +log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.core.DefaultDirectoryService=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.core=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.ldap.LdapSession=ERROR, CARBON_LOGFILE, CARBON_MEMORY +#Hive Related Log configurations +log4j.logger.DataNucleus=ERROR +log4j.logger.Datastore=ERROR +log4j.logger.Datastore.Schema=ERROR +log4j.logger.JPOX.Datastore=ERROR +log4j.logger.JPOX.Plugin=ERROR +log4j.logger.JPOX.MetaData=ERROR +log4j.logger.JPOX.Query=ERROR +log4j.logger.JPOX.General=ERROR +log4j.logger.JPOX.Enhancer=ERROR +log4j.logger.org.apache.hadoop.hive=WARN +log4j.logger.hive=WARN +log4j.logger.ExecMapper=WARN +log4j.logger.ExecReducer=WARN +log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR + +log4j.logger.trace.messages=TRACE,CARBON_TRACE_LOGFILE + +log4j.additivity.org.apache.axis2.clustering=false +log4j.additivity.com.atomikos=false +log4j.additivity.org.apache=false + +# CARBON_CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.CARBON_CONSOLE=org.wso2.carbon.utils.logging.appenders.CarbonConsoleAppender +log4j.appender.CARBON_CONSOLE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +# ConversionPattern will be overridden by the configuration setting in the DB +log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m%n +log4j.appender.CARBON_CONSOLE.layout.TenantPattern=%U%@%D[%T] +log4j.appender.CARBON_CONSOLE.threshold=DEBUG + +# CARBON_MEMORY is set to be a MemoryAppender using a PatternLayout. +log4j.appender.CARBON_MEMORY=org.wso2.carbon.utils.logging.appenders.MemoryAppender +log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout +log4j.appender.CARBON_MEMORY.bufferSize=200 +# ConversionPattern will be overridden by the configuration setting in the DB +#log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p - %x %m {%c}%n +log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n +log4j.appender.CARBON_MEMORY.threshold=DEBUG + + +# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout. +log4j.appender.CARBON_LOGFILE=org.wso2.carbon.utils.logging.appenders.CarbonDailyRollingFileAppender +# Log file will be overridden by the configuration setting in the DB +# This path should be relative to WSO2 Carbon Home +log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon${instance.log}.log +log4j.appender.CARBON_LOGFILE.Append=true +log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +# ConversionPattern will be overridden by the configuration setting in the DB +log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m %n +log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] +log4j.appender.CARBON_LOGFILE.threshold=DEBUG + +log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender +log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout +log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n +log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost +log4j.appender.CARBON_SYS_LOG.Facility=USER +log4j.appender.CARBON_SYS_LOG.threshold=DEBUG + +# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT +log4j.appender.LOGEVENT=org.wso2.carbon.logging.service.appender.LogEventAppender +log4j.appender.LOGEVENT.url=tcp://10.100.3.103:7611 +log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace +log4j.appender.LOGEVENT.userName=admin +log4j.appender.LOGEVENT.password=admin +#log4j.appender.LOGEVENT.password=secretAlias:Log4j.Appender.LOGEVENT.Password + +# Appender config to CARBON_TRACE_LOGFILE +log4j.appender.CARBON_TRACE_LOGFILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.CARBON_TRACE_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon-trace-messages${instance.log}.log +log4j.appender.CARBON_TRACE_LOGFILE.Append=true +log4j.appender.CARBON_TRACE_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +log4j.appender.CARBON_TRACE_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m %n +log4j.appender.CARBON_TRACE_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] +log4j.appender.CARBON_TRACE_LOGFILE.threshold=TRACE +log4j.additivity.trace.messages=false + +# Appender config to AUDIT_LOGFILE +log4j.appender.AUDIT_LOGFILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log +log4j.appender.AUDIT_LOGFILE.Append=true +log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c}- %x %m %n +log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] +log4j.appender.AUDIT_LOGFILE.threshold=INFO +log4j.additivity.AUDIT_LOG=false + +# Appender config to send Atomikos transaction logs to new log file tm.out. +log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender +log4j.appender.ATOMIKOS.File = repository/logs/tm.out +log4j.appender.ATOMIKOS.Append = true +log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout +log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n + +# This file is used to override the default logger settings, and is used to remove unwanted logs from Shindig appearing on the console. + +# Specification of Handler used by Console Logger +handlers=java.util.logging.ConsoleHandler + +# Replacing default INFO level with SEVERE +java.util.logging.ConsoleHandler.level=SEVERE diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/notification-messages.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/notification-messages.xml new file mode 100644 index 0000000000..9b13c5d808 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/notification-messages.xml @@ -0,0 +1,39 @@ + + + Enroll your Device with WSO2 MDM +
Dear {first-name},
+ + You have been registered to the WSO2 MDM. Below is the link to enroll. + + {downloadUrl} + + Best Regards, + + + WSO2 MDM Team. + + + http://www.wso2.com + +
+ + Enroll your Device with WSO2 MDM +
Dear {first-name},
+ +You have been registered to WSO2 MDM with following credentials. +Username: {user-name} +Password: {password} +Below is the link to enroll. + + {downloadUrl} + + Best Regards, + + + WSO2 MDM Team. + + + http://www.wso2.com + +
+
\ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml new file mode 100644 index 0000000000..01ffe07c15 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml @@ -0,0 +1,100 @@ + + + + + + + + wso2registry + false + true + / + + + jdbc/WSO2CarbonDB + + + + + + + + + + + + false + + + + true + true + true + true + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml new file mode 100644 index 0000000000..d31486f99e --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml @@ -0,0 +1,73 @@ + + + + + + + + + + 5 + + + + + 10 + + /carbon/admin/login.jsp + carbonServer + https://localhost:9443/samlsso + urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/wso2certs.jks b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/wso2certs.jks new file mode 100644 index 0000000000000000000000000000000000000000..c1e9ace3c233ac4cafac5aa1d11dc4656a6ce6db GIT binary patch literal 9521 zcmeHrRZv{*vi1xEgu!8O_XHm-cyM=jcXtRHEV#S76D+s|4IbPzI0OqWK~6r|yY_$n zQ+4i6?TcNt)gay*UU;u$|0N6mVefZ^*($2>;N@!*E-s_oyK-yetW5b0oyveBaGPZE> zCJkDmXMJ4%6{_3TLljA9_jess!ldHj+2Ros*qHBJr@5<>+!xPru1mHOF0C|Gc1Dm= zwL?1(U-{XEfS*g4N)g#|>F#l%UQDJhC8eDAXasA@aWA#%?dj>1i66R3n6gB8WG=L6 zXhHa_1y@3mLAY=2Xzseo3j^B=Nn7)%KO4pD)4&0;+nSek2vSDZ1ht~FIS{FDDnzVbz3XyJ2kpR~G2h{UEaObQC+Of}#Bi`xDJ5hl zw27V47+4TyDF8dw>kFh``Gs3EiC%qs5osw1W92TI?bujV5Kc| zM1Sz-$h7ad&#l_inU=f1Qfp`91**$}5L44i%)LLKHbl|CdqtZ)mc{1&?m6vl#r}xs z`6s*&L#?B(8@}}yDQ7s$e)=VNM~S>2CzB^Vd@y?81q=cD4fD(^;H0?Ca92W#kgi3? z;Kr3X60TYnop^yzwp1vl=r?B5!ARX*^P9Q)d7Q?*w0$7@XLM?$f6y? zSf7&hq{DF5kepD)7HM?$*NxF&?CmBmhXm~3*C8#Jqvj&mLbJx@6EEyl_yQ^$bjuGf z(l#P?7t)PC{t_HbZ`*zs_A_ItabNp&3^C%gY+u#;H%e9FB;HpX+_I<89hM10<^y>8UdzNPa>f{=OPorf^4Q@1N5QV= zD<1{F;QdKlV=1LK-l3GS$#3+)Zpqda;!Q}3Q%D>65~77G6AmNKQa-lz3Vczqdg*13 zxNBbzVhpAe-mb5U{&>*rzTcRd!u)oA);~j&S@^zQdyIs?@4~6_cxx$Elqv02nP4^g z*LsR*b3RV~ zz#l?hOJlK3u-o&5hbs(D0v3#7}%l12a`#b=RuNu(DZ#je9RZ}i@YBq$e-SxdNmDv&P zU(u#9RwTc?V?K>oK)Kk%vMK(sR~BU5GZ}ajf?d%=Co;`GVK<%gy2;HuIqIP0I(N!* z^Zfe#UK+f?6CXQLyTYEtRiRw&u2DUcqnp-Vo^@(lk-Y^UIp(BwB$We!Ir&cNFh~Ai zUiTJq&~z}V>X~?4_+-QL(;ETk&X&tyL_$2H%1`nW6kGkEx-{+|B7OY^6g>A zFYZ0UJdS>ZBGc)?JUfq{HO)PeZ=2nbJvqr`r;T}>Y~Hd=HiQ_U=(^hu?(L!XIf_1# zDqos~f2%)IeX&anHKNp;89!y;Y9_dA|BQ2K+2w2gpg{UKsXLp1df-$Dd>D=%s&a%G zp`JR70Xeufo{=G+phi0cZ!8o{G?Xw5Ya3H;jT}QXgi5z&q;}sCsJ!x)%7ICreb|6& zI{n$5+8P%OZpOsXXUqF4%~Sqd7o~*W_Ew}sq#j3>|6O0g%4)e-DgkQ_xoWW-;5uIM z(PFR@3A;e$%-dQZaT`42CAQMb(3vt;eia7r^d_&kV(iu;tJrHa!41-U*!FeuVQ|}~ z;Ci>4M!&ViYv%+xDm*LI zl$~=%WqQj;*2YrE6}MD=A8XXr!5Vvweaw;Mff{PO5co8lAzbIj)ZRm$*T`lEV-{BeXoq4E#s#b&dsYXJuI->bX?lGej@$FX7vg%+B zbByx9ulc!keblhE!f{*kx>|AsvsuaNlVC+6>RV}q4EA7him_&)BUm1uuM9jh2nLn9 zD6MgY2BbH1(#;mOe$Q(UBLS~seS`{dmgPPZW$K1l7daN6D!@}5^b9x&`}4jLikp12 zLMq8-UrbfQlmsHW7uj}Tjy|v&Lc{iNm73wIbwBykp<5~pr87^7uS?g-k-+|v<=gwJ zY_sQa9v<0i^d%3TZ1m1kcf4cXZ*~mk4oR5QxCU*tchtLL`T5J5BC~koyGgNG!5oS2 z7e`11+E~G1wE8Z5OQRhl7i(gQmA6$LjT)kAnXjbgC>cG{OwsA$ZsrQ`gv{VxyNAh4 z)uf{LV~vVY>K$Q_K0`|v(%D5FgN@N?7_hy}_Hi9~wyUv^DisX)Leh@L-Rth>xKo3& z@Z?&YryUHLLAzQgDXP=zC6R+TbLx3z12sLqCLOUB`6_bk#BP2FnN-ZCWRgf`8ybzv z$mvk%Wyiu(HZj=a>cguq?Yu0~G zXmFZL98him0PYhs5Uvaw2#U)C!2n@?KTs5SFkOgb$Sun6@eB?C4Txkxf`Z{eYOwGS z7&R3Z6e!Xk0s;h9)y&29AL6UOMGPp~A67&N!XH*L1!oHu94OWwDkKQXpDG7u3oa%CYhMP~AlfZvv)}^PKuTXa5j|0- z>J6E9cX>WzM|%eI@u}NiOpyv6 z%pPgAHwyj^@-{USH@`i=u&hZ-5+>JiU-m7j7k<$^6{Qt zSiv6~A!R8>Ot(?9Yvft-dj2AXA-cHuwo}7wTY!jh^eV&@vF*r47_=As@MWV;-okSG zO+Z=Dy(|vRFZE6nHo$1(K*L@BjeJ(?C6d$QnNq5}0h-eqKX=x+R%7>%Y2cX(J8#|j zOyF*E&gLA({7oSV%iWDDit}-uXAj@L*pGkXF;c$$^kWX{FlDq*U5oZ0OH-!i=RO z6S>rkx-OB$=bCxQnsGBvcg)O1%<7N6RlT|zix~dswXau8%fQu}ffPe(J`B2a0jlaay$Xv2f2(f4sWi6RH z&s|>|Io?gIA6Pp%JDyX)6=d2CA?CsQc8cmV(cG|Lb+8L zShOMxy~;`u3Lp+hPZ1~{Vtb}2;2F;ik%&uU1gMbTf%w-hm`qbQQMD~*7BtsSWh_A! zG%P}jJFz(yHLrp_;?;TFnZKm!VCCRgJDcO5sEbdJy_WnM+3t94!K?G^=XU|PZXZPU zf}hhe7-7efz8Xyec`GxrHM*{HXGX6&vzHvn3K3-h-i^lS_s>BJ%7)}#1lZw*`HY$R z84fG%d*vg#?hxQhV*9HDvMKaq-Is@Lqz+S(0dVc+W}Yr~V&jp5X_ zh4Mj+d$%1|{<(LxlZRY95&qGrzldgBK*$qVs|jdAjA7VoNnBnr?xZr)e=|WQIOAv2 z|8%$gy>wD=XK`bbB)SyYyNvL;*cO~^c>Q+g#Q1x3Ku^mKCWwEx`|<~WY#X?ogxSGS zhw}Sre7!`utWzMP($sLv3M7J;eXw|I_SBeS>!wg<_ou4F!@O9gcVPp?tCE)4fZ+$r z9beXoZ}Gyy;}j9VFNg(UayW=Df5EsRR3A$G2aKb_;=p1B1=lXB(vZ`PInb-iX~34X0+4Zh0iJ#>l7jpYto zWU64v(Flw`e;hK-UNWob#8-cakGO3B*)Z#9ahF>5(9J$mS5S-~wj%!4(ajV|+3n@51^0W!d-meN zJMq8;mEt6aBbRNMqFz@hxebTEzr+0fs%kKDZP?x`&-bOyM?o0GtR)fyPQ}c&8z0hb z#DDktyDs@;u3JX12AWB{7twvhY_q2xNL_{qVe4{SOr{}F-y6kJ+|nO;CdoUFM?(T< z#~Chi%3Exou4_rWgb3ZMrpei6mQFO*g*5$%d`97Zh=-1D5GR)gmtuDkw)T#30>AqZ zF;;k0J~k%90*ieAz{TQ8Sh#9d9(_%?Ih;9L_iiS^RF(YjqZO53x*M$?Z2DkyL%V3# zN|zP&?0wCp0_1`G3qjn^B~O#yULM&l0Al#>A^!J@)#P7RtWsIOSFB;bSFFMR!-~}r zP$81ahw9fU^8K%lrRLtDO+z$NdX|l*$ zpv^?ja_wvb6_b#elRa}EJ()vSBFQ^eJ<&akUskM2dj%t(GVv_FE;TPhQ+o8FT&f0V z8?HmT%&H-g9qw_`i~LIuyLU5ZP0n+p21#3K>JKcg@1pg+OIa7TSOGfBvDU5(T#=$V zR2*rPCRSg^vO6+)#9PVsX?uPq7Qr(p>D9 z?4^2T(x0iS{^PHSR2(c+5FMfL3$q$oz(?Hgw&d*T;_5MRHv+FY zl$*nwT1&YjDnpOyIxfiu#O74;aW-AK@ zIBYnba%6JG|!wH`b)IQMUm609m?+06VRl}j38h$(Zsvl0p z9L+XSF~~S0KI569cdgARK;rC@DP_{mzUjVtB%wy{>1Q$i788+|h|@&YQSnw@Wp3~4 zIq`S(CFsxns9)wY*zq&(^9z|p7Bj{=7BpP`X^a-pXMa#Wwlg5pQs1ScNu=ZnDr9=u zoHD=Sz!c27((p~BZ`UNa(@x6QP8Xy*fG?hZRg>DG0orPbhE zeH>&hcWTq4QBDZvB;KI-++QFiAT2Wk8K6~%G0}TFgwg$Bb?8t~TUl^k%VxQTxU+#4 zQWvKO{<%C?382~8DOMX26a9R#qFi(|L=V~O2i(L5PC zyuUPY;s;m!mJg2)2`^vlCG^({jYjN0F394Lq&v`R6&<~+e?yu;+8C;j#<9uQo%?{J zCI5kL5#|ys{0sPUcHx7Lz0u?vyg??+!)6VnDGYZ%e$W%+iTbzx{QyucCS$ zm?~ie62DdHu=D>E)Zk-LMvB@t{Zw81YWRJf29KQ~H&~=zDK8V!t8AA!ksf>GQSC5^ zG5)-OQR($$;g4G1Vrt$VJUwIpg=CB+BZ9rgZ-NZkwF+}-YgP?zZ}9GixIi6*Il7Kx z(TIp(mV2YhB2my~xbkZwIIBJSDDfP^Iz_L9)Y*xTEZ%Q9W(BF%^A>-JX!Kvc7$-8j=FLCg zA(b&aX4sELeNJ!3Ax)@Ll*`SRrjsX`^5TEZnNv{E-g(WuIoHE9y11k| z&75o*XjwvEkGvBzp5QCS zNwlAld!TLf%8Gf@sGI&<&kP%S_wB8KMFLo2j zUjTk=a})Y9$6yGx_S3q!{OIjbSEpjsE>(vj$o9f{iLXRX@u96tmL)F0cb6$LRDSgw zT)nN5qdK21(Ro*=rHMI7D~8`LQ|5H*65DdsM4AbZx9Uiog;oY5vQExU3*+mkCXS#q zkMM;^py>qnX)FuWvd)Pzy9t9wll{e5?CDS|@Xe+!D_aLV_@~L+%0|jyO&zly6xn3K8pK}&gxzt+i4;ADh2H7`8 z0kT|iJ~@86OCI>O4I6w1n~BP^dJFm4lY}tyMOQJvuIL^nZGUoIXuroD)HC7Kw~%I` z^^)jp#s=w;6>jMwz`aAy;z_lEs~Q)sAQ)Ei)^Jh&Y-Vnk=^~9Uy=;SOkgq;> zzCosRs;4y?Pcxdb;%t~)?9{|lEFcFS4s1?roldA`G>&)8Bu1O8#Agc+Xwp)s-LIRS zw#E0c;LFhA8=v&pnRhcfNrKt^77|jl3UJgu=uJ^I)8|E9Ui;blWXsBB=Oo0LJZ5H;#AlQBRv=O8Q6~9@k+CwyH3sUky?$4laQ;U2UksET7&(w4u>dvb5aE)`0 zuK8xuZK)iv0H?zwM_pe`BP!S5RC^)WWJfTa^pm&VEpo1tSGL;kV{N1KI#kqp-2~@H zfl|6oQw~GvAZw>2ugtgWD(nx^Zu~+Lh-Y`w6k4;%dAjWEaV=cV#-Vh=x6)b2HmoC# zSmzKr2C41G~w)Lua=*Ur1esxS(LI!uZ!k~*myY51v@6FoZy7%QkMTdcGy z4c19CujMz~cV$^>ihm5L-mJy!{OZg{0OGT;=G2*nPfiq}X^79>2pk3|td!{fDjprZuqtSF7Rwu=W42_5ZN- f|FHFcL$+RWtXymmISfJj4%+K5mZF^6vg-IRPnYfV literal 0 HcmV?d00001 diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml new file mode 100644 index 0000000000..056604dd9e --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml @@ -0,0 +1,31 @@ + + + + + + + WEB-INF/web.xml + + + + + + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml new file mode 100644 index 0000000000..456539a6fd --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml @@ -0,0 +1,61 @@ + + + + + + + bridgeservlet + Carbon Bridge Servlet + Carbon Bridge Servlet + org.wso2.carbon.tomcat.ext.servlet.DelegationServlet + + 1 + + + bridgeservlet + /* + + + + bridgeservlet + *.jsp + + + + + CharsetFilter + org.wso2.carbon.tomcat.ext.filter.CharacterSetFilter + + requestEncoding + UTF-8 + + + + + CharsetFilter + /* + + + + 15 + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml new file mode 100644 index 0000000000..8347929309 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml new file mode 100644 index 0000000000..7ef7dbb0a1 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml new file mode 100644 index 0000000000..d4241ef741 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml @@ -0,0 +1,1220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default + org.apache.catalina.servlets.DefaultServlet + + debug + 0 + + + sendfileSize + -1 + + + listings + false + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jsp + org.apache.jasper.servlet.JspServlet + + fork + false + + + xpoweredBy + false + + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jsp + *.jsp + + + + jsp + *.jspx + + + + default + / + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 30 + + + + + + + + + + + + abs + audio/x-mpeg + + + ai + application/postscript + + + aif + audio/x-aiff + + + aifc + audio/x-aiff + + + aiff + audio/x-aiff + + + aim + application/x-aim + + + art + image/x-jg + + + asf + video/x-ms-asf + + + asx + video/x-ms-asf + + + au + audio/basic + + + avi + video/x-msvideo + + + avx + video/x-rad-screenplay + + + bcpio + application/x-bcpio + + + bin + application/octet-stream + + + bmp + image/bmp + + + body + text/html + + + cdf + application/x-cdf + + + cer + application/x-x509-ca-cert + + + class + application/java + + + cpio + application/x-cpio + + + csh + application/x-csh + + + css + text/css + + + dib + image/bmp + + + doc + application/msword + + + dtd + application/xml-dtd + + + dv + video/x-dv + + + dvi + application/x-dvi + + + eps + application/postscript + + + etx + text/x-setext + + + exe + application/octet-stream + + + gif + image/gif + + + gtar + application/x-gtar + + + gz + application/x-gzip + + + hdf + application/x-hdf + + + hqx + application/mac-binhex40 + + + htc + text/x-component + + + htm + text/html + + + html + text/html + + + ief + image/ief + + + jad + text/vnd.sun.j2me.app-descriptor + + + jar + application/java-archive + + + java + text/plain + + + jnlp + application/x-java-jnlp-file + + + jpe + image/jpeg + + + jpeg + image/jpeg + + + jpg + image/jpeg + + + js + application/javascript + + + jsf + text/plain + + + jspf + text/plain + + + kar + audio/x-midi + + + latex + application/x-latex + + + m3u + audio/x-mpegurl + + + mac + image/x-macpaint + + + man + application/x-troff-man + + + mathml + application/mathml+xml + + + me + application/x-troff-me + + + mid + audio/x-midi + + + midi + audio/x-midi + + + mif + application/x-mif + + + mov + video/quicktime + + + movie + video/x-sgi-movie + + + mp1 + audio/x-mpeg + + + mp2 + audio/x-mpeg + + + mp3 + audio/x-mpeg + + + mp4 + video/mp4 + + + mpa + audio/x-mpeg + + + mpe + video/mpeg + + + mpeg + video/mpeg + + + mpega + audio/x-mpeg + + + mpg + video/mpeg + + + mpv2 + video/mpeg2 + + + ms + application/x-wais-source + + + nc + application/x-netcdf + + + oda + application/oda + + + + odb + application/vnd.oasis.opendocument.database + + + + odc + application/vnd.oasis.opendocument.chart + + + + odf + application/vnd.oasis.opendocument.formula + + + + odg + application/vnd.oasis.opendocument.graphics + + + + odi + application/vnd.oasis.opendocument.image + + + + odm + application/vnd.oasis.opendocument.text-master + + + + odp + application/vnd.oasis.opendocument.presentation + + + + ods + application/vnd.oasis.opendocument.spreadsheet + + + + odt + application/vnd.oasis.opendocument.text + + + + otg + application/vnd.oasis.opendocument.graphics-template + + + + oth + application/vnd.oasis.opendocument.text-web + + + + otp + application/vnd.oasis.opendocument.presentation-template + + + + ots + application/vnd.oasis.opendocument.spreadsheet-template + + + + ott + application/vnd.oasis.opendocument.text-template + + + + ogx + application/ogg + + + ogv + video/ogg + + + oga + audio/ogg + + + ogg + audio/ogg + + + spx + audio/ogg + + + flac + audio/flac + + + anx + application/annodex + + + axa + audio/annodex + + + axv + video/annodex + + + xspf + application/xspf+xml + + + pbm + image/x-portable-bitmap + + + pct + image/pict + + + pdf + application/pdf + + + pgm + image/x-portable-graymap + + + pic + image/pict + + + pict + image/pict + + + pls + audio/x-scpls + + + png + image/png + + + pnm + image/x-portable-anymap + + + pnt + image/x-macpaint + + + ppm + image/x-portable-pixmap + + + ppt + application/vnd.ms-powerpoint + + + pps + application/vnd.ms-powerpoint + + + ps + application/postscript + + + psd + image/x-photoshop + + + qt + video/quicktime + + + qti + image/x-quicktime + + + qtif + image/x-quicktime + + + ras + image/x-cmu-raster + + + rdf + application/rdf+xml + + + rgb + image/x-rgb + + + rm + application/vnd.rn-realmedia + + + roff + application/x-troff + + + rtf + application/rtf + + + rtx + text/richtext + + + sh + application/x-sh + + + shar + application/x-shar + + + + smf + audio/x-midi + + + sit + application/x-stuffit + + + snd + audio/basic + + + src + application/x-wais-source + + + sv4cpio + application/x-sv4cpio + + + sv4crc + application/x-sv4crc + + + svg + image/svg+xml + + + svgz + image/svg+xml + + + swf + application/x-shockwave-flash + + + t + application/x-troff + + + tar + application/x-tar + + + tcl + application/x-tcl + + + tex + application/x-tex + + + texi + application/x-texinfo + + + texinfo + application/x-texinfo + + + tif + image/tiff + + + tiff + image/tiff + + + tr + application/x-troff + + + tsv + text/tab-separated-values + + + txt + text/plain + + + ulw + audio/basic + + + ustar + application/x-ustar + + + vxml + application/voicexml+xml + + + xbm + image/x-xbitmap + + + xht + application/xhtml+xml + + + xhtml + application/xhtml+xml + + + xls + application/vnd.ms-excel + + + xml + application/xml + + + xpm + image/x-xpixmap + + + xsl + application/xml + + + xslt + application/xslt+xml + + + xul + application/vnd.mozilla.xul+xml + + + xwd + image/x-xwindowdump + + + vsd + application/x-visio + + + wav + audio/x-wav + + + + wbmp + image/vnd.wap.wbmp + + + + wml + text/vnd.wap.wml + + + + wmlc + application/vnd.wap.wmlc + + + + wmls + text/vnd.wap.wmlscript + + + + wmlscriptc + application/vnd.wap.wmlscriptc + + + wmv + video/x-ms-wmv + + + wrl + x-world/x-vrml + + + wspolicy + application/wspolicy+xml + + + Z + application/x-compress + + + z + application/x-compress + + + zip + application/zip + + + + + + + + + + + + + + + + + + index.html + index.htm + index.jsp + + + \ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml new file mode 100644 index 0000000000..2f7ace692c --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml @@ -0,0 +1,379 @@ + + + + + + true + admin + + admin + admin + + everyone + jdbc/WSO2CarbonDB + + + + + + + org.wso2.carbon.user.core.tenant.JDBCTenantManager + false + 100 + false + default + SHA-256 + true + true + true + false + ^[\S]{5,30}$ + Password length should be between 5 to 30 characters + ^[\S]{5,30}$ + [a-zA-Z0-9._-|//]{3,30}$ + ^[\S]{3,30}$ + ^[^~!#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$ + ^[\S]{3,30}$ + true + 100 + 100 + false + false + true + , + true + + + + + + + + + + + + + + + + + + + /permission + true + true + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml index e19786b861..cfd4938b68 100755 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml @@ -2,7 +2,7 @@ - ${carbon.home}/repository/resources/security/wso2certs.jks + ${carbon.home}/repository/resources/wso2certs.jks JKS diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/data-source-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/data-source-config.xml new file mode 100644 index 0000000000..d9be5b3ac0 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/data-source-config.xml @@ -0,0 +1,33 @@ + + + + + jdbc:h2:mem:cdm-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true + org.h2.Driver + wso2carbon + wso2carbon + + + + + + + + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql new file mode 100644 index 0000000000..6705b595f0 --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql @@ -0,0 +1,8 @@ +CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE ( + ID INTEGER auto_increment NOT NULL, + SERIAL_NUMBER VARCHAR(500) DEFAULT NULL, + CERTIFICATE BLOB DEFAULT NULL, + TENANT_ID INTEGER DEFAULT 0, + USERNAME VARCHAR(500) DEFAULT NULL, + PRIMARY KEY (ID) +); \ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml index d05fefdb8a..56ec9fc569 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml @@ -1,8 +1,11 @@ - + + + + From 5c9ad2a3d29f855a518d0abd0741f58fff97469a Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Fri, 29 Sep 2017 09:57:33 +0530 Subject: [PATCH 2/8] Add second set of tests --- .../pom.xml | 10 ++ .../BaseDeviceManagementCertificateTest.java | 6 +- ...CertificateManagementServiceImplTests.java | 133 ++++++++++++++---- .../mgt/core/util/CSRGenerator.java | 27 ++-- .../src/test/resources/testng.xml | 1 + 5 files changed, 130 insertions(+), 47 deletions(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml index d891e03194..a5dde4a1bd 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml @@ -167,6 +167,16 @@ h2-database-engine test
+ + org.powermock + powermock-api-mockito + test + + + org.powermock + powermock-module-testng + 1.7.0 + org.wso2.carbon org.wso2.carbon.logging diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java index b1a09026b1..6ca1b5c383 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java @@ -3,6 +3,7 @@ package org.wso2.carbon.certificate.mgt.core.common; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tomcat.jdbc.pool.PoolProperties; +import org.powermock.modules.testng.PowerMockTestCase; import org.testng.Assert; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeClass; @@ -26,7 +27,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; -public abstract class BaseDeviceManagementCertificateTest { +public abstract class BaseDeviceManagementCertificateTest{ private DataSource dataSource; private static final Log log = LogFactory.getLog(BaseDeviceManagementCertificateTest.class); @@ -75,7 +76,7 @@ public abstract class BaseDeviceManagementCertificateTest { Statement stmt = null; try { conn = this.getDataSource().getConnection(); - stmt = conn.createStatement(); + stmt = conn.createStatement(); stmt.executeUpdate("RUNSCRIPT FROM './src/test/resources/sql/h2.sql'"); } finally { TestUtils.cleanupResources(conn, stmt, null); @@ -148,6 +149,7 @@ public abstract class BaseDeviceManagementCertificateTest { } public DataSource getDataSource() { + return dataSource; } diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java index ad144b7f9c..61d63ac0ec 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java @@ -1,24 +1,14 @@ package org.wso2.carbon.certificate.mgt.core.impl; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.io.FileUtils; -import org.apache.woden.tool.converter.Convert; -import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; import org.bouncycastle.cms.CMSAbsentContent; import org.bouncycastle.cms.CMSException; import org.bouncycastle.cms.CMSSignedData; import org.bouncycastle.cms.CMSSignedDataGenerator; -import org.bouncycastle.openssl.PEMReader; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.bouncycastle.pkcs.PKCS10CertificationRequest; -import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder; -import org.bouncycastle.util.io.pem.PemReader; -import org.eclipse.wst.xml.core.internal.contenttype.ByteReader; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -34,27 +24,25 @@ import org.wso2.carbon.certificate.mgt.core.util.CSRGenerator; import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; -import sun.misc.BASE64Decoder; import sun.misc.BASE64Encoder; - -import javax.xml.bind.DatatypeConverter; +import javax.xml.parsers.DocumentBuilderFactory; import java.io.File; import java.io.IOException; -import java.io.StringReader; +import java.math.BigInteger; import java.security.KeyPair; -import java.security.KeyStore; import java.security.PrivateKey; import java.security.Security; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; -import java.security.interfaces.RSAPublicKey; -import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Base64; import java.util.List; +//@RunWith(PowerMockRunner.class) + +//@PowerMockIgnore({"javax.xml.*","java.sql.*", "org.xml.sax.*", "org.w3c.dom.*", "org.springframework.context.*", "org.apache.log4j.*"}) +//@PrepareForTest(org.wso2.carbon.certificate.mgt.core.util.CommonUtil.class) public class CertificateManagementServiceImplTests extends BaseDeviceManagementCertificateTest { private static Log log = LogFactory.getLog(CertificateManagementServiceImplTests.class); @@ -191,19 +179,12 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC // Generate key pair KeyPair keyPair = csrGeneration.generateKeyPair("RSA", 1024); byte[] csrData = csrGeneration.generateCSR("SHA256WithRSA", keyPair); - - //remove headers from csr - String csrString = new String(csrData); - csrString = csrString.replace("-----BEGIN NEW CERTIFICATE REQUEST-----", "") - .replace("-----END NEW CERTIFICATE REQUEST-----", ""); - - byte[] byteArrayBst = DatatypeConverter.parseBase64Binary(csrString); PKCS10CertificationRequest certificationRequest; try { PrivateKey privateKeyCA = keyStoreReader.getCAPrivateKey(); X509Certificate certCA = (X509Certificate) keyStoreReader.getCACertificate(); - certificationRequest = new PKCS10CertificationRequest(byteArrayBst); + certificationRequest = new PKCS10CertificationRequest(csrData); X509Certificate x509Certificate = managementService.generateCertificateFromCSR(privateKeyCA, certificationRequest, certCA.getIssuerX500Principal().getName()); @@ -319,18 +300,28 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } - @Test - public void testVerifyPEMSignature() { - } + +// public void testVerifyPEMSignature() throws KeystoreException, DeviceManagementException { +// +// DeviceConfigurationManager.getInstance().initConfig(); +// X509Certificate x509Certificate = managementService.generateX509Certificate(); +// +// PowerMockito.mockStatic(CommonUtil.class); +// PowerMockito.when(CommonUtil.generateSerialNumber()).thenReturn(new BigInteger("12345")); +// CertificateResponse certificateResponse = managementService.verifyPEMSignature(x509Certificate); +// Assert.assertNotNull(certificateResponse); +// +// } @Test public void testVerifySubjectDN() { try { DeviceConfigurationManager.getInstance().initConfig(); X509Certificate x509Certificate = managementService.generateX509Certificate(); - log.info(x509Certificate.getIssuerDN().getName()); + log.info(x509Certificate.getIssuerX500Principal().getName()); + managementService.verifySubjectDN(x509Certificate.getIssuerDN().getName()); } catch (KeystoreException e) { @@ -340,6 +331,86 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } } + @Test + public void testRetrieveCertificate(){ + try { + X509Certificate x509Certificate = managementService.generateX509Certificate(); + CertificateResponse certificateResponse = managementService.retrieveCertificate(x509Certificate.getSerialNumber().toString()); + Assert.assertNotNull(certificateResponse); + Assert.assertEquals(x509Certificate.getSerialNumber(),certificateResponse.getCertificateserial()); + + } catch (KeystoreException e) { + e.printStackTrace(); + } catch (CertificateManagementException e) { + e.printStackTrace(); + } + + } + + @Test + public void testGetAllCertificates() throws CertificateManagementException { + managementService.getAllCertificates(1,1); + } + + @Test + public void testGetCertificates(){ + try{ + List certificatesBefore = managementService.getCertificates(); + X509Certificate x509Certificate1 = managementService.generateX509Certificate(); + X509Certificate x509Certificate2 = managementService.generateX509Certificate(); + List certificatesAfter = managementService.getCertificates(); + Assert.assertNotNull(certificatesBefore); + Assert.assertNotNull(certificatesAfter); + Assert.assertEquals((certificatesBefore.size() + 2),certificatesAfter.size()); + + + } catch (CertificateManagementException e) { + e.printStackTrace(); + } catch (KeystoreException e) { + e.printStackTrace(); + } + } + + @Test + public void testGetCertificatesWithParams(){ + try { + + X509Certificate x509Certificate = managementService.generateX509Certificate(); + List certificates = managementService.getCertificates(); + + int size = certificates.size(); + boolean removed = managementService.removeCertificate(x509Certificate.getSerialNumber().toString()); + certificates = managementService.getCertificates(); + int sizeAfter = certificates.size(); + + Assert.assertNotNull(removed); + Assert.assertTrue(removed); + Assert.assertEquals((size-1),sizeAfter); + + } catch (CertificateManagementException e) { + e.printStackTrace(); + } catch (KeystoreException e) { + e.printStackTrace(); + } + } + + + @Test + public void testSearchCertificates(){ + try { + X509Certificate x509Certificate = managementService.generateX509Certificate(); + List certificateResponses = managementService.searchCertificates(x509Certificate.getSerialNumber().toString()); + Assert.assertNotNull(certificateResponses); + Assert.assertEquals(1,certificateResponses.size()); + Assert.assertEquals(certificateResponses.get(0).getSerialNumber(),x509Certificate.getSerialNumber().toString()); + + } catch (KeystoreException e) { + e.printStackTrace(); + } catch (CertificateManagementException e) { + e.printStackTrace(); + } + } + @BeforeClass @Override diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java index 76dd9e2d0e..019d5a9c93 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java @@ -1,14 +1,18 @@ package org.wso2.carbon.certificate.mgt.core.util; -import sun.security.pkcs10.PKCS10; -import sun.security.x509.X500Name; +import org.bouncycastle.operator.ContentSigner; +import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; +import org.bouncycastle.pkcs.PKCS10CertificationRequest; +import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder; +import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder; +import javax.security.auth.x500.X500Principal; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; import java.security.KeyPair; import java.security.KeyPairGenerator; -import java.security.Signature; + public class CSRGenerator { @@ -24,19 +28,14 @@ public class CSRGenerator { PrintStream printStream = new PrintStream(outStream); try { - X500Name x500Name = new X500Name("C=DE,O=Organiztion,CN=WSO2"); - - Signature sig = Signature.getInstance(sigAlg); - - sig.initSign(keyPair.getPrivate()); - - PKCS10 pkcs10 = new PKCS10(keyPair.getPublic()); - pkcs10.encodeAndSign(x500Name, sig); // For Java 7 and Java 8 - pkcs10.print(printStream); - byte[] csrBytes = outStream.toByteArray(); + PKCS10CertificationRequestBuilder p10Builder = new JcaPKCS10CertificationRequestBuilder( + new X500Principal("CN=Requested Test Certificate"), keyPair.getPublic()); + JcaContentSignerBuilder csBuilder = new JcaContentSignerBuilder("SHA256withRSA"); + ContentSigner signer = csBuilder.build(keyPair.getPrivate()); + PKCS10CertificationRequest csr = p10Builder.build(signer); - return csrBytes; + return csr.getEncoded(); } catch (Exception ex) { ex.printStackTrace(); } finally { diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml index 56ec9fc569..f96d8b329d 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml @@ -1,6 +1,7 @@ + From e41d51fa4bf439e003833f8765765b25b8f1f569 Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Fri, 29 Sep 2017 21:09:35 +0530 Subject: [PATCH 3/8] Adding test cases --- .../dao/CertificateManagementDAOFactory.java | 2 +- .../BaseDeviceManagementCertificateTest.java | 73 ++-- .../mgt/core/common/DataSourceConfig.java | 21 +- ...CertificateManagementServiceImplTests.java | 321 ++++++++++++++---- .../mgt/core/util/CSRGenerator.java | 19 +- .../mgt/core/util/DummyCertificate.java | 174 ++++++++++ .../src/test/resources/testng.xml | 3 +- 7 files changed, 488 insertions(+), 125 deletions(-) create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOFactory.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOFactory.java index 5c82ea83a3..10e70a5baa 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOFactory.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOFactory.java @@ -115,7 +115,7 @@ public class CertificateManagementDAOFactory { currentTxState.set(TxState.CONNECTION_BORROWED); } - public static void openConnection() throws SQLException { + public static void openConnection() throws SQLException { Connection conn = currentConnection.get(); if (conn != null) { throw new IllegalTransactionStateException("A transaction is already active within the context of " + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java index 6ca1b5c383..59e83ca5c6 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java @@ -1,11 +1,26 @@ +/* + * Copyright (c) 2017, 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.certificate.mgt.core.common; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tomcat.jdbc.pool.PoolProperties; -import org.powermock.modules.testng.PowerMockTestCase; -import org.testng.Assert; -import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeSuite; import org.w3c.dom.Document; @@ -23,11 +38,10 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import java.io.File; import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; import java.sql.Statement; -public abstract class BaseDeviceManagementCertificateTest{ + +public abstract class BaseDeviceManagementCertificateTest { private DataSource dataSource; private static final Log log = LogFactory.getLog(BaseDeviceManagementCertificateTest.class); @@ -46,6 +60,12 @@ public abstract class BaseDeviceManagementCertificateTest{ GroupManagementDAOFactory.init(dataSource); } + public void initDataSource(DataSource ds) throws Exception { + this.dataSource = ds; + DeviceManagementDAOFactory.init(dataSource); + GroupManagementDAOFactory.init(dataSource); + } + @BeforeClass public abstract void init() throws Exception; @@ -76,7 +96,7 @@ public abstract class BaseDeviceManagementCertificateTest{ Statement stmt = null; try { conn = this.getDataSource().getConnection(); - stmt = conn.createStatement(); + stmt = conn.createStatement(); stmt.executeUpdate("RUNSCRIPT FROM './src/test/resources/sql/h2.sql'"); } finally { TestUtils.cleanupResources(conn, stmt, null); @@ -109,45 +129,6 @@ public abstract class BaseDeviceManagementCertificateTest{ PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); } - - - private void cleanApplicationMappingData(Connection conn) throws SQLException { - try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_APPLICATION_MAPPING")) { - stmt.execute(); - } - } - - private void cleanApplicationData(Connection conn) throws SQLException { - try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_APPLICATION")) { - stmt.execute(); - } - } - - - private void cleanupEnrolmentData(Connection conn) throws SQLException { - try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_ENROLMENT")) { - stmt.execute(); - } - } - - private void cleanupDeviceData(Connection conn) throws SQLException { - try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE")) { - stmt.execute(); - } - } - - private void cleanupDeviceTypeData(Connection conn) throws SQLException { - try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_TYPE")) { - stmt.execute(); - } - } - - private void cleanupGroupData(Connection conn) throws SQLException { - try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_GROUP")) { - stmt.execute(); - } - } - public DataSource getDataSource() { return dataSource; diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java index f48e6add84..869660ee79 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java @@ -1,6 +1,22 @@ +/* + * Copyright (c) 2017, 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.certificate.mgt.core.common; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -12,7 +28,8 @@ public class DataSourceConfig { private String user; private String password; - @Override public String toString() { + @Override + public String toString() { return "DataSourceConfig[" + " Url ='" + url + '\'' + ", DriverClassName ='" + driverClassName + '\'' + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java index 61d63ac0ec..1278b48872 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java @@ -1,3 +1,21 @@ +/* + * Copyright (c) 2017, 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.certificate.mgt.core.impl; import org.apache.commons.io.FileUtils; @@ -20,43 +38,38 @@ import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse; import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException; import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException; import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementServiceImpl; +import org.wso2.carbon.certificate.mgt.core.service.PaginationResult; import org.wso2.carbon.certificate.mgt.core.util.CSRGenerator; import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants; +import org.wso2.carbon.certificate.mgt.core.util.DummyCertificate; +import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; import sun.misc.BASE64Encoder; -import javax.xml.parsers.DocumentBuilderFactory; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; -import java.math.BigInteger; import java.security.KeyPair; import java.security.PrivateKey; import java.security.Security; -import java.security.cert.Certificate; -import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; +import java.security.cert.*; import java.util.ArrayList; import java.util.List; -//@RunWith(PowerMockRunner.class) - -//@PowerMockIgnore({"javax.xml.*","java.sql.*", "org.xml.sax.*", "org.w3c.dom.*", "org.springframework.context.*", "org.apache.log4j.*"}) -//@PrepareForTest(org.wso2.carbon.certificate.mgt.core.util.CommonUtil.class) public class CertificateManagementServiceImplTests extends BaseDeviceManagementCertificateTest { private static Log log = LogFactory.getLog(CertificateManagementServiceImplTests.class); private static final String CA_CERT_PEM = "src/test/resources/ca_cert.pem"; private static final String RA_CERT_PEM = "src/test/resources/ra_cert.pem"; - private static final String CA_CERT_DER = "src/test/resources/ca_cert.der"; CertificateManagementServiceImpl managementService = null; - @Test + @Test(description = "This test case tests initialization of CertificateManagementServiceImpl instance") public void testGetInstance() { try { CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); Assert.assertNotNull(instance); - log.info("Successfully created instance"); + log.info("getInstance Test Successful"); } catch (NullPointerException e) { log.error("Error while initializing CertificateManagementService", e); @@ -68,19 +81,21 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC @BeforeClass public void initCertificateManagementService() throws DeviceManagementException { + //save certificatemanagementservice instance as class variable managementService = CertificateManagementServiceImpl.getInstance(); + //set Bouncycastle as a provider for testing Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); } - @Test + @Test(description = "This test case tests retrieval of CA Certificate from the keystore") public void testGetCACertificate() { try { CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); Certificate caCertificate = instance.getCACertificate(); Assert.assertNotNull(caCertificate); Assert.assertEquals(caCertificate.getType(), CertificateManagementConstants.X_509); - log.info("Successfully returned CA Certificate"); + log.info("GetCACertificate Test Successful"); } catch (KeystoreException e) { String msg = "Error while getting the CA Certificate"; @@ -89,13 +104,13 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } } - @Test + @Test(description = "This test case tests retrieval of RA Certificate from the keystore") public void testGetRACertificate() { try { Certificate raCertificate = managementService.getRACertificate(); Assert.assertNotNull(raCertificate); Assert.assertEquals(raCertificate.getType(), CertificateManagementConstants.X_509); - log.info("Successfully returned RA Certificate"); + log.info("GetRACertificate Test Successful"); } catch (KeystoreException e) { String msg = "Error while getting the RA Certificate"; log.error(msg, e); @@ -103,12 +118,13 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } } - @Test + @Test(description = "This test case test generation of root certificates") public void testGetRootCertificate() { File caCert = new File(CA_CERT_PEM); File raCert = new File(RA_CERT_PEM); try { + //read file to byte arrays byte[] caBytes = FileUtils.readFileToByteArray(caCert); byte[] raBytes = FileUtils.readFileToByteArray(raCert); @@ -116,7 +132,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC Assert.assertNotNull(rootCertificates); Assert.assertEquals(rootCertificates.get(0).getType(), CertificateManagementConstants.X_509); Assert.assertEquals(rootCertificates.get(1).getType(), CertificateManagementConstants.X_509); - log.info("Successfully returned root Certificate"); + log.info("GetRootCertificate Test Successful"); } catch (IOException e) { String msg = "Error reading byte streams"; @@ -130,13 +146,14 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } - @Test + @Test(description = "This test case tests generation of X509Certificate") public void testGenerateX509Certificate() { try { X509Certificate x509Certificate = managementService.generateX509Certificate(); Assert.assertNotNull(x509Certificate); Assert.assertEquals(x509Certificate.getType(), CertificateManagementConstants.X_509); + log.info("GenerateX509Certificate Test Successful"); } catch (KeystoreException e) { String msg = "Error while generating X509 Certificate"; @@ -145,13 +162,14 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } } - @Test + @Test(description = "This test case tests retrieving SCEP CA Certificate") public void testGetCACertSCEP() { try { SCEPResponse caCertSCEP = managementService.getCACertSCEP(); Assert.assertNotNull(caCertSCEP); Assert.assertEquals(caCertSCEP.getResultCriteria(), CAStatus.CA_RA_CERT_RECEIVED); + log.info("GetCACertSCEP Test Successful"); } catch (KeystoreException e) { String msg = "Error while Retrieving CA Certificate"; @@ -167,11 +185,12 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC byte[] caCapsSCEP = managementService.getCACapsSCEP(); Assert.assertNotNull(caCapsSCEP); Assert.assertEquals(caCapsSCEP, CertificateManagementConstants.POST_BODY_CA_CAPS.getBytes()); + log.info("GetCACapsSCEP Test Successful"); } - @Test + @Test(description = "This test case tests generation of a X509Certificate from a CSR") public void testGenerateCertificateFromCSR() { CSRGenerator csrGeneration = new CSRGenerator(); KeyStoreReader keyStoreReader = new KeyStoreReader(); @@ -190,6 +209,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC Assert.assertNotNull(x509Certificate); Assert.assertEquals(x509Certificate.getType(), CertificateManagementConstants.X_509); + log.info("GenerateCertificateFromCSR Test Successful"); } catch (KeystoreException e) { String msg = "Error while reading Certificates from the keystore"; @@ -204,7 +224,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } - @Test + @Test(description = "This test case tests retrieval of a Certificate from the keystore from the Serial Number") public void testGetCertificateBySerial() { X509Certificate x509Certificate = null; @@ -217,6 +237,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC Assert.assertNotNull(certificateBySerial); Assert.assertEquals(certificateBySerial.getSerialNumber(), x509Certificate.getSerialNumber().toString()); + log.info("GetCertificateBySerial Test Successful"); } catch (KeystoreException e) { String msg = "Error while receiving the certificate"; @@ -231,7 +252,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } - @Test + @Test(description = "This test case tests retrieval of a Certificate from the keystore from the Alias") public void testGetCertificateByAlias() { X509Certificate x509Certificate = null; try { @@ -245,6 +266,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC Assert.assertNotNull(certificateByAlias); Assert.assertEquals(certificateByAlias.getType(), CertificateManagementConstants.X_509); + log.info("GetCertificateByAlias Test Successful"); } catch (KeystoreException e) { String msg = "Error while receiving the certificate"; @@ -257,7 +279,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } } - @Test + @Test(description = "This test case tests Signature verification of a Certificate against the keystore") public void testVerifySignature() { BASE64Encoder encoder = new BASE64Encoder(); @@ -278,6 +300,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC Assert.assertNotNull(verifySignature); Assert.assertTrue(verifySignature); + log.info("VerifySignature Test Successful"); } catch (CertificateEncodingException e) { String msg = "Error in Certificate encoding"; @@ -300,22 +323,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC } - - - -// public void testVerifyPEMSignature() throws KeystoreException, DeviceManagementException { -// -// DeviceConfigurationManager.getInstance().initConfig(); -// X509Certificate x509Certificate = managementService.generateX509Certificate(); -// -// PowerMockito.mockStatic(CommonUtil.class); -// PowerMockito.when(CommonUtil.generateSerialNumber()).thenReturn(new BigInteger("12345")); -// CertificateResponse certificateResponse = managementService.verifyPEMSignature(x509Certificate); -// Assert.assertNotNull(certificateResponse); -// -// } - - @Test + @Test(description = "This test case tests DN verification of a Certificate against the keystore") public void testVerifySubjectDN() { try { DeviceConfigurationManager.getInstance().initConfig(); @@ -325,54 +333,75 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC managementService.verifySubjectDN(x509Certificate.getIssuerDN().getName()); } catch (KeystoreException e) { - e.printStackTrace(); + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); } catch (DeviceManagementException e) { - e.printStackTrace(); + String msg = "Error while initilizing DeviceConfigurationManager"; + log.error(msg, e); + } } - @Test - public void testRetrieveCertificate(){ + @Test(description = "This test case tests retrieval of a Certificate from the keystore from the Serial") + public void testRetrieveCertificate() { try { X509Certificate x509Certificate = managementService.generateX509Certificate(); CertificateResponse certificateResponse = managementService.retrieveCertificate(x509Certificate.getSerialNumber().toString()); Assert.assertNotNull(certificateResponse); - Assert.assertEquals(x509Certificate.getSerialNumber(),certificateResponse.getCertificateserial()); + Assert.assertEquals(x509Certificate.getSerialNumber(), certificateResponse.getCertificateserial()); } catch (KeystoreException e) { - e.printStackTrace(); + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); } catch (CertificateManagementException e) { - e.printStackTrace(); + String msg = " Error occurred while looking up for the certificate in the keystore"; + log.error(msg, e); + Assert.fail(msg, e); } } - @Test - public void testGetAllCertificates() throws CertificateManagementException { - managementService.getAllCertificates(1,1); + @Test(description = "This test case tests the retrieval of Certificates from keystore in desired pagination") + public void testGetAllCertificatesPaginated() throws CertificateManagementException { + try { + managementService.generateX509Certificate(); + managementService.generateX509Certificate(); + PaginationResult allCertificates = managementService.getAllCertificates(0, 2); + Assert.assertEquals(allCertificates.getData().size(), 2); + log.info("GetAllCertificatesPaginated Test Successful"); + + } catch (KeystoreException e) { + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); + } + + } - @Test - public void testGetCertificates(){ - try{ + @Test(description = "This test casae tests retrieval of all Certificates from keystore") + public void testGetCertificates() throws CertificateManagementException { + try { List certificatesBefore = managementService.getCertificates(); - X509Certificate x509Certificate1 = managementService.generateX509Certificate(); - X509Certificate x509Certificate2 = managementService.generateX509Certificate(); + managementService.generateX509Certificate(); + managementService.generateX509Certificate(); List certificatesAfter = managementService.getCertificates(); Assert.assertNotNull(certificatesBefore); Assert.assertNotNull(certificatesAfter); - Assert.assertEquals((certificatesBefore.size() + 2),certificatesAfter.size()); - + Assert.assertEquals((certificatesBefore.size() + 2), certificatesAfter.size()); + log.info("GetCertificates Test Successful"); - } catch (CertificateManagementException e) { - e.printStackTrace(); } catch (KeystoreException e) { - e.printStackTrace(); + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); } } - @Test - public void testGetCertificatesWithParams(){ + @Test(description = "This test case tests deleting Certificate from the keystore") + public void testRemoveCertificate() throws CertificateManagementException { try { X509Certificate x509Certificate = managementService.generateX509Certificate(); @@ -385,37 +414,181 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC Assert.assertNotNull(removed); Assert.assertTrue(removed); - Assert.assertEquals((size-1),sizeAfter); + Assert.assertEquals((size - 1), sizeAfter); + log.info("RemoveCertificate Test Successful"); - } catch (CertificateManagementException e) { - e.printStackTrace(); } catch (KeystoreException e) { - e.printStackTrace(); + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); } } - @Test - public void testSearchCertificates(){ + @Test(description = "This test case tests searching for a list of certificates by the serial number") + public void testSearchCertificates() throws CertificateManagementException { try { X509Certificate x509Certificate = managementService.generateX509Certificate(); List certificateResponses = managementService.searchCertificates(x509Certificate.getSerialNumber().toString()); Assert.assertNotNull(certificateResponses); - Assert.assertEquals(1,certificateResponses.size()); - Assert.assertEquals(certificateResponses.get(0).getSerialNumber(),x509Certificate.getSerialNumber().toString()); + Assert.assertEquals(1, certificateResponses.size()); + Assert.assertEquals(certificateResponses.get(0).getSerialNumber(), x509Certificate.getSerialNumber().toString()); + log.info("SearchCertificates Test Successful"); } catch (KeystoreException e) { - e.printStackTrace(); - } catch (CertificateManagementException e) { - e.printStackTrace(); + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); + } + } + + @Test(description = "This test case tests generation of signed Certificate from a CSR") + public void testGetSignedCertificateFromCSR() { + + CSRGenerator csrGeneration = new CSRGenerator(); + BASE64Encoder encoder = new BASE64Encoder(); + + // Generate key pair + KeyPair keyPair = csrGeneration.generateKeyPair("RSA", 1024); + byte[] csrData = csrGeneration.generateCSR("SHA256WithRSA", keyPair); + try { + X509Certificate signedCertificateFromCSR = managementService.getSignedCertificateFromCSR(encoder.encode(csrData)); + Assert.assertNotNull(signedCertificateFromCSR); + Assert.assertEquals(signedCertificateFromCSR.getType(), CertificateManagementConstants.X_509); + log.info("GetSignedCertificateFromCSR Test Successful"); + + } catch (KeystoreException e) { + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); + } + + + } + + @Test(description = "This test case tests the extraction of Challenge token from a Certificate") + public void testExtractChallengeToken() throws KeystoreException { + + X509Certificate x509Certificate1 = new DummyCertificate(); + String token = managementService.extractChallengeToken(x509Certificate1); + + Assert.assertNotNull(token); + Assert.assertEquals(token, DummyCertificate.EXT); + log.info("extractChallengeToken Test Successful"); + + } + + @Test(description = "This test case tests saving a list of Certificates in the keystore") + public void testSaveCertificate() throws CertificateManagementException { + File caCert = new File(CA_CERT_PEM); + try { + int before = managementService.getCertificates().size(); + byte[] caBytes = FileUtils.readFileToByteArray(caCert); + CertificateFactory cf = CertificateFactory.getInstance("X.509"); + X509Certificate cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(caBytes)); + + List certificates = new ArrayList<>(); + org.wso2.carbon.certificate.mgt.core.bean.Certificate certificateToStore = + new org.wso2.carbon.certificate.mgt.core.bean.Certificate(); + certificateToStore.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId()); + certificateToStore.setCertificate(cert); + certificates.add(certificateToStore); + + managementService.saveCertificate(certificates); + int after = managementService.getCertificates().size(); + Assert.assertEquals((before + 1), after); + log.info("SaveCertificate Test Successful"); + + } catch (IOException e) { + String msg = "Error while reading Pem file from the file"; + log.error(msg, e); + Assert.fail(msg, e); + + } catch (CertificateException e) { + String msg = "Error while Converting Pem file to X509 Certificate"; + log.error(msg, e); + Assert.fail(msg, e); + + } catch (KeystoreException e) { + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); + ; } } + @Test(description = "This test case tests converting a pem file to X509 Certificate") + public void testPemToX509Certificate() { + File caCert = new File(CA_CERT_PEM); + BASE64Encoder encoder = new BASE64Encoder(); + try { + byte[] caBytes = FileUtils.readFileToByteArray(caCert); + X509Certificate certificate = managementService.pemToX509Certificate(encoder.encode(caBytes)); + Assert.assertNotNull(certificate); + Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); + log.info("PemToX509Certificate Test Successful"); + + } catch (IOException e) { + String msg = "Error while reading Pem file from the file"; + log.error(msg, e); + Assert.fail(msg, e); + } catch (KeystoreException e) { + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); + } + } + + @Test(description = "This test case tests extracting Certificate from the header Signature") + public void testExtractCertificateFromSignature() { + BASE64Encoder encoder = new BASE64Encoder(); + + try { + //generate and save a certificate in the keystore + X509Certificate x509Certificate = managementService.generateX509Certificate(); + + //Generate CMSdata + CMSSignedDataGenerator generator = new CMSSignedDataGenerator(); + List list = new ArrayList<>(); + list.add(x509Certificate); + JcaCertStore store = new JcaCertStore(list); + generator.addCertificates(store); + CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); + byte[] signature = degenerateSd.getEncoded(); + + X509Certificate certificate = managementService.extractCertificateFromSignature(encoder.encode(signature)); + + Assert.assertNotNull(certificate); + Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); + log.info("ExtractCertificateFromSignature Test Successful"); + + } catch (CertificateEncodingException e) { + String msg = "Error in Certificate encoding"; + log.error(msg, e); + Assert.fail(msg, e); + } catch (IOException e) { + String msg = "Error reading encoded signature"; + log.error(msg, e); + Assert.fail(msg, e); + } catch (CMSException e) { + String msg = "Error Adding certificates"; + log.error(msg, e); + Assert.fail(msg, e); + } catch (KeystoreException e) { + String msg = "Error while accessing the keystore"; + log.error(msg, e); + Assert.fail(msg, e); + } + + } + @BeforeClass - @Override public void init() throws Exception { initDataSource(); CertificateManagementDAOFactory.init(this.getDataSource()); + } + + } diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java index 019d5a9c93..1ee50d04ad 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java @@ -1,3 +1,21 @@ +/* + * Copyright (c) 2017, 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.certificate.mgt.core.util; import org.bouncycastle.operator.ContentSigner; @@ -13,7 +31,6 @@ import java.io.PrintStream; import java.security.KeyPair; import java.security.KeyPairGenerator; - public class CSRGenerator { /** diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java new file mode 100644 index 0000000000..a89c4e0a7e --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java @@ -0,0 +1,174 @@ +/* + * Copyright (c) 2017, 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.certificate.mgt.core.util; + +import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; + +import java.math.BigInteger; +import java.security.*; +import java.security.cert.*; +import java.util.Date; +import java.util.Set; + +public class DummyCertificate extends X509Certificate { + + public static final String EXT = "Dummy extension"; + public static final String DN = "O=WSO2,OU=Mobile,C=LK,CN=123456789"; + + + @Override + public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException { + + } + + @Override + public void checkValidity(Date date) throws CertificateExpiredException, CertificateNotYetValidException { + + } + + @Override + public int getVersion() { + return 0; + } + + @Override + public BigInteger getSerialNumber() { + return new BigInteger("123456789"); + } + + @Override + public Principal getIssuerDN() { + return null; + } + + @Override + public Principal getSubjectDN() { + return new Principal() { + @Override + public String getName() { + return DN; + } + }; + + } + + @Override + public Date getNotBefore() { + return null; + } + + @Override + public Date getNotAfter() { + return null; + } + + @Override + public byte[] getTBSCertificate() throws CertificateEncodingException { + return new byte[0]; + } + + @Override + public byte[] getSignature() { + return new byte[0]; + } + + @Override + public String getSigAlgName() { + return null; + } + + @Override + public String getSigAlgOID() { + return null; + } + + @Override + public byte[] getSigAlgParams() { + return new byte[0]; + } + + @Override + public boolean[] getIssuerUniqueID() { + return new boolean[0]; + } + + @Override + public boolean[] getSubjectUniqueID() { + return new boolean[0]; + } + + @Override + public boolean[] getKeyUsage() { + return new boolean[0]; + } + + @Override + public int getBasicConstraints() { + return 0; + } + + @Override + public byte[] getEncoded() throws CertificateEncodingException { + return new byte[0]; + } + + @Override + public void verify(PublicKey key) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { + + } + + @Override + public void verify(PublicKey key, String sigProvider) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { + + } + + @Override + public String toString() { + return null; + } + + @Override + public PublicKey getPublicKey() { + return null; + } + + @Override + public boolean hasUnsupportedCriticalExtension() { + return false; + } + + @Override + public Set getCriticalExtensionOIDs() { + return null; + } + + @Override + public Set getNonCriticalExtensionOIDs() { + return null; + } + + @Override + public byte[] getExtensionValue(String oid) { + if (oid.equals(PKCSObjectIdentifiers.pkcs_9_at_challengePassword.toString())) { + return EXT.getBytes(); + } else { + return new byte[0]; + } + } +} diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml index f96d8b329d..aafb64008d 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml @@ -13,4 +13,5 @@ - \ No newline at end of file + + From 6c89017524a324cea9ba63a951bb4db7c330dde9 Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Fri, 29 Sep 2017 21:16:13 +0530 Subject: [PATCH 4/8] Remove unnecessary files --- .../repository/conf/axis2/axis2.xml | 723 ---------- .../repository/conf/axis2/axis2_client.xml | 300 ---- .../repository/conf/axis2/tenant-axis2.xml | 285 ---- .../conf/etc/bundle-config/README.txt | 12 - .../carboncontext-osgi-services.properties | 3 - .../repository/conf/etc/config-validation.xml | 37 - .../carbon-home/repository/conf/etc/jmx.xml | 32 - .../repository/conf/etc/launch.ini | 258 ---- .../conf/etc/logging-bridge.properties | 65 - .../repository/conf/etc/mime.mappings | 27 - .../repository/conf/etc/mime.types | 734 ---------- .../repository/conf/etc/osgi-debug.options | 95 -- .../repository/conf/etc/tasks-config.xml | 51 - .../repository/conf/notification-messages.xml | 39 - .../carbon-home/repository/conf/registry.xml | 100 -- .../conf/tomcat/carbon/META-INF/context.xml | 31 - .../conf/tomcat/carbon/WEB-INF/web.xml | 61 - .../conf/tomcat/catalina-server.xml | 97 -- .../repository/conf/tomcat/tomcat-users.xml | 16 - .../repository/conf/tomcat/web.xml | 1220 ----------------- .../carbon-home/repository/conf/user-mgt.xml | 379 ----- 21 files changed, 4565 deletions(-) delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties delete mode 100755 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/notification-messages.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml deleted file mode 100644 index 0f0822fa02..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml +++ /dev/null @@ -1,723 +0,0 @@ - - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - @product.name@-@product.version@ - - - @product.name@-@product.version@ - - - - - - - false - - - - - - false - - - true - - - repository/deployment/server/synapse-configs - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - multicast - - - - - wso2.carbon.domain - - - - - - 45564 - - 100 - - 60 - - - - - - 127.0.0.1 - - - - - - 4000 - - - - - - - - - - - - - - - - - - 127.0.0.1 - 4000 - - - - - - - - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml deleted file mode 100644 index a8b584d086..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - - true - false - false - - - 500 - - 15000 - - - false - - - - true - - - - - - false - - - admin - axis2 - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6071 - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - 60000 - 60000 - - - HTTP/1.1 - chunked - 60000 - 60000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml deleted file mode 100644 index c6fe9d23d3..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - true - true - optional - - - true - - - false - - - - true - - - - - - false - - - false - - - axis2services - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt deleted file mode 100644 index ffa7c79264..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt +++ /dev/null @@ -1,12 +0,0 @@ -This directory supports adding third-pary config files to specific bundles during runtime. - -Explanation: Each OSGi bundle has its own classLoader. Some thirdpary libs read configs from classPath. This scenario fails in OSGi runtime, since OSGi runtime does not share a common classPath for individual bundles. Bundling config files during the bundle creation process itself will solve the issue. However it limits the ability to edit the configs during restarts. - -Here we are providing a workaround for such scenarios. The given config file will get resolved to a fragment bundle and will get attached to the specified host bundle. The host bundle name(symbolic name) is resolved by looking at the directory structure. Hence host bundle name should be directory name of the config file directory. - - -Example: The bundle with symbolic name, 'org.foo.bar' expects a config file named 'foobar.properties' from its classPath. - -create a directory named 'org.foo.bar' inside 'repository/conf/etc/bundle-config' - (this directory) and place the foobar.properties file. - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties deleted file mode 100644 index f52d194001..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties +++ /dev/null @@ -1,3 +0,0 @@ -#osgi.service.1 = org.wso2.carbon.client.configcontext.provider.Axis2ClientConfigContextProvider -#osgi.service.2 = org.wso2.carbon.user.core.UserManager -#osgi.service.3 = org.wso2.carbon.user.api.UserRealmService \ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml deleted file mode 100644 index 3b5b3484bb..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - 800 - 2047 - 2047 - 1024 - 4096 - 02:FB:AA:5F:20:64:49:4A:27:29:55:71:83:F7:46:CD - - - 256 - 512 - 256 - - - carbon.home - carbon.config.dir.path - axis2.home - - - Linux - Unix - Mac OS - Windows Server 2003 - Windows XP - Windows Vista - Windows 7 - Mac OS X - Windows Server 2008 - Windows Server 2008 R2 - AIX - - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml deleted file mode 100644 index 13cdfa301e..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/jmx.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - true - - - localhost - - - ${Ports.JMX.RMIRegistryPort} - - - ${Ports.JMX.RMIServerPort} - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini deleted file mode 100644 index 8b9f5ad190..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/launch.ini +++ /dev/null @@ -1,258 +0,0 @@ -# Eclipse Runtime Configuration Overrides -# These properties are loaded prior to starting the framework and can also be used to override System Properties -# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework -# "*" can be used together with @null to clear System Properties that match a prefix name. - -osgi.*=@null -org.osgi.*=@null -eclipse.*=@null - -osgi.parentClassloader=app -osgi.contextClassLoaderParent=app - -# When osgi.clean is set to "true", any cached data used by the OSGi framework -# will be wiped clean. This will clean the caches used to store bundle -# dependency resolution and eclipse extension registry data. Using this -# option will force OSGi framework to reinitialize these caches. -# The following setting is put in place to get rid of the problems -# faced when re-starting the system. Please note that, when this setting is -# true, if you manually start a bundle, it would not be available when -# you re-start the system. To avid this, copy the bundle jar to the plugins -# folder, before you re-start the system. -osgi.clean=true - -# Uncomment the following line to turn on Eclipse Equinox debugging. -# You may also edit the osgi-debug.options file and fine tune the debugging -# options to suite your needs. -#osgi.debug=./repository/conf/osgi-debug.options - -# Following system property allows us to control the public JDK packages exported through the system bundle. -org.osgi.framework.system.packages=javax.accessibility,\ -javax.activity,\ -javax.crypto,\ -javax.crypto.interfaces,\ -javax.crypto.spec,\ -javax.imageio,\ -javax.imageio.event,\ -javax.imageio.metadata,\ -javax.imageio.plugins.bmp,\ -javax.imageio.plugins.jpeg,\ -javax.imageio.spi,\ -javax.imageio.stream,\ -javax.jms,\ -javax.management,\ -javax.management.loading,\ -javax.management.modelmbean,\ -javax.management.monitor,\ -javax.management.openmbean,\ -javax.management.relation,\ -javax.management.remote,\ -javax.management.remote.rmi,\ -javax.management.timer,\ -javax.naming,\ -javax.naming.directory,\ -javax.naming.event,\ -javax.naming.ldap,\ -javax.naming.spi,\ -javax.net,\ -javax.net.ssl,\ -javax.print,\ -javax.print.attribute,\ -javax.print.attribute.standard,\ -javax.print.event,\ -javax.rmi,\ -javax.rmi.CORBA,\ -javax.rmi.ssl,\ -javax.script,\ -javax.security.auth,\ -javax.security.auth.callback,\ -javax.security.auth.kerberos,\ -javax.security.auth.login,\ -javax.security.auth.spi,\ -javax.security.auth.x500,\ -javax.security.cert,\ -javax.security.sasl,\ -javax.sound.midi,\ -javax.sound.midi.spi,\ -javax.sound.sampled,\ -javax.sound.sampled.spi,\ -javax.sql,\ -javax.sql.rowset,\ -javax.sql.rowset.serial,\ -javax.sql.rowset.spi,\ -javax.swing,\ -javax.swing.border,\ -javax.swing.colorchooser,\ -javax.swing.event,\ -javax.swing.filechooser,\ -javax.swing.plaf,\ -javax.swing.plaf.basic,\ -javax.swing.plaf.metal,\ -javax.swing.plaf.multi,\ -javax.swing.plaf.synth,\ -javax.swing.table,\ -javax.swing.text,\ -javax.swing.text.html,\ -javax.swing.text.html.parser,\ -javax.swing.text.rtf,\ -javax.swing.tree,\ -javax.swing.undo,\ -javax.transaction,\ -javax.transaction.xa,\ -javax.xml.namespace,\ -javax.xml.parsers,\ -javax.xml.stream,\ -javax.xml.stream.events,\ -javax.xml.stream.util,\ -javax.xml.transform,\ -javax.xml.transform.stream,\ -javax.xml.transform.dom,\ -javax.xml.transform.sax,\ -javax.xml,\ -javax.xml.validation,\ -javax.xml.datatype,\ -javax.xml.xpath,\ -javax.activation,\ -com.sun.activation.registries,\ -com.sun.activation.viewers,\ -org.ietf.jgss,\ -org.omg.CORBA,\ -org.omg.CORBA_2_3,\ -org.omg.CORBA_2_3.portable,\ -org.omg.CORBA.DynAnyPackage,\ -org.omg.CORBA.ORBPackage,\ -org.omg.CORBA.portable,\ -org.omg.CORBA.TypeCodePackage,\ -org.omg.CosNaming,\ -org.omg.CosNaming.NamingContextExtPackage,\ -org.omg.CosNaming.NamingContextPackage,\ -org.omg.Dynamic,\ -org.omg.DynamicAny,\ -org.omg.DynamicAny.DynAnyFactoryPackage,\ -org.omg.DynamicAny.DynAnyPackage,\ -org.omg.IOP,\ -org.omg.IOP.CodecFactoryPackage,\ -org.omg.IOP.CodecPackage,\ -org.omg.Messaging,\ -org.omg.PortableInterceptor,\ -org.omg.PortableInterceptor.ORBInitInfoPackage,\ -org.omg.PortableServer,\ -org.omg.PortableServer.CurrentPackage,\ -org.omg.PortableServer.POAManagerPackage,\ -org.omg.PortableServer.POAPackage,\ -org.omg.PortableServer.portable,\ -org.omg.PortableServer.ServantLocatorPackage,\ -org.omg.SendingContext,\ -org.omg.stub.java.rmi,\ -org.w3c.dom,\ -org.w3c.dom.bootstrap,\ -org.w3c.dom.css,\ -org.w3c.dom.events,\ -org.w3c.dom.html,\ -org.w3c.dom.ls,\ -org.w3c.dom.ranges,\ -org.w3c.dom.stylesheets,\ -org.w3c.dom.traversal,\ -org.w3c.dom.views ,\ -org.xml.sax,\ -org.xml.sax.ext,\ -org.xml.sax.helpers,\ -org.apache.xerces.xpointer,\ -org.apache.xerces.xni.grammars,\ -org.apache.xerces.impl.xs.util,\ -org.apache.xerces.jaxp.validation,\ -org.apache.xerces.impl.dtd.models,\ -org.apache.xerces.impl.xpath,\ -org.apache.xerces.dom3.as,\ -org.apache.xerces.impl.dv.xs,\ -org.apache.xerces.util,\ -org.apache.xerces.impl.xs.identity,\ -org.apache.xerces.impl.xs.opti,\ -org.apache.xerces.jaxp,\ -org.apache.xerces.impl.dv,\ -org.apache.xerces.xs.datatypes,\ -org.apache.xerces.dom.events,\ -org.apache.xerces.impl.msg,\ -org.apache.xerces.xni,\ -org.apache.xerces.impl.xs,\ -org.apache.xerces.impl,\ -org.apache.xerces.impl.io,\ -org.apache.xerces.xinclude,\ -org.apache.xerces.jaxp.datatype,\ -org.apache.xerces.parsers,\ -org.apache.xerces.impl.dv.util,\ -org.apache.xerces.xni.parser,\ -org.apache.xerces.impl.xs.traversers,\ -org.apache.xerces.impl.dv.dtd,\ -org.apache.xerces.xs,\ -org.apache.xerces.impl.dtd,\ -org.apache.xerces.impl.validation,\ -org.apache.xerces.impl.xs.models,\ -org.apache.xerces.impl.xpath.regex,\ -org.apache.xml.serialize,\ -org.apache.xerces.dom,\ -org.apache.xalan,\ -org.apache.xalan.xslt,\ -org.apache.xalan.templates,\ -org.apache.xalan.xsltc,\ -org.apache.xalan.xsltc.cmdline,\ -org.apache.xalan.xsltc.cmdline.getopt,\ -org.apache.xalan.xsltc.trax,\ -org.apache.xalan.xsltc.dom,\ -org.apache.xalan.xsltc.runtime,\ -org.apache.xalan.xsltc.runtime.output,\ -org.apache.xalan.xsltc.util,\ -org.apache.xalan.xsltc.compiler,\ -org.apache.xalan.xsltc.compiler.util,\ -org.apache.xalan.serialize,\ -org.apache.xalan.client,\ -org.apache.xalan.res,\ -org.apache.xalan.transformer,\ -org.apache.xalan.extensions,\ -org.apache.xalan.lib,\ -org.apache.xalan.lib.sql,\ -org.apache.xalan.processor,\ -org.apache.xalan.trace,\ -org.apache.xml.dtm,\ -org.apache.xml.dtm.ref,\ -org.apache.xml.dtm.ref.sax2dtm,\ -org.apache.xml.dtm.ref.dom2dtm,\ -org.apache.xml.utils,\ -org.apache.xml.utils.res,\ -org.apache.xml.res,\ -org.apache.xml.serializer,\ -org.apache.xml.serializer.utils,\ -org.apache.xpath,\ -org.apache.xpath.domapi,\ -org.apache.xpath.objects,\ -org.apache.xpath.patterns,\ -org.apache.xpath.jaxp,\ -org.apache.xpath.res,\ -org.apache.xpath.operations,\ -org.apache.xpath.functions,\ -org.apache.xpath.axes,\ -org.apache.xpath.compiler,\ -org.apache.xml.resolver,\ -org.apache.xml.resolver.tools,\ -org.apache.xml.resolver.helpers,\ -org.apache.xml.resolver.readers,\ -org.apache.xml.resolver.etc,\ -org.apache.xml.resolver.apps,\ -javax.xml.ws,\ -javax.xml.ws.handler,\ -javax.xml.ws.handler.soap,\ -javax.xml.ws.http,\ -javax.xml.ws.soap,\ -javax.xml.ws.spi,\ -javax.xml.ws.spi.http,\ -javax.xml.ws.wsaddressing,\ -javax.xml.bind,\ -javax.xml.bind.annotation,\ -javax.xml.bind.annotation.adapters,\ -javax.annotation,\ -javax.jws,\ -javax.jws.soap,\ -com.sun.xml.internal.messaging.saaj.soap.ver1_1,\ -com.sun.xml.internal.messaging.saaj.soap,\ -com.sun.tools.internal.ws.spi,\ -org.wso2.carbon.bootstrap diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties deleted file mode 100644 index 7b63190ae4..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties +++ /dev/null @@ -1,65 +0,0 @@ -############################################################ -# Default Logging Configuration File -# -# You can use a different file by specifying a filename -# with the java.util.logging.config.file system property. -# For example java -Djava.util.logging.config.file=myfile -############################################################ - -############################################################ -# Global properties -# NOTE: this configuration file use to get the handler list, -# Properties(except level property) define for each handler -# may be not available because LogRecords handover to log4j -# appenders in runtime. -############################################################ - -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# By default we only configure a ConsoleHandler, which will only -# show messages at the INFO and above levels. -#handlers= java.util.logging.ConsoleHandler - -# To also add the FileHandler, use the following line instead. -#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler -# Add org.wso2.carbon.bootstrap.logging.handlers.LogEventHandler to handlers if you need to push java logs to LOGEVENT appender - -handlers= org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler, org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler - -# Default global logging level. -# This specifies which kinds of events are logged across -# all loggers. For any given facility this global level -# can be overriden by a facility specific level -# Note that the ConsoleHandler also has a separate level -# setting to limit messages printed to the console. -.level= INFO - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -# - -############################################################ -# This FileHandler pushed LogRecords to a log4j FileAppander in runtime -org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler.level = INFO -#org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler.formatter = java.util.logging.SimpleFormatter - -# This ConsoleHandler pushed LogRecords to q log4j ConsoleAppander in runtime -org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler.level = INFO -#org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler.formatter = java.util.logging.SimpleFormatter - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages: -#com.xyz.foo.level = SEVERE -org.apache.coyote.level = SEVERE -org.apache.catalina.level = SEVERE -com.hazelcast.level = SEVERE - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings deleted file mode 100755 index 97a5c5a5fc..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.mappings +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2005-2011 WSO2, Inc. (http://wso2.com) -# -# Licensed 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. -# - -# This file is to define the human readable media type for a mime type. -# Eg:- -# text/plain txt text -application/wsdl+xml WSDL -application/x-xsd+xml Schema -application/policy+xml Policy -application/vnd.wso2-service+xml Service -application/vnd.wso2-hyperlink Hyperlink -application/vnd.wso2.endpoint Endpoint -application/vnd.wso2-api+xml API -application/vnd.wso2-uri+xml URI diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types deleted file mode 100644 index 21c386da00..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/mime.types +++ /dev/null @@ -1,734 +0,0 @@ -# -# Copyright 2005-2009 WSO2, Inc. (http://wso2.com) -# -# Licensed 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. -# - -# Media type for wsdl files. This is not defined in the original mime.types file. -chemical/x-alchemy alc -application/andrew-inset ez -application/wsdl+xml wsdl -application/vnd.sun.wadl+xml wadl -application/activemessage -application/applefile -application/atomicmail -application/batch-SMTP -application/beep+xml -application/cals-1840 -application/commonground -application/cu-seeme cu -application/cybercash -application/dca-rft -application/dec-dx -application/docbook+xml -application/dsptype tsp -application/dvcs -application/edi-consent -application/edi-x12 -application/edifact -application/eshop -application/font-tdpfr -application/futuresplash spl -application/ghostview -application/hta hta -application/http -application/hyperstudio -application/iges -application/index -application/index.cmd -application/index.obj -application/index.response -application/index.vnd -application/iotp -application/ipp -application/isup -application/java-archive jar -application/java-serialized-object ser -application/java-vm class -application/mac-binhex40 hqx -application/mac-compactpro cpt -application/macwriteii -application/marc -application/mathematica nb -application/mathematica-old -application/msaccess mdb -application/msword doc dot -application/news-message-id -application/news-transmission -application/ocsp-request -application/ocsp-response -application/octet-stream bin -application/oda oda -application/ogg ogg -application/parityfec -application/pdf pdf -application/pgp-encrypted -application/pgp-keys key -application/pgp-signature pgp -application/pics-rules prf -application/pkcs10 -application/pkcs7-mime -application/pkcs7-signature -application/pkix-cert -application/pkix-crl -application/pkixcmp -application/policy+xml -application/postscript ps ai eps -application/prs.alvestrand.titrax-sheet -application/prs.cww -application/prs.nprend -application/qsig -application/rar rar -application/rdf+xml rdf -application/remote-printing -application/riscos -application/rss+xml rss -application/rtf -application/sdp -application/set-payment -application/set-payment-initiation -application/set-registration -application/set-registration-initiation -application/sgml -application/sgml-open-catalog -application/sieve -application/slate -application/smil smi smil -application/timestamp-query -application/timestamp-reply -application/vemmi -application/whoispp-query -application/whoispp-response -application/wita -application/wordperfect wpd -application/wordperfect5.1 wp5 -application/x400-bp -application/xhtml+xml xhtml xht -application/xml xml xsl xslt jrxml -application/xml-dtd -application/xml-external-parsed-entity -application/zip zip -application/vnd.3M.Post-it-Notes -application/vnd.accpac.simply.aso -application/vnd.accpac.simply.imp -application/vnd.acucobol -application/vnd.aether.imp -application/vnd.anser-web-certificate-issue-initiation -application/vnd.anser-web-funds-transfer-initiation -application/vnd.audiograph -application/vnd.bmi -application/vnd.businessobjects -application/vnd.canon-cpdl -application/vnd.canon-lips -application/vnd.cinderella cdy -application/vnd.claymore -application/vnd.commerce-battelle -application/vnd.commonspace -application/vnd.comsocaller -application/vnd.contact.cmsg -application/vnd.cosmocaller -application/vnd.ctc-posml -application/vnd.cups-postscript -application/vnd.cups-raster -application/vnd.cups-raw -application/vnd.cybank -application/vnd.dna -application/vnd.dpgraph -application/vnd.dxr -application/vnd.ecdis-update -application/vnd.ecowin.chart -application/vnd.ecowin.filerequest -application/vnd.ecowin.fileupdate -application/vnd.ecowin.series -application/vnd.ecowin.seriesrequest -application/vnd.ecowin.seriesupdate -application/vnd.enliven -application/vnd.epson.esf -application/vnd.epson.msf -application/vnd.epson.quickanime -application/vnd.epson.salt -application/vnd.epson.ssf -application/vnd.ericsson.quickcall -application/vnd.eudora.data -application/vnd.fdf -application/vnd.ffsns -application/vnd.flographit -application/vnd.framemaker -application/vnd.fsc.weblaunch -application/vnd.fujitsu.oasys -application/vnd.fujitsu.oasys2 -application/vnd.fujitsu.oasys3 -application/vnd.fujitsu.oasysgp -application/vnd.fujitsu.oasysprs -application/vnd.fujixerox.ddd -application/vnd.fujixerox.docuworks -application/vnd.fujixerox.docuworks.binder -application/vnd.fut-misnet -application/vnd.grafeq -application/vnd.groove-account -application/vnd.groove-identity-message -application/vnd.groove-injector -application/vnd.groove-tool-message -application/vnd.groove-tool-template -application/vnd.groove-vcard -application/vnd.hhe.lesson-player -application/vnd.hp-HPGL -application/vnd.hp-PCL -application/vnd.hp-PCLXL -application/vnd.hp-hpid -application/vnd.hp-hps -application/vnd.httphone -application/vnd.hzn-3d-crossword -application/vnd.ibm.MiniPay -application/vnd.ibm.afplinedata -application/vnd.ibm.modcap -application/vnd.informix-visionary -application/vnd.intercon.formnet -application/vnd.intertrust.digibox -application/vnd.intertrust.nncp -application/vnd.intu.qbo -application/vnd.intu.qfx -application/vnd.irepository.package+xml -application/vnd.is-xpr -application/vnd.japannet-directory-service -application/vnd.japannet-jpnstore-wakeup -application/vnd.japannet-payment-wakeup -application/vnd.japannet-registration -application/vnd.japannet-registration-wakeup -application/vnd.japannet-setstore-wakeup -application/vnd.japannet-verification -application/vnd.japannet-verification-wakeup -application/vnd.koan -application/vnd.lotus-1-2-3 -application/vnd.lotus-approach -application/vnd.lotus-freelance -application/vnd.lotus-notes -application/vnd.lotus-organizer -application/vnd.lotus-screencam -application/vnd.lotus-wordpro -application/vnd.mcd -application/vnd.mediastation.cdkey -application/vnd.meridian-slingshot -application/vnd.mif -application/vnd.minisoft-hp3000-save -application/vnd.mitsubishi.misty-guard.trustweb -application/vnd.mobius.daf -application/vnd.mobius.dis -application/vnd.mobius.msl -application/vnd.mobius.plc -application/vnd.mobius.txf -application/vnd.motorola.flexsuite -application/vnd.motorola.flexsuite.adsi -application/vnd.motorola.flexsuite.fis -application/vnd.motorola.flexsuite.gotap -application/vnd.motorola.flexsuite.kmr -application/vnd.motorola.flexsuite.ttc -application/vnd.motorola.flexsuite.wem -application/vnd.mozilla.xul+xml xul -application/vnd.ms-artgalry -application/vnd.ms-asf -application/vnd.ms-excel xls xlb xlt -application/vnd.ms-lrm -application/vnd.ms-pki.seccat cat -application/vnd.ms-pki.stl stl -application/vnd.ms-powerpoint ppt pps -application/vnd.ms-project -application/vnd.ms-tnef -application/vnd.ms-works -application/vnd.mseq -application/vnd.msign -application/vnd.music-niff -application/vnd.musician -application/vnd.netfpx -application/vnd.noblenet-directory -application/vnd.noblenet-sealer -application/vnd.noblenet-web -application/vnd.novadigm.EDM -application/vnd.novadigm.EDX -application/vnd.novadigm.EXT -application/vnd.oasis.opendocument.chart odc -application/vnd.oasis.opendocument.database odb -application/vnd.oasis.opendocument.formula odf -application/vnd.oasis.opendocument.graphics odg -application/vnd.oasis.opendocument.graphics-template otg -application/vnd.oasis.opendocument.image odi -application/vnd.oasis.opendocument.presentation odp -application/vnd.oasis.opendocument.presentation-template otp -application/vnd.oasis.opendocument.spreadsheet ods -application/vnd.oasis.opendocument.spreadsheet-template ots -application/vnd.oasis.opendocument.text odt -application/vnd.oasis.opendocument.text-master odm -application/vnd.oasis.opendocument.text-template ott -application/vnd.oasis.opendocument.text-web oth -application/vnd.osa.netdeploy -application/vnd.palm -application/vnd.pg.format -application/vnd.pg.osasli -application/vnd.powerbuilder6 -application/vnd.powerbuilder6-s -application/vnd.powerbuilder7 -application/vnd.powerbuilder7-s -application/vnd.powerbuilder75 -application/vnd.powerbuilder75-s -application/vnd.previewsystems.box -application/vnd.publishare-delta-tree -application/vnd.pvi.ptid1 -application/vnd.pwg-xhtml-print+xml -application/vnd.rapid -application/vnd.rim.cod cod -application/vnd.s3sms -application/vnd.seemail -application/vnd.shana.informed.formdata -application/vnd.shana.informed.formtemplate -application/vnd.shana.informed.interchange -application/vnd.shana.informed.package -application/vnd.smaf mmf -application/vnd.sss-cod -application/vnd.sss-dtf -application/vnd.sss-ntf -application/vnd.stardivision.calc sdc -application/vnd.stardivision.draw sda -application/vnd.stardivision.impress sdd sdp -application/vnd.stardivision.math smf -application/vnd.stardivision.writer sdw vor -application/vnd.stardivision.writer-global sgl -application/vnd.street-stream -application/vnd.sun.xml.calc sxc -application/vnd.sun.xml.calc.template stc -application/vnd.sun.xml.draw sxd -application/vnd.sun.xml.draw.template std -application/vnd.sun.xml.impress sxi -application/vnd.sun.xml.impress.template sti -application/vnd.sun.xml.math sxm -application/vnd.sun.xml.writer sxw -application/vnd.sun.xml.writer.global sxg -application/vnd.sun.xml.writer.template stw -application/vnd.svd -application/vnd.swiftview-ics -application/vnd.symbian.install sis -application/vnd.triscape.mxs -application/vnd.trueapp -application/vnd.truedoc -application/vnd.tve-trigger -application/vnd.ufdl -application/vnd.uplanet.alert -application/vnd.uplanet.alert-wbxml -application/vnd.uplanet.bearer-choice -application/vnd.uplanet.bearer-choice-wbxml -application/vnd.uplanet.cacheop -application/vnd.uplanet.cacheop-wbxml -application/vnd.uplanet.channel -application/vnd.uplanet.channel-wbxml -application/vnd.uplanet.list -application/vnd.uplanet.list-wbxml -application/vnd.uplanet.listcmd -application/vnd.uplanet.listcmd-wbxml -application/vnd.uplanet.signal -application/vnd.vcx -application/vnd.vectorworks -application/vnd.vidsoft.vidconference -application/vnd.visio vsd -application/vnd.vividence.scriptfile -application/vnd.wap.sic -application/vnd.wap.slc -application/vnd.wap.wbxml wbxml -application/vnd.wap.wmlc wmlc -application/vnd.wap.wmlscriptc wmlsc -application/vnd.webturbo -application/vnd.wrq-hp3000-labelled -application/vnd.wso2.bpel+xml bpel -application/vnd.wso2.bpmn+xml bpmn -application/vnd.wso2.endpoint -application/vnd.wso2.governance-archive gar -application/vnd.wso2-hyperlink -application/vnd.wso2.registry-ext-type+xml rxt -application/vnd.wso2-service+xml -application/vnd.wso2.xpdl+xml xpdl -application/vnd.wt.stf -application/vnd.xara -application/vnd.xfdl -application/vnd.yellowriver-custom-menu -application/x-123 wk -application/x-abiword abw -application/x-apple-diskimage dmg -application/x-bcpio bcpio -application/x-bittorrent torrent -application/x-cdf cdf -application/x-cdlink vcd -application/x-chess-pgn pgn -application/x-core -application/x-cpio cpio -application/x-csh csh -application/x-debian-package deb udeb -application/x-director dcr dir dxr -application/x-dms dms -application/x-doom wad -application/x-dvi dvi -application/x-executable -application/x-flac flac -application/x-font pfa pfb gsf pcf pcf.Z -application/x-freemind mm -application/x-futuresplash spl -application/x-gnumeric gnumeric -application/x-go-sgf sgf -application/x-graphing-calculator gcf -application/x-gtar gtar tgz taz -application/x-hdf hdf -application/x-httpd-php phtml pht php -application/x-httpd-php-source phps -application/x-httpd-php3 php3 -application/x-httpd-php3-preprocessed php3p -application/x-httpd-php4 php4 -application/x-httpd-eruby rhtml -application/x-ica ica -application/x-internet-signup ins isp -application/x-iphone iii -application/x-iso9660-image iso -application/x-java-applet -application/x-java-bean -application/x-java-jnlp-file jnlp -application/x-javascript js -application/x-jmol jmz -application/x-kchart chrt -application/x-kdelnk -application/x-killustrator kil -application/x-koan skp skd skt skm -application/x-kpresenter kpr kpt -application/x-kspread ksp -application/x-kword kwd kwt -application/x-latex latex -application/x-lha lha -application/x-lzh lzh -application/x-lzx lzx -application/x-maker frm maker frame fm fb book fbdoc -application/x-mif mif -application/x-ms-wmd wmd -application/x-ms-wmz wmz -application/x-msdos-program com exe bat dll -application/x-msi msi -application/x-netcdf nc -application/x-ns-proxy-autoconfig pac -application/x-nwc nwc -application/x-object o -application/x-oz-application oza -application/x-pkcs7-certreqresp p7r -application/x-pkcs7-crl crl -application/x-python-code pyc pyo -application/x-quicktimeplayer qtl -application/x-redhat-package-manager rpm -application/x-rx -application/x-sh sh -application/x-shar shar -application/x-shellscript -application/x-shockwave-flash swf swfl -application/x-stuffit sit -application/x-sv4cpio sv4cpio -application/x-sv4crc sv4crc -application/x-tar tar -application/x-tcl tcl -application/x-tex-gf gf -application/x-tex-pk pk -application/x-texinfo texinfo texi -application/x-trash ~ % bak old sik -application/x-troff t tr roff -application/x-troff-man man -application/x-troff-me me -application/x-troff-ms ms -application/x-ustar ustar -application/x-videolan -application/x-wais-source src -application/x-wingz wz -application/x-x509-ca-cert crt -application/x-xcf xcf -application/x-xfig fig -application/x-xpinstall xpi -application/x-xsd+xml xsd - -audio/32kadpcm -audio/basic au snd -audio/g.722.1 -audio/l16 -audio/midi mid midi kar -audio/mp4a-latm -audio/mpa-robust -audio/mpeg mpga mpega mp2 mp3 m4a -audio/mpegurl m3u -audio/parityfec -audio/prs.sid sid -audio/telephone-event -audio/tone -audio/vnd.cisco.nse -audio/vnd.cns.anp1 -audio/vnd.cns.inf1 -audio/vnd.digital-winds -audio/vnd.everad.plj -audio/vnd.lucent.voice -audio/vnd.nortel.vbk -audio/vnd.nuera.ecelp4800 -audio/vnd.nuera.ecelp7470 -audio/vnd.nuera.ecelp9600 -audio/vnd.octel.sbc -audio/vnd.qcelp -audio/vnd.rhetorex.32kadpcm -audio/vnd.vmx.cvsd -audio/x-aiff aif aiff aifc -audio/x-gsm gsm -audio/x-mpegurl m3u -audio/x-ms-wma wma -audio/x-ms-wax wax -audio/x-pn-realaudio-plugin -audio/x-pn-realaudio ra rm ram -audio/x-realaudio ra -audio/x-scpls pls -audio/x-sd2 sd2 -audio/x-wav wav - -chemical/x-alchemy alc -chemical/x-cache cac cache -chemical/x-cache-csf csf -chemical/x-cactvs-binary cbin cascii ctab -chemical/x-cdx cdx -chemical/x-cerius cer -chemical/x-chem3d c3d -chemical/x-chemdraw chm -chemical/x-cif cif -chemical/x-cmdf cmdf -chemical/x-cml cml -chemical/x-compass cpa -chemical/x-crossfire bsd -chemical/x-csml csml csm -chemical/x-ctx ctx -chemical/x-cxf cxf cef -#chemical/x-daylight-smiles smi -chemical/x-embl-dl-nucleotide emb embl -chemical/x-galactic-spc spc -chemical/x-gamess-input inp gam gamin -chemical/x-gaussian-checkpoint fch fchk -chemical/x-gaussian-cube cub -chemical/x-gaussian-input gau gjc gjf -chemical/x-gaussian-log gal -chemical/x-gcg8-sequence gcg -chemical/x-genbank gen -chemical/x-hin hin -chemical/x-isostar istr ist -chemical/x-jcamp-dx jdx dx -chemical/x-kinemage kin -chemical/x-macmolecule mcm -chemical/x-macromodel-input mmd mmod -chemical/x-mdl-molfile mol -chemical/x-mdl-rdfile rd -chemical/x-mdl-rxnfile rxn -chemical/x-mdl-sdfile sd sdf -chemical/x-mdl-tgf tgf -#chemical/x-mif mif -chemical/x-mmcif mcif -chemical/x-mol2 mol2 -chemical/x-molconn-Z b -chemical/x-mopac-graph gpt -chemical/x-mopac-input mop mopcrt mpc dat zmt -chemical/x-mopac-out moo -chemical/x-mopac-vib mvb -chemical/x-ncbi-asn1 asn -chemical/x-ncbi-asn1-ascii prt ent -chemical/x-ncbi-asn1-binary val aso -chemical/x-ncbi-asn1-spec asn -chemical/x-pdb pdb ent -chemical/x-rosdal ros -chemical/x-swissprot sw -chemical/x-vamas-iso14976 vms -chemical/x-vmd vmd -chemical/x-xtel xtel -chemical/x-xyz xyz - -image/cgm -image/g3fax -image/gif gif -image/ief ief -image/jpeg jpeg jpg jpe -image/naplps -image/pcx pcx -image/png png -image/prs.btif -image/prs.pti -image/svg+xml svg svgz -image/tiff tiff tif -image/vnd.cns.inf2 -image/vnd.djvu djvu djv -image/vnd.dwg -image/vnd.dxf -image/vnd.fastbidsheet -image/vnd.fpx -image/vnd.fst -image/vnd.fujixerox.edmics-mmr -image/vnd.fujixerox.edmics-rlc -image/vnd.mix -image/vnd.net-fpx -image/vnd.svf -image/vnd.wap.wbmp wbmp -image/vnd.xiff -image/x-cmu-raster ras -image/x-coreldraw cdr -image/x-coreldrawpattern pat -image/x-coreldrawtemplate cdt -image/x-corelphotopaint cpt -image/x-icon ico -image/x-jg art -image/x-jng jng -image/x-ms-bmp bmp -image/x-photoshop psd -image/x-portable-anymap pnm -image/x-portable-bitmap pbm -image/x-portable-graymap pgm -image/x-portable-pixmap ppm -image/x-rgb rgb -image/x-xbitmap xbm -image/x-xpixmap xpm -image/x-xwindowdump xwd - -inode/chardevice -inode/blockdevice -inode/directory-locked -inode/directory -inode/fifo -inode/socket - -message/delivery-status -message/disposition-notification -message/external-body -message/http -message/s-http -message/news -message/partial -message/rfc822 - -model/iges igs iges -model/mesh msh mesh silo -model/vnd.dwf -model/vnd.flatland.3dml -model/vnd.gdl -model/vnd.gs-gdl -model/vnd.gtw -model/vnd.mts -model/vnd.vtu -model/vrml wrl vrml - -multipart/alternative -multipart/appledouble -multipart/byteranges -multipart/digest -multipart/encrypted -multipart/form-data -multipart/header-set -multipart/mixed -multipart/parallel -multipart/related -multipart/report -multipart/signed -multipart/voice-message - -text/calendar ics icz -text/comma-separated-values csv -text/css css -text/directory -text/english -text/enriched -text/h323 323 -text/html html htm shtml -text/iuls uls -text/mathml mml -text/parityfec -text/plain asc txt text diff pot sql -text/prs.lines.tag -text/rfc822-headers -text/richtext rtx -text/rtf rtf -text/scriptlet sct wsc -text/t140 -text/texmacs tm ts -text/tab-separated-values tsv -text/uri-list -text/vnd.abc -text/vnd.curl -text/vnd.DMClientScript -text/vnd.flatland.3dml -text/vnd.fly -text/vnd.fmi.flexstor -text/vnd.in3d.3dml -text/vnd.in3d.spot -text/vnd.IPTC.NewsML -text/vnd.IPTC.NITF -text/vnd.latex-z -text/vnd.motorola.reflex -text/vnd.ms-mediapackage -text/vnd.sun.j2me.app-descriptor jad -text/vnd.wap.si -text/vnd.wap.sl -text/vnd.wap.wml wml -text/vnd.wap.wmlscript wmls -text/x-bibtex bib -text/x-boo boo -text/x-c++hdr h++ hpp hxx hh -text/x-c++src c++ cpp cxx cc -text/x-chdr h -text/x-component htc -text/x-crontab -text/x-csh csh -text/x-csrc c -text/x-dsrc d -text/x-haskell hs -text/x-java java -text/x-literate-haskell lhs -text/x-makefile -text/x-moc moc -text/x-pascal p pas -text/x-pcs-gcd gcd -text/x-perl pl pm -text/x-python py -text/x-server-parsed-html -text/x-setext etx -text/x-sh sh -text/x-tcl tcl tk -text/x-tex tex ltx sty cls -text/x-vcalendar vcs -text/x-vcard vcf - -video/dl dl -video/dv dif dv -video/fli fli -video/gl gl -video/mpeg mpeg mpg mpe -video/mp4 mp4 -video/quicktime qt mov -video/mp4v-es -video/parityfec -video/pointer -video/vnd.fvt -video/vnd.motorola.video -video/vnd.motorola.videop -video/vnd.mpegurl mxu -video/vnd.mts -video/vnd.nokia.interleaved-multimedia -video/vnd.vivo -video/x-la-asf lsf lsx -video/x-mng mng -video/x-ms-asf asf asx -video/x-ms-wm wm -video/x-ms-wmv wmv -video/x-ms-wmx wmx -video/x-ms-wvx wvx -video/x-msvideo avi -video/x-sgi-movie movie - -x-conference/x-cooltalk ice - -x-world/x-vrml vrm vrml wrl diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options deleted file mode 100644 index ba8e3c6c20..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options +++ /dev/null @@ -1,95 +0,0 @@ -#### Debugging options for org.eclipse.osgi - -# Turn on general debugging for org.eclipse.osgi -org.eclipse.osgi/debug=true -# Prints out class loading debug information -org.eclipse.osgi/debug/loader=false -# Prints out event (FrameworkEvent/BundleEvent/ServiceEvent) and listener debug information -org.eclipse.osgi/debug/events=false -# Prints out OSGi service debug information (registration/getting/ungetting etc.) -org.eclipse.osgi/debug/services=false -# Prints out bundle manifest parsing debug information -org.eclipse.osgi/debug/manifest=false -# Prints out LDAP filter debug information -org.eclipse.osgi/debug/filter=false -# Prints out security (PermissionAdmin service) debug information -org.eclipse.osgi/debug/security=false -# Prints out start level service debug information -org.eclipse.osgi/debug/startlevel=true -# Prints out package admin service debug information -org.eclipse.osgi/debug/packageadmin=false -# Prints out timing information for bundle activation -org.eclipse.osgi/debug/bundleTime=false -# Debug the loading of message bundles -org.eclipse.osgi/debug/messageBundles=false - -# Eclipse adaptor options -org.eclipse.osgi/eclipseadaptor/debug = false -org.eclipse.osgi/eclipseadaptor/debug/location = false -org.eclipse.osgi/eclipseadaptor/debug/platformadmin=false -org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver=false -org.eclipse.osgi/eclipseadaptor/converter/debug = false - -### OSGi resolver options -# Turns on debugging for the resolver -org.eclipse.osgi/resolver/debug = false -# Prints out wiring information after the resolver has completed the resolve process -org.eclipse.osgi/resolver/wiring = false -# Prints out Import-Package information -org.eclipse.osgi/resolver/imports = false -# Prints out Require-Bundle information -org.eclipse.osgi/resolver/requires = false -# Prints out package grouping information form the "uses" clause -org.eclipse.osgi/resolver/grouping = false -# Prints out cycle information -org.eclipse.osgi/resolver/cycles = false -# Prints out Eclipse-GenericRequire information -org.eclipse.osgi/resolver/generics = false - -#### Profile settings -org.eclipse.osgi/profile/startup = false -org.eclipse.osgi/profile/benchmark = false -org.eclipse.osgi/profile/debug = true - -# Override the default implemenation -org.eclipse.osgi/profile/impl = org.eclipse.osgi.internal.profile.DefaultProfileLogger - -# Append all profile messages to the filename specified -org.eclipse.osgi/defaultprofile/logfilename = - -# Output all profile log messages synchronously to the jvm console. -# By default, all log messages are cached until the log buffer is -# requested. -org.eclipse.osgi/defaultprofile/logsynchronously = false - -# Specify the size of the default profile implementation log buffer. -org.eclipse.osgi/defaultprofile/buffersize = 256 - -#### Monitoring settings -# monitor class loading -org.eclipse.osgi/monitor/classes=false - -# monitor bundle activation -org.eclipse.osgi/monitor/activation=false - -# monitor resource bundle (*.properties) loading -org.eclipse.osgi/monitor/resources=false - - -#### Trace settings -# trace class loading - snapshot the execution stack when a class is loaded -org.eclipse.osgi/trace/classLoading=false - -# trace location - file in which execution traces are written -org.eclipse.osgi/trace/filename=runtime.traces - -# trace filters - Java properties file defining which classes should -# be traced (if trace/classLoading is true) -# File format: -# plugins= -# packages= -# Note that there may be many 'plugins' and 'packages' lines in one file. -org.eclipse.osgi/trace/filters=trace.properties - -# trace bundle activation - snapshot the execution stack when a bundle is activated -org.eclipse.osgi/trace/activation=false diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml deleted file mode 100644 index dec2307f1d..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - AUTO - - - 2 - - - - org.wso2.carbon.ntask.core.impl.RoundRobinTaskLocationResolver - - - - - - - https://localhost:9448 - - - https://localhost:9443 - - - admin - - - admin - - - - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/notification-messages.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/notification-messages.xml deleted file mode 100644 index 9b13c5d808..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/notification-messages.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - Enroll your Device with WSO2 MDM -
Dear {first-name},
- - You have been registered to the WSO2 MDM. Below is the link to enroll. - - {downloadUrl} - - Best Regards, - - - WSO2 MDM Team. - - - http://www.wso2.com - -
- - Enroll your Device with WSO2 MDM -
Dear {first-name},
- -You have been registered to WSO2 MDM with following credentials. -Username: {user-name} -Password: {password} -Below is the link to enroll. - - {downloadUrl} - - Best Regards, - - - WSO2 MDM Team. - - - http://www.wso2.com - -
-
\ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml deleted file mode 100644 index 01ffe07c15..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/registry.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml deleted file mode 100644 index 056604dd9e..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - WEB-INF/web.xml - - - - - - - - - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml deleted file mode 100644 index 456539a6fd..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - bridgeservlet - Carbon Bridge Servlet - Carbon Bridge Servlet - org.wso2.carbon.tomcat.ext.servlet.DelegationServlet - - 1 - - - bridgeservlet - /* - - - - bridgeservlet - *.jsp - - - - - CharsetFilter - org.wso2.carbon.tomcat.ext.filter.CharacterSetFilter - - requestEncoding - UTF-8 - - - - - CharsetFilter - /* - - - - 15 - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml deleted file mode 100644 index 8347929309..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml deleted file mode 100644 index 7ef7dbb0a1..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml deleted file mode 100644 index d4241ef741..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/tomcat/web.xml +++ /dev/null @@ -1,1220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - org.apache.catalina.servlets.DefaultServlet - - debug - 0 - - - sendfileSize - -1 - - - listings - false - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - org.apache.jasper.servlet.JspServlet - - fork - false - - - xpoweredBy - false - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - *.jsp - - - - jsp - *.jspx - - - - default - / - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 30 - - - - - - - - - - - - abs - audio/x-mpeg - - - ai - application/postscript - - - aif - audio/x-aiff - - - aifc - audio/x-aiff - - - aiff - audio/x-aiff - - - aim - application/x-aim - - - art - image/x-jg - - - asf - video/x-ms-asf - - - asx - video/x-ms-asf - - - au - audio/basic - - - avi - video/x-msvideo - - - avx - video/x-rad-screenplay - - - bcpio - application/x-bcpio - - - bin - application/octet-stream - - - bmp - image/bmp - - - body - text/html - - - cdf - application/x-cdf - - - cer - application/x-x509-ca-cert - - - class - application/java - - - cpio - application/x-cpio - - - csh - application/x-csh - - - css - text/css - - - dib - image/bmp - - - doc - application/msword - - - dtd - application/xml-dtd - - - dv - video/x-dv - - - dvi - application/x-dvi - - - eps - application/postscript - - - etx - text/x-setext - - - exe - application/octet-stream - - - gif - image/gif - - - gtar - application/x-gtar - - - gz - application/x-gzip - - - hdf - application/x-hdf - - - hqx - application/mac-binhex40 - - - htc - text/x-component - - - htm - text/html - - - html - text/html - - - ief - image/ief - - - jad - text/vnd.sun.j2me.app-descriptor - - - jar - application/java-archive - - - java - text/plain - - - jnlp - application/x-java-jnlp-file - - - jpe - image/jpeg - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - js - application/javascript - - - jsf - text/plain - - - jspf - text/plain - - - kar - audio/x-midi - - - latex - application/x-latex - - - m3u - audio/x-mpegurl - - - mac - image/x-macpaint - - - man - application/x-troff-man - - - mathml - application/mathml+xml - - - me - application/x-troff-me - - - mid - audio/x-midi - - - midi - audio/x-midi - - - mif - application/x-mif - - - mov - video/quicktime - - - movie - video/x-sgi-movie - - - mp1 - audio/x-mpeg - - - mp2 - audio/x-mpeg - - - mp3 - audio/x-mpeg - - - mp4 - video/mp4 - - - mpa - audio/x-mpeg - - - mpe - video/mpeg - - - mpeg - video/mpeg - - - mpega - audio/x-mpeg - - - mpg - video/mpeg - - - mpv2 - video/mpeg2 - - - ms - application/x-wais-source - - - nc - application/x-netcdf - - - oda - application/oda - - - - odb - application/vnd.oasis.opendocument.database - - - - odc - application/vnd.oasis.opendocument.chart - - - - odf - application/vnd.oasis.opendocument.formula - - - - odg - application/vnd.oasis.opendocument.graphics - - - - odi - application/vnd.oasis.opendocument.image - - - - odm - application/vnd.oasis.opendocument.text-master - - - - odp - application/vnd.oasis.opendocument.presentation - - - - ods - application/vnd.oasis.opendocument.spreadsheet - - - - odt - application/vnd.oasis.opendocument.text - - - - otg - application/vnd.oasis.opendocument.graphics-template - - - - oth - application/vnd.oasis.opendocument.text-web - - - - otp - application/vnd.oasis.opendocument.presentation-template - - - - ots - application/vnd.oasis.opendocument.spreadsheet-template - - - - ott - application/vnd.oasis.opendocument.text-template - - - - ogx - application/ogg - - - ogv - video/ogg - - - oga - audio/ogg - - - ogg - audio/ogg - - - spx - audio/ogg - - - flac - audio/flac - - - anx - application/annodex - - - axa - audio/annodex - - - axv - video/annodex - - - xspf - application/xspf+xml - - - pbm - image/x-portable-bitmap - - - pct - image/pict - - - pdf - application/pdf - - - pgm - image/x-portable-graymap - - - pic - image/pict - - - pict - image/pict - - - pls - audio/x-scpls - - - png - image/png - - - pnm - image/x-portable-anymap - - - pnt - image/x-macpaint - - - ppm - image/x-portable-pixmap - - - ppt - application/vnd.ms-powerpoint - - - pps - application/vnd.ms-powerpoint - - - ps - application/postscript - - - psd - image/x-photoshop - - - qt - video/quicktime - - - qti - image/x-quicktime - - - qtif - image/x-quicktime - - - ras - image/x-cmu-raster - - - rdf - application/rdf+xml - - - rgb - image/x-rgb - - - rm - application/vnd.rn-realmedia - - - roff - application/x-troff - - - rtf - application/rtf - - - rtx - text/richtext - - - sh - application/x-sh - - - shar - application/x-shar - - - - smf - audio/x-midi - - - sit - application/x-stuffit - - - snd - audio/basic - - - src - application/x-wais-source - - - sv4cpio - application/x-sv4cpio - - - sv4crc - application/x-sv4crc - - - svg - image/svg+xml - - - svgz - image/svg+xml - - - swf - application/x-shockwave-flash - - - t - application/x-troff - - - tar - application/x-tar - - - tcl - application/x-tcl - - - tex - application/x-tex - - - texi - application/x-texinfo - - - texinfo - application/x-texinfo - - - tif - image/tiff - - - tiff - image/tiff - - - tr - application/x-troff - - - tsv - text/tab-separated-values - - - txt - text/plain - - - ulw - audio/basic - - - ustar - application/x-ustar - - - vxml - application/voicexml+xml - - - xbm - image/x-xbitmap - - - xht - application/xhtml+xml - - - xhtml - application/xhtml+xml - - - xls - application/vnd.ms-excel - - - xml - application/xml - - - xpm - image/x-xpixmap - - - xsl - application/xml - - - xslt - application/xslt+xml - - - xul - application/vnd.mozilla.xul+xml - - - xwd - image/x-xwindowdump - - - vsd - application/x-visio - - - wav - audio/x-wav - - - - wbmp - image/vnd.wap.wbmp - - - - wml - text/vnd.wap.wml - - - - wmlc - application/vnd.wap.wmlc - - - - wmls - text/vnd.wap.wmlscript - - - - wmlscriptc - application/vnd.wap.wmlscriptc - - - wmv - video/x-ms-wmv - - - wrl - x-world/x-vrml - - - wspolicy - application/wspolicy+xml - - - Z - application/x-compress - - - z - application/x-compress - - - zip - application/zip - - - - - - - - - - - - - - - - - - index.html - index.htm - index.jsp - - - \ No newline at end of file diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml deleted file mode 100644 index 2f7ace692c..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/user-mgt.xml +++ /dev/null @@ -1,379 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - jdbc/WSO2CarbonDB - - - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - 100 - false - default - SHA-256 - true - true - true - false - ^[\S]{5,30}$ - Password length should be between 5 to 30 characters - ^[\S]{5,30}$ - [a-zA-Z0-9._-|//]{3,30}$ - ^[\S]{3,30}$ - ^[^~!#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$ - ^[\S]{3,30}$ - true - 100 - 100 - false - false - true - , - true - - - - - - - - - - - - - - - - - - - /permission - true - true - - - - - From b5facd468a701aedb0ad51721e69ab37802b50c4 Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Mon, 2 Oct 2017 11:01:25 +0530 Subject: [PATCH 5/8] Fixed powermockito version --- .../org.wso2.carbon.certificate.mgt.core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml index d522e2b223..8f3fcc9897 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml @@ -175,7 +175,7 @@ org.powermock powermock-module-testng - 1.7.0 + test org.wso2.carbon From 32ee88852c18917cc43ec365a1cc644b581189d5 Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Mon, 2 Oct 2017 11:02:10 +0530 Subject: [PATCH 6/8] Fixed formatting of unit tests --- ...CertificateManagementServiceImplTests.java | 575 +++++------------- 1 file changed, 159 insertions(+), 416 deletions(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java index 1278b48872..f8023644a2 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java @@ -46,7 +46,6 @@ import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; import sun.misc.BASE64Encoder; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -66,17 +65,9 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC @Test(description = "This test case tests initialization of CertificateManagementServiceImpl instance") public void testGetInstance() { - try { - CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); - Assert.assertNotNull(instance); - log.info("getInstance Test Successful"); - - } catch (NullPointerException e) { - log.error("Error while initializing CertificateManagementService", e); - Assert.fail(); - } - - + CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); + Assert.assertNotNull(instance); + log.info("getInstance Test Successful"); } @BeforeClass @@ -85,510 +76,262 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC managementService = CertificateManagementServiceImpl.getInstance(); //set Bouncycastle as a provider for testing Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); - } @Test(description = "This test case tests retrieval of CA Certificate from the keystore") - public void testGetCACertificate() { - try { - CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); - Certificate caCertificate = instance.getCACertificate(); - Assert.assertNotNull(caCertificate); - Assert.assertEquals(caCertificate.getType(), CertificateManagementConstants.X_509); - log.info("GetCACertificate Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while getting the CA Certificate"; - log.error(msg, e); - Assert.fail(msg, e); - } + public void testGetCACertificate() throws KeystoreException { + CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); + Certificate caCertificate = instance.getCACertificate(); + Assert.assertNotNull(caCertificate); + Assert.assertEquals(caCertificate.getType(), CertificateManagementConstants.X_509); + log.info("GetCACertificate Test Successful"); } @Test(description = "This test case tests retrieval of RA Certificate from the keystore") - public void testGetRACertificate() { - try { - Certificate raCertificate = managementService.getRACertificate(); - Assert.assertNotNull(raCertificate); - Assert.assertEquals(raCertificate.getType(), CertificateManagementConstants.X_509); - log.info("GetRACertificate Test Successful"); - } catch (KeystoreException e) { - String msg = "Error while getting the RA Certificate"; - log.error(msg, e); - Assert.fail(msg, e); - } + public void testGetRACertificate() throws KeystoreException { + Certificate raCertificate = managementService.getRACertificate(); + Assert.assertNotNull(raCertificate); + Assert.assertEquals(raCertificate.getType(), CertificateManagementConstants.X_509); + log.info("GetRACertificate Test Successful"); } @Test(description = "This test case test generation of root certificates") - public void testGetRootCertificate() { + public void testGetRootCertificate() throws IOException, KeystoreException { File caCert = new File(CA_CERT_PEM); File raCert = new File(RA_CERT_PEM); - - try { - //read file to byte arrays - byte[] caBytes = FileUtils.readFileToByteArray(caCert); - byte[] raBytes = FileUtils.readFileToByteArray(raCert); - - List rootCertificates = managementService.getRootCertificates(caBytes, raBytes); - Assert.assertNotNull(rootCertificates); - Assert.assertEquals(rootCertificates.get(0).getType(), CertificateManagementConstants.X_509); - Assert.assertEquals(rootCertificates.get(1).getType(), CertificateManagementConstants.X_509); - log.info("GetRootCertificate Test Successful"); - - } catch (IOException e) { - String msg = "Error reading byte streams"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (KeystoreException e) { - String msg = "Error retrieving root certificates"; - log.error(msg, e); - Assert.fail(msg, e); - } - + //read file to byte arrays + byte[] caBytes = FileUtils.readFileToByteArray(caCert); + byte[] raBytes = FileUtils.readFileToByteArray(raCert); + List rootCertificates = managementService.getRootCertificates(caBytes, raBytes); + Assert.assertNotNull(rootCertificates); + Assert.assertEquals(rootCertificates.get(0).getType(), CertificateManagementConstants.X_509); + Assert.assertEquals(rootCertificates.get(1).getType(), CertificateManagementConstants.X_509); + log.info("GetRootCertificate Test Successful"); } @Test(description = "This test case tests generation of X509Certificate") - public void testGenerateX509Certificate() { - try { - - X509Certificate x509Certificate = managementService.generateX509Certificate(); - Assert.assertNotNull(x509Certificate); - Assert.assertEquals(x509Certificate.getType(), CertificateManagementConstants.X_509); - log.info("GenerateX509Certificate Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while generating X509 Certificate"; - log.error(msg, e); - Assert.fail(msg, e); - } + public void testGenerateX509Certificate() throws KeystoreException { + X509Certificate x509Certificate = managementService.generateX509Certificate(); + Assert.assertNotNull(x509Certificate); + Assert.assertEquals(x509Certificate.getType(), CertificateManagementConstants.X_509); + log.info("GenerateX509Certificate Test Successful"); } @Test(description = "This test case tests retrieving SCEP CA Certificate") - public void testGetCACertSCEP() { - try { - - SCEPResponse caCertSCEP = managementService.getCACertSCEP(); - Assert.assertNotNull(caCertSCEP); - Assert.assertEquals(caCertSCEP.getResultCriteria(), CAStatus.CA_RA_CERT_RECEIVED); - log.info("GetCACertSCEP Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while Retrieving CA Certificate"; - log.error(msg, e); - Assert.fail(msg, e); - } - + public void testGetCACertSCEP() throws KeystoreException { + SCEPResponse caCertSCEP = managementService.getCACertSCEP(); + Assert.assertNotNull(caCertSCEP); + Assert.assertEquals(caCertSCEP.getResultCriteria(), CAStatus.CA_RA_CERT_RECEIVED); + log.info("GetCACertSCEP Test Successful"); } @Test public void testGetCACapsSCEP() { - byte[] caCapsSCEP = managementService.getCACapsSCEP(); Assert.assertNotNull(caCapsSCEP); Assert.assertEquals(caCapsSCEP, CertificateManagementConstants.POST_BODY_CA_CAPS.getBytes()); log.info("GetCACapsSCEP Test Successful"); - - } @Test(description = "This test case tests generation of a X509Certificate from a CSR") - public void testGenerateCertificateFromCSR() { + public void testGenerateCertificateFromCSR() throws KeystoreException, IOException { CSRGenerator csrGeneration = new CSRGenerator(); KeyStoreReader keyStoreReader = new KeyStoreReader(); - // Generate key pair KeyPair keyPair = csrGeneration.generateKeyPair("RSA", 1024); byte[] csrData = csrGeneration.generateCSR("SHA256WithRSA", keyPair); PKCS10CertificationRequest certificationRequest; - - try { - PrivateKey privateKeyCA = keyStoreReader.getCAPrivateKey(); - X509Certificate certCA = (X509Certificate) keyStoreReader.getCACertificate(); - certificationRequest = new PKCS10CertificationRequest(csrData); - X509Certificate x509Certificate = managementService.generateCertificateFromCSR(privateKeyCA, - certificationRequest, certCA.getIssuerX500Principal().getName()); - - Assert.assertNotNull(x509Certificate); - Assert.assertEquals(x509Certificate.getType(), CertificateManagementConstants.X_509); - log.info("GenerateCertificateFromCSR Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while reading Certificates from the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - - } catch (IOException e) { - String msg = "Error while reading byte streams"; - log.error(msg, e); - Assert.fail(msg, e); - } - + PrivateKey privateKeyCA = keyStoreReader.getCAPrivateKey(); + X509Certificate certCA = (X509Certificate) keyStoreReader.getCACertificate(); + certificationRequest = new PKCS10CertificationRequest(csrData); + X509Certificate x509Certificate = managementService.generateCertificateFromCSR(privateKeyCA, + certificationRequest, certCA.getIssuerX500Principal().getName()); + Assert.assertNotNull(x509Certificate); + Assert.assertEquals(x509Certificate.getType(), CertificateManagementConstants.X_509); + log.info("GenerateCertificateFromCSR Test Successful"); } @Test(description = "This test case tests retrieval of a Certificate from the keystore from the Serial Number") - public void testGetCertificateBySerial() { - + public void testGetCertificateBySerial() throws KeystoreException, DeviceManagementException { X509Certificate x509Certificate = null; - try { - //generate and save a certificate - x509Certificate = managementService.generateX509Certificate(); - //initialize DeviceConfigurationManager - DeviceConfigurationManager.getInstance().initConfig(); - CertificateResponse certificateBySerial = managementService.getCertificateBySerial(x509Certificate.getSerialNumber().toString()); - - Assert.assertNotNull(certificateBySerial); - Assert.assertEquals(certificateBySerial.getSerialNumber(), x509Certificate.getSerialNumber().toString()); - log.info("GetCertificateBySerial Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while receiving the certificate"; - log.error(msg, e); - Assert.fail(msg, e); - - } catch (DeviceManagementException e) { - String msg = "Error while initilizing DeviceConfigurationManager"; - log.error(msg, e); - } - - + //generate and save a certificate + x509Certificate = managementService.generateX509Certificate(); + //initialize DeviceConfigurationManager + DeviceConfigurationManager.getInstance().initConfig(); + CertificateResponse certificateBySerial = managementService.getCertificateBySerial(x509Certificate.getSerialNumber().toString()); + Assert.assertNotNull(certificateBySerial); + Assert.assertEquals(certificateBySerial.getSerialNumber(), x509Certificate.getSerialNumber().toString()); + log.info("GetCertificateBySerial Test Successful"); } @Test(description = "This test case tests retrieval of a Certificate from the keystore from the Alias") - public void testGetCertificateByAlias() { + public void testGetCertificateByAlias() throws KeystoreException, DeviceManagementException { X509Certificate x509Certificate = null; - try { - //generate and save a certificate - x509Certificate = managementService.generateX509Certificate(); - - //initialize DeviceConfigurationManager - DeviceConfigurationManager.getInstance().initConfig(); - Certificate certificateByAlias = managementService.getCertificateByAlias(x509Certificate.getSerialNumber().toString()); - - - Assert.assertNotNull(certificateByAlias); - Assert.assertEquals(certificateByAlias.getType(), CertificateManagementConstants.X_509); - log.info("GetCertificateByAlias Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while receiving the certificate"; - log.error(msg, e); - Assert.fail(msg, e); - - } catch (DeviceManagementException e) { - String msg = "Error while initilizing DeviceConfigurationManager"; - log.error(msg, e); - } + //generate and save a certificate + x509Certificate = managementService.generateX509Certificate(); + //initialize DeviceConfigurationManager + DeviceConfigurationManager.getInstance().initConfig(); + Certificate certificateByAlias = managementService.getCertificateByAlias(x509Certificate.getSerialNumber().toString()); + Assert.assertNotNull(certificateByAlias); + Assert.assertEquals(certificateByAlias.getType(), CertificateManagementConstants.X_509); + log.info("GetCertificateByAlias Test Successful"); } @Test(description = "This test case tests Signature verification of a Certificate against the keystore") - public void testVerifySignature() { + public void testVerifySignature() throws KeystoreException, CertificateEncodingException, CMSException, IOException { BASE64Encoder encoder = new BASE64Encoder(); - - try { - //generate and save a certificate in the keystore - X509Certificate x509Certificate = managementService.generateX509Certificate(); - - //Generate CMSdata - CMSSignedDataGenerator generator = new CMSSignedDataGenerator(); - List list = new ArrayList<>(); - list.add(x509Certificate); - JcaCertStore store = new JcaCertStore(list); - generator.addCertificates(store); - CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); - byte[] signature = degenerateSd.getEncoded(); - - boolean verifySignature = managementService.verifySignature(encoder.encode(signature)); - - Assert.assertNotNull(verifySignature); - Assert.assertTrue(verifySignature); - log.info("VerifySignature Test Successful"); - - } catch (CertificateEncodingException e) { - String msg = "Error in Certificate encoding"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (IOException e) { - String msg = "Error reading encoded signature"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (CMSException e) { - String msg = "Error Adding certificates"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } - - + //generate and save a certificate in the keystore + X509Certificate x509Certificate = managementService.generateX509Certificate(); + //Generate CMSdata + CMSSignedDataGenerator generator = new CMSSignedDataGenerator(); + List list = new ArrayList<>(); + list.add(x509Certificate); + JcaCertStore store = new JcaCertStore(list); + generator.addCertificates(store); + CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); + byte[] signature = degenerateSd.getEncoded(); + boolean verifySignature = managementService.verifySignature(encoder.encode(signature)); + Assert.assertNotNull(verifySignature); + Assert.assertTrue(verifySignature); + log.info("VerifySignature Test Successful"); } @Test(description = "This test case tests DN verification of a Certificate against the keystore") - public void testVerifySubjectDN() { - try { - DeviceConfigurationManager.getInstance().initConfig(); - X509Certificate x509Certificate = managementService.generateX509Certificate(); - log.info(x509Certificate.getIssuerX500Principal().getName()); - - managementService.verifySubjectDN(x509Certificate.getIssuerDN().getName()); - - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (DeviceManagementException e) { - String msg = "Error while initilizing DeviceConfigurationManager"; - log.error(msg, e); - - } + public void testVerifySubjectDN() throws DeviceManagementException, KeystoreException { + DeviceConfigurationManager.getInstance().initConfig(); + X509Certificate x509Certificate = managementService.generateX509Certificate(); + log.info(x509Certificate.getIssuerX500Principal().getName()); + managementService.verifySubjectDN(x509Certificate.getIssuerDN().getName()); } @Test(description = "This test case tests retrieval of a Certificate from the keystore from the Serial") - public void testRetrieveCertificate() { - try { - X509Certificate x509Certificate = managementService.generateX509Certificate(); - CertificateResponse certificateResponse = managementService.retrieveCertificate(x509Certificate.getSerialNumber().toString()); - Assert.assertNotNull(certificateResponse); - Assert.assertEquals(x509Certificate.getSerialNumber(), certificateResponse.getCertificateserial()); - - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (CertificateManagementException e) { - String msg = " Error occurred while looking up for the certificate in the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } - + public void testRetrieveCertificate() throws KeystoreException, CertificateManagementException { + X509Certificate x509Certificate = managementService.generateX509Certificate(); + CertificateResponse certificateResponse = managementService.retrieveCertificate(x509Certificate.getSerialNumber().toString()); + Assert.assertNotNull(certificateResponse); + Assert.assertEquals(x509Certificate.getSerialNumber(), certificateResponse.getCertificateserial()); } @Test(description = "This test case tests the retrieval of Certificates from keystore in desired pagination") - public void testGetAllCertificatesPaginated() throws CertificateManagementException { - try { - managementService.generateX509Certificate(); - managementService.generateX509Certificate(); - PaginationResult allCertificates = managementService.getAllCertificates(0, 2); - Assert.assertEquals(allCertificates.getData().size(), 2); - log.info("GetAllCertificatesPaginated Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } - - + public void testGetAllCertificatesPaginated() throws CertificateManagementException, KeystoreException { + managementService.generateX509Certificate(); + managementService.generateX509Certificate(); + PaginationResult allCertificates = managementService.getAllCertificates(0, 2); + Assert.assertEquals(allCertificates.getData().size(), 2); + log.info("GetAllCertificatesPaginated Test Successful"); } @Test(description = "This test casae tests retrieval of all Certificates from keystore") - public void testGetCertificates() throws CertificateManagementException { - try { - List certificatesBefore = managementService.getCertificates(); - managementService.generateX509Certificate(); - managementService.generateX509Certificate(); - List certificatesAfter = managementService.getCertificates(); - Assert.assertNotNull(certificatesBefore); - Assert.assertNotNull(certificatesAfter); - Assert.assertEquals((certificatesBefore.size() + 2), certificatesAfter.size()); - log.info("GetCertificates Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } + public void testGetCertificates() throws CertificateManagementException, KeystoreException { + List certificatesBefore = managementService.getCertificates(); + managementService.generateX509Certificate(); + managementService.generateX509Certificate(); + List certificatesAfter = managementService.getCertificates(); + Assert.assertNotNull(certificatesBefore); + Assert.assertNotNull(certificatesAfter); + Assert.assertEquals((certificatesBefore.size() + 2), certificatesAfter.size()); + log.info("GetCertificates Test Successful"); } @Test(description = "This test case tests deleting Certificate from the keystore") - public void testRemoveCertificate() throws CertificateManagementException { - try { - - X509Certificate x509Certificate = managementService.generateX509Certificate(); - List certificates = managementService.getCertificates(); - - int size = certificates.size(); - boolean removed = managementService.removeCertificate(x509Certificate.getSerialNumber().toString()); - certificates = managementService.getCertificates(); - int sizeAfter = certificates.size(); - - Assert.assertNotNull(removed); - Assert.assertTrue(removed); - Assert.assertEquals((size - 1), sizeAfter); - log.info("RemoveCertificate Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } + public void testRemoveCertificate() throws CertificateManagementException, KeystoreException { + X509Certificate x509Certificate = managementService.generateX509Certificate(); + List certificates = managementService.getCertificates(); + int size = certificates.size(); + boolean removed = managementService.removeCertificate(x509Certificate.getSerialNumber().toString()); + certificates = managementService.getCertificates(); + int sizeAfter = certificates.size(); + Assert.assertNotNull(removed); + Assert.assertTrue(removed); + Assert.assertEquals((size - 1), sizeAfter); + log.info("RemoveCertificate Test Successful"); } @Test(description = "This test case tests searching for a list of certificates by the serial number") - public void testSearchCertificates() throws CertificateManagementException { - try { - X509Certificate x509Certificate = managementService.generateX509Certificate(); - List certificateResponses = managementService.searchCertificates(x509Certificate.getSerialNumber().toString()); - Assert.assertNotNull(certificateResponses); - Assert.assertEquals(1, certificateResponses.size()); - Assert.assertEquals(certificateResponses.get(0).getSerialNumber(), x509Certificate.getSerialNumber().toString()); - log.info("SearchCertificates Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } + public void testSearchCertificates() throws CertificateManagementException, KeystoreException { + X509Certificate x509Certificate = managementService.generateX509Certificate(); + List certificateResponses = managementService.searchCertificates(x509Certificate.getSerialNumber().toString()); + Assert.assertNotNull(certificateResponses); + Assert.assertEquals(1, certificateResponses.size()); + Assert.assertEquals(certificateResponses.get(0).getSerialNumber(), x509Certificate.getSerialNumber().toString()); + log.info("SearchCertificates Test Successful"); } @Test(description = "This test case tests generation of signed Certificate from a CSR") - public void testGetSignedCertificateFromCSR() { - + public void testGetSignedCertificateFromCSR() throws KeystoreException { CSRGenerator csrGeneration = new CSRGenerator(); BASE64Encoder encoder = new BASE64Encoder(); - // Generate key pair KeyPair keyPair = csrGeneration.generateKeyPair("RSA", 1024); byte[] csrData = csrGeneration.generateCSR("SHA256WithRSA", keyPair); - try { - X509Certificate signedCertificateFromCSR = managementService.getSignedCertificateFromCSR(encoder.encode(csrData)); - Assert.assertNotNull(signedCertificateFromCSR); - Assert.assertEquals(signedCertificateFromCSR.getType(), CertificateManagementConstants.X_509); - log.info("GetSignedCertificateFromCSR Test Successful"); - - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } - - + X509Certificate signedCertificateFromCSR = managementService.getSignedCertificateFromCSR(encoder.encode(csrData)); + Assert.assertNotNull(signedCertificateFromCSR); + Assert.assertEquals(signedCertificateFromCSR.getType(), CertificateManagementConstants.X_509); + log.info("GetSignedCertificateFromCSR Test Successful"); } @Test(description = "This test case tests the extraction of Challenge token from a Certificate") public void testExtractChallengeToken() throws KeystoreException { - X509Certificate x509Certificate1 = new DummyCertificate(); String token = managementService.extractChallengeToken(x509Certificate1); - Assert.assertNotNull(token); Assert.assertEquals(token, DummyCertificate.EXT); log.info("extractChallengeToken Test Successful"); - } @Test(description = "This test case tests saving a list of Certificates in the keystore") - public void testSaveCertificate() throws CertificateManagementException { + public void testSaveCertificate() throws CertificateManagementException, IOException, CertificateException, KeystoreException { File caCert = new File(CA_CERT_PEM); - try { - int before = managementService.getCertificates().size(); - byte[] caBytes = FileUtils.readFileToByteArray(caCert); - CertificateFactory cf = CertificateFactory.getInstance("X.509"); - X509Certificate cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(caBytes)); - - List certificates = new ArrayList<>(); - org.wso2.carbon.certificate.mgt.core.bean.Certificate certificateToStore = - new org.wso2.carbon.certificate.mgt.core.bean.Certificate(); - certificateToStore.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId()); - certificateToStore.setCertificate(cert); - certificates.add(certificateToStore); - - managementService.saveCertificate(certificates); - int after = managementService.getCertificates().size(); - Assert.assertEquals((before + 1), after); - log.info("SaveCertificate Test Successful"); - - } catch (IOException e) { - String msg = "Error while reading Pem file from the file"; - log.error(msg, e); - Assert.fail(msg, e); - - } catch (CertificateException e) { - String msg = "Error while Converting Pem file to X509 Certificate"; - log.error(msg, e); - Assert.fail(msg, e); - - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - ; - } + int before = managementService.getCertificates().size(); + byte[] caBytes = FileUtils.readFileToByteArray(caCert); + CertificateFactory cf = CertificateFactory.getInstance("X.509"); + X509Certificate cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(caBytes)); + List certificates = new ArrayList<>(); + org.wso2.carbon.certificate.mgt.core.bean.Certificate certificateToStore = + new org.wso2.carbon.certificate.mgt.core.bean.Certificate(); + certificateToStore.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId()); + certificateToStore.setCertificate(cert); + certificates.add(certificateToStore); + managementService.saveCertificate(certificates); + int after = managementService.getCertificates().size(); + Assert.assertEquals((before + 1), after); + log.info("SaveCertificate Test Successful"); } @Test(description = "This test case tests converting a pem file to X509 Certificate") - public void testPemToX509Certificate() { + public void testPemToX509Certificate() throws IOException, KeystoreException { File caCert = new File(CA_CERT_PEM); BASE64Encoder encoder = new BASE64Encoder(); - try { - byte[] caBytes = FileUtils.readFileToByteArray(caCert); - X509Certificate certificate = managementService.pemToX509Certificate(encoder.encode(caBytes)); - Assert.assertNotNull(certificate); - Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); - log.info("PemToX509Certificate Test Successful"); - - } catch (IOException e) { - String msg = "Error while reading Pem file from the file"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } + byte[] caBytes = FileUtils.readFileToByteArray(caCert); + X509Certificate certificate = managementService.pemToX509Certificate(encoder.encode(caBytes)); + Assert.assertNotNull(certificate); + Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); + log.info("PemToX509Certificate Test Successful"); } @Test(description = "This test case tests extracting Certificate from the header Signature") - public void testExtractCertificateFromSignature() { + public void testExtractCertificateFromSignature() throws KeystoreException, CertificateEncodingException, CMSException, IOException { BASE64Encoder encoder = new BASE64Encoder(); - - try { - //generate and save a certificate in the keystore - X509Certificate x509Certificate = managementService.generateX509Certificate(); - - //Generate CMSdata - CMSSignedDataGenerator generator = new CMSSignedDataGenerator(); - List list = new ArrayList<>(); - list.add(x509Certificate); - JcaCertStore store = new JcaCertStore(list); - generator.addCertificates(store); - CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); - byte[] signature = degenerateSd.getEncoded(); - - X509Certificate certificate = managementService.extractCertificateFromSignature(encoder.encode(signature)); - - Assert.assertNotNull(certificate); - Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); - log.info("ExtractCertificateFromSignature Test Successful"); - - } catch (CertificateEncodingException e) { - String msg = "Error in Certificate encoding"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (IOException e) { - String msg = "Error reading encoded signature"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (CMSException e) { - String msg = "Error Adding certificates"; - log.error(msg, e); - Assert.fail(msg, e); - } catch (KeystoreException e) { - String msg = "Error while accessing the keystore"; - log.error(msg, e); - Assert.fail(msg, e); - } - + //generate and save a certificate in the keystore + X509Certificate x509Certificate = managementService.generateX509Certificate(); + //Generate CMSdata + CMSSignedDataGenerator generator = new CMSSignedDataGenerator(); + List list = new ArrayList<>(); + list.add(x509Certificate); + JcaCertStore store = new JcaCertStore(list); + generator.addCertificates(store); + CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); + byte[] signature = degenerateSd.getEncoded(); + X509Certificate certificate = managementService.extractCertificateFromSignature(encoder.encode(signature)); + Assert.assertNotNull(certificate); + Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); + log.info("ExtractCertificateFromSignature Test Successful"); } - @BeforeClass public void init() throws Exception { initDataSource(); CertificateManagementDAOFactory.init(this.getDataSource()); - } - - } From 344f2baea5108cab1f2c9d6f1544aa1bf3c221a5 Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Mon, 2 Oct 2017 11:07:03 +0530 Subject: [PATCH 7/8] Remove unncessary files --- .../carbon-home/repository/conf/carbon.xml | 656 ------------------ .../repository/conf/cdm-config.xml | 2 +- .../repository/conf/certificate-config.xml | 17 + .../conf/datasources/master-datasources.xml | 17 + .../repository/conf/log4j.properties | 2 +- .../conf/security/authenticators.xml | 73 -- .../src/test/resources/certificate-config.xml | 17 + .../src/test/resources/log4j.properties | 33 - .../src/test/resources/testng.xml | 18 +- 9 files changed, 70 insertions(+), 765 deletions(-) delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/log4j.properties diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml deleted file mode 100644 index ca5863d18d..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml +++ /dev/null @@ -1,656 +0,0 @@ - - - - - - - - - ${product.name} - - - ${product.key} - - - ${product.version} - - - - - - - - - local:/${carbon.context}/services/ - - - - - - - ${default.server.role} - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 0 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 30 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/repository/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/repository/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - ${p2.repo.url} - - - - - - - - true - - - - - - true - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml index a4f2358d9f..bc996646e1 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml @@ -1,6 +1,6 @@ diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml index 897e33581c..40b7e24343 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml @@ -1,3 +1,20 @@ + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties index 9cff0ddf72..d1014499f9 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties @@ -1,5 +1,5 @@ # -# Copyright 2009 WSO2, Inc. (http://wso2.com) +# Copyright 2017 WSO2, Inc. (http://wso2.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml deleted file mode 100644 index d31486f99e..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/authenticators.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - 5 - - - - - 10 - - /carbon/admin/login.jsp - carbonServer - https://localhost:9443/samlsso - urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml index cfd4938b68..0e996abca5 100755 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml @@ -1,4 +1,21 @@ + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/log4j.properties b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/log4j.properties deleted file mode 100644 index 2143753b40..0000000000 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/log4j.properties +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright 2015 WSO2, Inc. (http://wso2.com) -# -# 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. -# - -# -# This is the log4j configuration file used by WSO2 Carbon -# -# IMPORTANT : Please do not remove or change the names of any -# of the Appenders defined here. The layout pattern & log file -# can be changed using the WSO2 Carbon Management Console, and those -# settings will override the settings in this file. -# - -log4j.rootLogger=INFO, STD_OUT - -# Redirect log messages to console -log4j.appender.STD_OUT=org.apache.log4j.ConsoleAppender -log4j.appender.STD_OUT.Target=System.out -log4j.appender.STD_OUT.layout=org.apache.log4j.PatternLayout -log4j.appender.STD_OUT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml index aafb64008d..b76295f108 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml @@ -1,5 +1,21 @@ - + From 8eb02642c77e2508180ceabf58bc105072b719c2 Mon Sep 17 00:00:00 2001 From: Sameera Wickramasekara Date: Mon, 2 Oct 2017 12:43:16 +0530 Subject: [PATCH 8/8] Fixed test case issues --- .../BaseDeviceManagementCertificateTest.java | 4 - .../mgt/core/common/DataSourceConfig.java | 3 + ...CertificateManagementServiceImplTests.java | 29 +- .../mgt/core/util/CSRGenerator.java | 37 +- .../mgt/core/util/DummyCertificate.java | 22 +- .../carbon-home/repository/conf/carbon.xml | 655 ++++++++++++++++++ .../src/test/resources/sql/h2.sql | 17 + 7 files changed, 716 insertions(+), 51 deletions(-) create mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java index 59e83ca5c6..38a16a7fa0 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java @@ -44,7 +44,6 @@ import java.sql.Statement; public abstract class BaseDeviceManagementCertificateTest { private DataSource dataSource; private static final Log log = LogFactory.getLog(BaseDeviceManagementCertificateTest.class); - private static final String DATASOURCE_LOCATION = "src/test/resources/data-source-config.xml"; @BeforeSuite @@ -78,7 +77,6 @@ public abstract class BaseDeviceManagementCertificateTest { return new org.apache.tomcat.jdbc.pool.DataSource(properties); } - private DataSourceConfig readDataSourceConfig() throws DeviceManagementException { try { File file = new File(DATASOURCE_LOCATION); @@ -123,14 +121,12 @@ public abstract class BaseDeviceManagementCertificateTest { System.setProperty("carbon.home", file.getAbsolutePath()); } } - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(MultitenantConstants .SUPER_TENANT_DOMAIN_NAME); PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); } public DataSource getDataSource() { - return dataSource; } diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java index 869660ee79..f3154d3bdc 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java @@ -20,6 +20,9 @@ package org.wso2.carbon.certificate.mgt.core.common; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +/** + * Model class for DataSourceConfig. + */ @XmlRootElement(name = "DataSourceConfig") public class DataSourceConfig { diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java index f8023644a2..a7e0629e5d 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java @@ -56,26 +56,27 @@ import java.security.cert.*; import java.util.ArrayList; import java.util.List; +/** + * Test cases for for CertificateManagementServiceImpl class methods. + * + */ public class CertificateManagementServiceImplTests extends BaseDeviceManagementCertificateTest { private static Log log = LogFactory.getLog(CertificateManagementServiceImplTests.class); private static final String CA_CERT_PEM = "src/test/resources/ca_cert.pem"; private static final String RA_CERT_PEM = "src/test/resources/ra_cert.pem"; - CertificateManagementServiceImpl managementService = null; - - @Test(description = "This test case tests initialization of CertificateManagementServiceImpl instance") - public void testGetInstance() { - CertificateManagementServiceImpl instance = CertificateManagementServiceImpl.getInstance(); - Assert.assertNotNull(instance); - log.info("getInstance Test Successful"); - } + private CertificateManagementServiceImpl managementService; @BeforeClass - public void initCertificateManagementService() throws DeviceManagementException { - //save certificatemanagementservice instance as class variable - managementService = CertificateManagementServiceImpl.getInstance(); + public void init() throws Exception { + initDataSource(); + CertificateManagementDAOFactory.init(this.getDataSource()); //set Bouncycastle as a provider for testing Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + //save certificatemanagementservice instance as class variable + managementService = CertificateManagementServiceImpl.getInstance(); + Assert.assertNotNull(managementService); + log.info("getInstance Test Successful"); } @Test(description = "This test case tests retrieval of CA Certificate from the keystore") @@ -329,9 +330,5 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC log.info("ExtractCertificateFromSignature Test Successful"); } - @BeforeClass - public void init() throws Exception { - initDataSource(); - CertificateManagementDAOFactory.init(this.getDataSource()); - } + } diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java index 1ee50d04ad..5fa4f7dabd 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java @@ -18,7 +18,10 @@ package org.wso2.carbon.certificate.mgt.core.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.bouncycastle.operator.ContentSigner; +import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder; @@ -30,8 +33,13 @@ import java.io.IOException; import java.io.PrintStream; import java.security.KeyPair; import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +/** + * Test class for generating a mock CSR request. + */ public class CSRGenerator { + private static Log log = LogFactory.getLog(CSRGenerator.class); /** * Generate the desired CSR for signing @@ -43,32 +51,18 @@ public class CSRGenerator { public byte[] generateCSR(String sigAlg, KeyPair keyPair) { ByteArrayOutputStream outStream = new ByteArrayOutputStream(); PrintStream printStream = new PrintStream(outStream); - try { - PKCS10CertificationRequestBuilder p10Builder = new JcaPKCS10CertificationRequestBuilder( new X500Principal("CN=Requested Test Certificate"), keyPair.getPublic()); JcaContentSignerBuilder csBuilder = new JcaContentSignerBuilder("SHA256withRSA"); ContentSigner signer = csBuilder.build(keyPair.getPrivate()); PKCS10CertificationRequest csr = p10Builder.build(signer); - return csr.getEncoded(); - } catch (Exception ex) { - ex.printStackTrace(); - } finally { - if (null != outStream) { - try { - outStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - if (null != printStream) { - printStream.close(); - } + } catch (OperatorCreationException ex) { + log.error("Error while Key generation operation", ex); + } catch (IOException ex) { + log.error("Error while generating CSR,ex"); } - return new byte[0]; } @@ -83,14 +77,11 @@ public class CSRGenerator { try { KeyPairGenerator keyPairGenerator = null; keyPairGenerator = KeyPairGenerator.getInstance(alg); - keyPairGenerator.initialize(keySize); - return keyPairGenerator.generateKeyPair(); - } catch (Exception ex) { - ex.printStackTrace(); + } catch (NoSuchAlgorithmException e) { + log.error("The provided algorithm is not found ",e); } - return null; } } diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java index a89c4e0a7e..f276df4625 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java @@ -21,25 +21,34 @@ package org.wso2.carbon.certificate.mgt.core.util; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import java.math.BigInteger; -import java.security.*; -import java.security.cert.*; +import java.security.Principal; +import java.security.PublicKey; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.CertificateException; +import java.security.NoSuchAlgorithmException; +import java.security.SignatureException; +import java.security.NoSuchProviderException; +import java.security.cert.X509Certificate; +import java.security.InvalidKeyException; import java.util.Date; import java.util.Set; +/** + * A Mock Certificate class with an extension provided.(Used only to test the extension) + */ public class DummyCertificate extends X509Certificate { public static final String EXT = "Dummy extension"; public static final String DN = "O=WSO2,OU=Mobile,C=LK,CN=123456789"; - @Override public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException { - } @Override public void checkValidity(Date date) throws CertificateExpiredException, CertificateNotYetValidException { - } @Override @@ -65,7 +74,6 @@ public class DummyCertificate extends X509Certificate { return DN; } }; - } @Override @@ -130,12 +138,10 @@ public class DummyCertificate extends X509Certificate { @Override public void verify(PublicKey key) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { - } @Override public void verify(PublicKey key, String sigProvider) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { - } @Override diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml new file mode 100644 index 0000000000..7f976a58cf --- /dev/null +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml @@ -0,0 +1,655 @@ + + + + + + + + ${product.name} + + + ${product.key} + + + ${product.version} + + + + + + + + + local:/${carbon.context}/services/ + + + + + + + ${default.server.role} + + + + + + + org.wso2.carbon + + + / + + + + + + + + + 15 + + + + + + + + + 0 + + + + + 9999 + + 11111 + + + + + + 10389 + + 8000 + + + + + + 10500 + + + + + + + org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory + + + + + + + + + java + + + + + + + + + + false + + + false + + + 600 + + + + false + + + + + + + + 30 + + + + + + + + + 15 + + + + + + ${carbon.home}/repository/deployment/server/ + + + 15 + + + ${carbon.home}/repository/conf/axis2/axis2.xml + + + 30000 + + + ${carbon.home}/repository/deployment/client/ + + ${carbon.home}/repository/conf/axis2/axis2_client.xml + + true + + + + + + + + + + admin + Default Administrator Role + + + user + Default User Role + + + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + + + + + ${carbon.home}/repository/resources/security/client-truststore.jks + + JKS + + wso2carbon + + + + + + + + + + + + + + + + + + + UserManager + + + false + + + + + + + ${carbon.home}/tmp/work + + + + + + true + + + 10 + + + 30 + + + + + + 100 + + + + keystore + certificate + * + + org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor + + + + + jarZip + + org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor + + + + dbs + + org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor + + + + tools + + org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor + + + + toolsAny + + org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor + + + + + + + info + org.wso2.carbon.core.transports.util.InfoProcessor + + + wsdl + org.wso2.carbon.core.transports.util.Wsdl11Processor + + + wsdl2 + org.wso2.carbon.core.transports.util.Wsdl20Processor + + + xsd + org.wso2.carbon.core.transports.util.XsdProcessor + + + + + + false + false + true + svn + http://svnrepo.example.com/repos/ + username + password + true + + + + + + + + + + + + + + + ${require.carbon.servlet} + + + + + true + + + + + + + default repository + ${p2.repo.url} + + + + + + + + true + + + + + + true + + diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql index 6705b595f0..044898f912 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql @@ -1,3 +1,20 @@ +-- +-- Copyright (c) 2017, 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. + CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE ( ID INTEGER auto_increment NOT NULL, SERIAL_NUMBER VARCHAR(500) DEFAULT NULL,