X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestCertificate.java;h=63aa908f8e7ca367564a08c763e7a9e9398f6c12;hp=2e8426d2510bd6c6dcc1b090ace9b86a3681eda3;hb=214daf6a8eca8376b0ff835b6d28abaaa61a0792;hpb=d04f2d292d57bd50cef0d229ef5ab60cdc8492a9 diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/org/cacert/gigi/TestCertificate.java index 2e8426d2..63aa908f 100644 --- a/tests/org/cacert/gigi/TestCertificate.java +++ b/tests/org/cacert/gigi/TestCertificate.java @@ -1,5 +1,7 @@ package org.cacert.gigi; +import static org.junit.Assert.*; + import java.io.IOException; import java.security.GeneralSecurityException; import java.security.KeyPair; @@ -9,37 +11,43 @@ import java.sql.SQLException; import java.util.Collection; import java.util.List; -import org.cacert.gigi.Certificate.CSRType; -import org.cacert.gigi.Certificate.CertificateStatus; -import org.cacert.gigi.Certificate.SANType; -import org.cacert.gigi.Certificate.SubjectAlternateName; +import org.cacert.gigi.dbObjects.Certificate; +import org.cacert.gigi.dbObjects.Certificate.CSRType; +import org.cacert.gigi.dbObjects.Certificate.CertificateStatus; +import org.cacert.gigi.dbObjects.Certificate.SANType; +import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName; +import org.cacert.gigi.dbObjects.CertificateProfile; +import org.cacert.gigi.dbObjects.Digest; +import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; -import static org.junit.Assert.*; +import sun.security.x509.GeneralNameInterface; public class TestCertificate extends ManagedTest { + User u = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@example.com", TEST_PASSWORD)); + @Test - public void testClientCertLoginStates() throws IOException, GeneralSecurityException, SQLException, InterruptedException { + public void testClientCertLoginStates() throws IOException, GeneralSecurityException, SQLException, InterruptedException, GigiApiException { KeyPair kp = generateKeypair(); String key1 = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(1, "/CN=testmail@example.com", "sha256", key1, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key1, CSRType.CSR, CertificateProfile.getById(1)); final PrivateKey pk = kp.getPrivate(); - c.issue().waitFor(60000); + c.issue(null, "2y", u).waitFor(60000); final X509Certificate ce = c.cert(); assertNotNull(login(pk, ce)); } @Test - public void testSans() throws IOException, GeneralSecurityException, SQLException, InterruptedException { + public void testSANs() throws IOException, GeneralSecurityException, SQLException, InterruptedException, GigiApiException { KeyPair kp = generateKeypair(); String key = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(1, "/CN=testmail@example.com", "sha256", key, CSRType.CSR, CertificateProfile.getById(1),// + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, CertificateProfile.getById(1),// new SubjectAlternateName(SANType.EMAIL, "testmail@example.com"), new SubjectAlternateName(SANType.DNS, "testmail.example.com")); testFails(CertificateStatus.DRAFT, c); - c.issue().waitFor(60000); + c.issue(null, "2y", u).waitFor(60000); X509Certificate cert = c.cert(); Collection> sans = cert.getSubjectAlternativeNames(); assertEquals(2, sans.size()); @@ -48,14 +56,18 @@ public class TestCertificate extends ManagedTest { for (List list : sans) { assertEquals(2, list.size()); Integer type = (Integer) list.get(0); - if (type == 1) { + switch (type) { + case GeneralNameInterface.NAME_RFC822: hadEmail = true; assertEquals("testmail@example.com", list.get(1)); - } else if (type == 2) { + break; + case GeneralNameInterface.NAME_DNS: hadDNS = true; assertEquals("testmail.example.com", list.get(1)); - } else { + break; + default: fail("Unknown type"); + } } assertTrue(hadDNS); @@ -64,29 +76,30 @@ public class TestCertificate extends ManagedTest { testFails(CertificateStatus.ISSUED, c); Certificate c2 = Certificate.getBySerial(c.getSerial()); - assertEquals(2, c2.getSans().size()); - assertEquals(c.getSans().get(0).getName(), c2.getSans().get(0).getName()); - assertEquals(c.getSans().get(0).getType(), c2.getSans().get(0).getType()); - assertEquals(c.getSans().get(1).getName(), c2.getSans().get(1).getName()); - assertEquals(c.getSans().get(1).getType(), c2.getSans().get(1).getType()); + assertNotNull(c2); + assertEquals(2, c2.getSANs().size()); + assertEquals(c.getSANs().get(0).getName(), c2.getSANs().get(0).getName()); + assertEquals(c.getSANs().get(0).getType(), c2.getSANs().get(0).getType()); + assertEquals(c.getSANs().get(1).getName(), c2.getSANs().get(1).getName()); + assertEquals(c.getSANs().get(1).getType(), c2.getSANs().get(1).getType()); try { - c2.getSans().remove(0); - fail("the list should no be modifiable"); + c2.getSANs().remove(0); + fail("the list should not be modifiable"); } catch (UnsupportedOperationException e) { // expected } } @Test - public void testCertLifeCycle() throws IOException, GeneralSecurityException, SQLException, InterruptedException { + public void testCertLifeCycle() throws IOException, GeneralSecurityException, SQLException, InterruptedException, GigiApiException { KeyPair kp = generateKeypair(); String key = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(1, "/CN=testmail@example.com", "sha256", key, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, CertificateProfile.getById(1)); final PrivateKey pk = kp.getPrivate(); testFails(CertificateStatus.DRAFT, c); - c.issue().waitFor(60000); + c.issue(null, "2y", u).waitFor(60000); testFails(CertificateStatus.ISSUED, c); X509Certificate cert = c.cert(); @@ -98,7 +111,7 @@ public class TestCertificate extends ManagedTest { } - private void testFails(CertificateStatus status, Certificate c) throws IOException, GeneralSecurityException, SQLException { + private void testFails(CertificateStatus status, Certificate c) throws IOException, GeneralSecurityException, SQLException, GigiApiException { assertEquals(status, c.getStatus()); if (status != CertificateStatus.ISSUED) { try { @@ -110,7 +123,7 @@ public class TestCertificate extends ManagedTest { } if (status != CertificateStatus.DRAFT) { try { - c.issue(); + c.issue(null, "2y", u); fail(status + " is in invalid state"); } catch (IllegalStateException ise) { @@ -119,7 +132,9 @@ public class TestCertificate extends ManagedTest { if (status != CertificateStatus.ISSUED) { try { c.cert(); - fail(status + " is in invalid state"); + if (status != CertificateStatus.REVOKED) { + fail(status + " is in invalid state"); + } } catch (IllegalStateException ise) { }