From: Felix Dörre Date: Fri, 16 Sep 2016 12:58:05 +0000 (+0200) Subject: upd: factor out default client certificate profile X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=f4fa4314692900e57a074d9f65a558e136dadb44 upd: factor out default client certificate profile Change-Id: Ief1459b17cd820d0d635e89230904d2c46cd69b2 --- diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java index 4918732c..ed1c932a 100644 --- a/tests/org/cacert/gigi/LoginTest.java +++ b/tests/org/cacert/gigi/LoginTest.java @@ -15,7 +15,6 @@ import java.security.cert.X509Certificate; import org.cacert.gigi.dbObjects.Certificate; import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.Digest; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.testUtils.IOUtils; @@ -94,7 +93,7 @@ public class LoginTest extends ManagedTest { KeyPair kp = generateKeypair(); String csr = generatePEMCSR(kp, "CN=hans"); User u = User.getById(user); - Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, getClientProfile()); final PrivateKey pk = kp.getPrivate(); await(c.issue(null, "2y", u)); final X509Certificate ce = c.cert(); diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/org/cacert/gigi/TestCertificate.java index b885881f..0305d509 100644 --- a/tests/org/cacert/gigi/TestCertificate.java +++ b/tests/org/cacert/gigi/TestCertificate.java @@ -16,7 +16,6 @@ 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.pages.account.certs.Certificates; @@ -34,7 +33,7 @@ public class TestCertificate extends ManagedTest { public void testClientCertLoginStates() throws IOException, GeneralSecurityException, SQLException, InterruptedException, GigiApiException { KeyPair kp = generateKeypair(); String key1 = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key1, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key1, CSRType.CSR, getClientProfile()); final PrivateKey pk = kp.getPrivate(); await(c.issue(null, "2y", u)); final X509Certificate ce = c.cert(); @@ -46,7 +45,7 @@ public class TestCertificate extends ManagedTest { public void testSANs() throws IOException, GeneralSecurityException, SQLException, InterruptedException, GigiApiException { KeyPair kp = generateKeypair(); String key = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, CertificateProfile.getById(1),// + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, getClientProfile(),// new SubjectAlternateName(SANType.EMAIL, "testmail@example.com"), new SubjectAlternateName(SANType.DNS, "testmail.example.com")); testFails(CertificateStatus.DRAFT, c); @@ -98,7 +97,7 @@ public class TestCertificate extends ManagedTest { public void testCertLifeCycle() throws IOException, GeneralSecurityException, SQLException, InterruptedException, GigiApiException { KeyPair kp = generateKeypair(); String key = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, getClientProfile()); final PrivateKey pk = kp.getPrivate(); testFails(CertificateStatus.DRAFT, c); diff --git a/tests/org/cacert/gigi/TestCrossDomainAccess.java b/tests/org/cacert/gigi/TestCrossDomainAccess.java index 0ddf10e1..e2a60070 100644 --- a/tests/org/cacert/gigi/TestCrossDomainAccess.java +++ b/tests/org/cacert/gigi/TestCrossDomainAccess.java @@ -14,7 +14,6 @@ import java.sql.SQLException; import org.cacert.gigi.dbObjects.Certificate; import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.Digest; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.testUtils.IOUtils; @@ -49,7 +48,7 @@ public class TestCrossDomainAccess extends ManagedTest { User u = User.getById(createVerifiedUser("fn", "ln", "testmail@example.com", TEST_PASSWORD)); KeyPair kp = generateKeypair(); String key = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, getClientProfile()); final PrivateKey pk = kp.getPrivate(); c.setLoginEnabled(true); await(c.issue(null, "2y", u)); diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java index fd09313c..9ace036e 100644 --- a/tests/org/cacert/gigi/TestSeparateSessionScope.java +++ b/tests/org/cacert/gigi/TestSeparateSessionScope.java @@ -15,7 +15,6 @@ import java.sql.SQLException; import org.cacert.gigi.dbObjects.Certificate; import org.cacert.gigi.dbObjects.Certificate.CSRType; -import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.Digest; import org.cacert.gigi.dbObjects.Job; import org.cacert.gigi.dbObjects.User; @@ -32,7 +31,7 @@ public class TestSeparateSessionScope extends ManagedTest { KeyPair kp = generateKeypair(); String csr = generatePEMCSR(kp, "CN=hans"); User u = User.getById(user); - Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, getClientProfile()); final PrivateKey pk = kp.getPrivate(); await(c.issue(null, "2y", u)); final X509Certificate ce = c.cert(); @@ -53,8 +52,8 @@ public class TestSeparateSessionScope extends ManagedTest { KeyPair kp = generateKeypair(); String csr = generatePEMCSR(kp, "CN=hans"); User u = User.getById(user); - Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, CertificateProfile.getById(1)); - Certificate c2 = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, getClientProfile()); + Certificate c2 = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, getClientProfile()); final PrivateKey pk = kp.getPrivate(); Job j1 = c.issue(null, "2y", u); await(c2.issue(null, "2y", u)); diff --git a/tests/org/cacert/gigi/api/IssueCert.java b/tests/org/cacert/gigi/api/IssueCert.java index 02185b72..60dc286d 100644 --- a/tests/org/cacert/gigi/api/IssueCert.java +++ b/tests/org/cacert/gigi/api/IssueCert.java @@ -18,7 +18,6 @@ import java.security.cert.X509Certificate; 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.CertificateProfile; import org.cacert.gigi.dbObjects.Country; import org.cacert.gigi.dbObjects.Country.CountryCodeType; import org.cacert.gigi.dbObjects.Digest; @@ -46,7 +45,7 @@ public class IssueCert extends ClientTest { try { kp = generateKeypair(); String key1 = generatePEMCSR(kp, "EMAIL=testmail@example.com"); - c = new Certificate(u, u, Certificate.buildDN("EMAIL", "testmail@example.com"), Digest.SHA256, key1, CSRType.CSR, CertificateProfile.getById(1)); + c = new Certificate(u, u, Certificate.buildDN("EMAIL", "testmail@example.com"), Digest.SHA256, key1, CSRType.CSR, getClientProfile()); c.setLoginEnabled(true); pk = kp.getPrivate(); await(c.issue(null, "2y", u)); diff --git a/tests/org/cacert/gigi/dbObjects/TestCertificate.java b/tests/org/cacert/gigi/dbObjects/TestCertificate.java index 8e7f8efe..3b4a63b4 100644 --- a/tests/org/cacert/gigi/dbObjects/TestCertificate.java +++ b/tests/org/cacert/gigi/dbObjects/TestCertificate.java @@ -17,7 +17,7 @@ public class TestCertificate extends ClientBusinessTest { public void testSetLoginEnabled() throws GeneralSecurityException, IOException, GigiApiException { KeyPair kp = generateKeypair(); String key = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, getClientProfile()); assertFalse(c.isLoginEnabled()); c.setLoginEnabled(true); diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java index 359cda25..1467f434 100644 --- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java +++ b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java @@ -28,6 +28,7 @@ import org.cacert.gigi.database.DatabaseConnection.Link; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.SQLFileManager.ImportType; import org.cacert.gigi.dbObjects.CATS.CATSType; +import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.Domain; import org.cacert.gigi.dbObjects.DomainPingType; import org.cacert.gigi.dbObjects.User; @@ -194,6 +195,10 @@ public abstract class ConfiguredTest { return "test" + createRandomIDString() + "a" + (count++) + "u"; } + public static CertificateProfile getClientProfile() { + return CertificateProfile.getByName("client"); + } + public static int countRegex(String text, String pattern) { Pattern p = Pattern.compile(pattern); Matcher m = p.matcher(text);