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 1278b48872a..f8023644a20 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()); - } - - }