X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FTestCertificateAdd.java;h=fba274d1bf1d46f3c8f463a980b730445bd1ad49;hb=2f50dbb24105e6345329b8e9ecb5ef4d67ab2a8c;hp=ba36830be206646de8b20f15b6492cc0c65d7f81;hpb=8af6231b22da4fef795bcb54913faad6592b1a02;p=gigi.git diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java index ba36830b..fba274d1 100644 --- a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java +++ b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java @@ -16,6 +16,7 @@ import java.net.URLEncoder; import java.security.GeneralSecurityException; import java.security.KeyPair; import java.security.Signature; +import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; @@ -32,12 +33,13 @@ import java.util.regex.Pattern; import org.cacert.gigi.crypto.SPKAC; import org.cacert.gigi.dbObjects.Digest; import org.cacert.gigi.pages.account.certs.CertificateAdd; -import org.cacert.gigi.pages.account.certs.CertificateIssueForm; +import org.cacert.gigi.pages.account.certs.CertificateRequest; import org.cacert.gigi.testUtils.ClientTest; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.util.PEM; import org.junit.Test; +import sun.security.pkcs.PKCS7; import sun.security.pkcs.PKCS9Attribute; import sun.security.pkcs10.PKCS10Attribute; import sun.security.pkcs10.PKCS10Attributes; @@ -54,6 +56,13 @@ import sun.security.x509.X509Key; public class TestCertificateAdd extends ClientTest { + private static class OnPageError extends Error { + + public OnPageError(String page) { + super(page); + } + } + KeyPair kp = generateKeypair(); String csrf; @@ -66,7 +75,7 @@ public class TestCertificateAdd extends ClientTest { @Test public void testSimpleServer() throws IOException, GeneralSecurityException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { - CertificateIssueForm.OID_KEY_USAGE_SSL_SERVER + CertificateRequest.OID_KEY_USAGE_SSL_SERVER }, new DNSName(uniq + ".tld")); String pem = generatePEMCSR(kp, "CN=a." + uniq + ".tld", atts); @@ -80,21 +89,21 @@ public class TestCertificateAdd extends ClientTest { @Test public void testSimpleMail() throws IOException, GeneralSecurityException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { - CertificateIssueForm.OID_KEY_USAGE_EMAIL_PROTECTION + CertificateRequest.OID_KEY_USAGE_EMAIL_PROTECTION }, new DNSName("a." + uniq + ".tld"), new DNSName("b." + uniq + ".tld"), new RFC822Name(email)); String pem = generatePEMCSR(kp, "CN=a b", atts, "SHA384WithRSA"); String[] res = fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8")); assertArrayEquals(new String[] { - "mail", "a b", "dns:a." + uniq + ".tld\ndns:b." + uniq + ".tld\nemail:" + email + "\n", Digest.SHA384.toString() + "mail", "a b", "email:" + email + "\ndns:a." + uniq + ".tld\ndns:b." + uniq + ".tld\n", Digest.SHA384.toString() }, res); } @Test public void testSimpleClient() throws IOException, GeneralSecurityException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { - CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT + CertificateRequest.OID_KEY_USAGE_SSL_CLIENT }, new RFC822Name(email)); String pem = generatePEMCSR(kp, "CN=a b,email=" + email, atts, "SHA512WithRSA"); @@ -114,7 +123,7 @@ public class TestCertificateAdd extends ClientTest { @Test public void testIssue() throws IOException, GeneralSecurityException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { - CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT + CertificateRequest.OID_KEY_USAGE_SSL_CLIENT }, new RFC822Name(email)); String pem = generatePEMCSR(kp, "CN=a b,email=" + email, atts, "SHA512WithRSA"); @@ -128,9 +137,9 @@ public class TestCertificateAdd extends ClientTest { huc.setRequestProperty("Cookie", cookie); huc.setDoOutput(true); OutputStream out = huc.getOutputStream(); - out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes()); - out.write(("&profile=client&CN=a+b&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes()); - out.write(("&hash_alg=SHA512&CCA=y").getBytes()); + out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes("UTF-8")); + out.write(("&CN=CAcert+WoT+User&profile=client&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes("UTF-8")); + out.write(("&hash_alg=SHA512&tos_agree=y").getBytes("UTF-8")); URLConnection uc = authenticate(new URL(huc.getHeaderField("Location") + ".crt")); String crt = IOUtils.readURL(new InputStreamReader(uc.getInputStream(), "UTF-8")); @@ -138,20 +147,58 @@ public class TestCertificateAdd extends ClientTest { byte[] cer = IOUtils.readURL(uc.getInputStream()); assertArrayEquals(cer, PEM.decode("CERTIFICATE", crt)); - uc = authenticate(new URL(huc.getHeaderField("Location") + ".cer?install")); - byte[] cer2 = IOUtils.readURL(uc.getInputStream()); - assertArrayEquals(cer, cer2); + uc = authenticate(new URL(huc.getHeaderField("Location") + ".cer?install&chain")); + byte[] pkcs7 = IOUtils.readURL(uc.getInputStream()); + PKCS7 p7 = new PKCS7(pkcs7); + byte[] sub = verifyChain(p7.getCertificates()); + assertArrayEquals(cer, sub); assertEquals("application/x-x509-user-cert", uc.getHeaderField("Content-type")); uc = authenticate(new URL(huc.getHeaderField("Location"))); String gui = IOUtils.readURL(uc); + Pattern p = Pattern.compile("-----BEGIN CERTIFICATE-----[^-]+-----END CERTIFICATE-----"); + Matcher m = p.matcher(gui); + assertTrue(m.find()); + byte[] cert = PEM.decode("CERTIFICATE", m.group(0)); + Certificate c = CertificateFactory.getInstance("X509").generateCertificate(new ByteArrayInputStream(cert)); + gui = c.toString(); assertThat(gui, containsString("clientAuth")); - assertThat(gui, containsString("CN=a b")); + assertThat(gui, containsString("CN=CAcert WoT User")); assertThat(gui, containsString("SHA512withRSA")); assertThat(gui, containsString("RFC822Name: " + email)); } + private byte[] verifyChain(X509Certificate[] x509Certificates) throws GeneralSecurityException { + X509Certificate current = null; + nextCert: + while (true) { + for (int i = 0; i < x509Certificates.length; i++) { + X509Certificate cert = x509Certificates[i]; + if (current == null) { + if (cert.getSubjectX500Principal().equals(cert.getIssuerX500Principal())) { + current = cert; + continue nextCert; + } + } else { + if (cert.getSubjectX500Principal().equals(cert.getIssuerX500Principal())) { + continue; + } + if (current.getSubjectX500Principal().equals(cert.getIssuerX500Principal())) { + Signature s = Signature.getInstance(cert.getSigAlgName()); + s.initVerify(current.getPublicKey()); + s.update(cert.getTBSCertificate()); + assertTrue(s.verify(cert.getSignature())); + current = cert; + continue nextCert; + } + } + } + assertNotNull(current); + return current.getEncoded(); + } + } + @Test public void testValidityPeriodCalendar() throws IOException, GeneralSecurityException { testCertificateValidityRelative(Calendar.YEAR, 2, "2y", true); @@ -174,7 +221,9 @@ public class TestCertificateAdd extends ClientTest { Date start = new Date(now); Date end = new Date(now + MS_PER_DAY * 10); - X509Certificate res = createCertWithValidity("&validFrom=" + sdf.format(start) + "&validity=" + sdf.format(end)); + String validity = "&validFrom=" + sdf.format(start) + "&validity=" + sdf.format(end); + X509Certificate res = createCertWithValidity(validity); + assertNotNull(validity, res); assertEquals(start, res.getNotBefore()); assertEquals(end, res.getNotAfter()); } @@ -201,7 +250,7 @@ public class TestCertificateAdd extends ClientTest { private X509Certificate createCertWithValidity(String validity) throws IOException, GeneralSecurityException, UnsupportedEncodingException, MalformedURLException, CertificateException { PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] { - CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT + CertificateRequest.OID_KEY_USAGE_SSL_CLIENT }, new RFC822Name(email)); String pem = generatePEMCSR(kp, "CN=a b", atts, "SHA512WithRSA"); @@ -211,10 +260,10 @@ public class TestCertificateAdd extends ClientTest { huc.setRequestProperty("Cookie", cookie); huc.setDoOutput(true); OutputStream out = huc.getOutputStream(); - out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes()); - out.write(("&profile=client&CN=a+b&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes()); - out.write(("&hash_alg=SHA512&CCA=y&").getBytes()); - out.write(validity.getBytes()); + out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes("UTF-8")); + out.write(("&profile=client&CN=" + CertificateRequest.DEFAULT_CN + "&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes("UTF-8")); + out.write(("&hash_alg=SHA512&tos_agree=y&").getBytes("UTF-8")); + out.write(validity.getBytes("UTF-8")); String certurl = huc.getHeaderField("Location"); if (certurl == null) { @@ -224,7 +273,7 @@ public class TestCertificateAdd extends ClientTest { String crt = IOUtils.readURL(new InputStreamReader(uc.getInputStream(), "UTF-8")); CertificateFactory cf = CertificateFactory.getInstance("X.509"); - X509Certificate parsed = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(crt.getBytes())); + X509Certificate parsed = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(crt.getBytes("UTF-8"))); return parsed; } @@ -251,10 +300,11 @@ public class TestCertificateAdd extends ClientTest { fail("Should not succeed with wrong challange."); } assertArrayEquals(new String[] { - "client", CertificateIssueForm.DEFAULT_CN, "", Digest.SHA512.toString() + "client", CertificateRequest.DEFAULT_CN, "", Digest.SHA512.toString() }, res); - } catch (Error e) { - assertTrue(e.getMessage().startsWith("
Challenge mismatch")); + } catch (OnPageError e) { + String error = fetchStartErrorMessage(e.getMessage()); + assertTrue(error, error.startsWith("

Challenge mismatch")); } return csrf; } @@ -268,7 +318,7 @@ public class TestCertificateAdd extends ClientTest { } attributeValue.set("SANs", new SubjectAlternativeNameExtension(names)); PKCS10Attributes atts = new PKCS10Attributes(new PKCS10Attribute[] { - new PKCS10Attribute(PKCS9Attribute.EXTENSION_REQUEST_OID, attributeValue) + new PKCS10Attribute(PKCS9Attribute.EXTENSION_REQUEST_OID, attributeValue) }); ExtendedKeyUsageExtension eku = new ExtendedKeyUsageExtension(// new Vector<>(Arrays.asList(ekuOIDs))); @@ -291,7 +341,7 @@ public class TestCertificateAdd extends ClientTest { HttpURLConnection uc = (HttpURLConnection) ncert.openConnection(); uc.setRequestProperty("Cookie", cookie); uc.setDoOutput(true); - uc.getOutputStream().write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" + pem).getBytes()); + uc.getOutputStream().write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" + pem).getBytes("UTF-8")); uc.getOutputStream().flush(); return extractFormData(uc); @@ -299,9 +349,8 @@ public class TestCertificateAdd extends ClientTest { private String[] extractFormData(HttpURLConnection uc) throws IOException, Error { String result = IOUtils.readURL(uc); - if (result.contains("

")) { - String s = fetchStartErrorMessage(result); - throw new Error(s); + if (result.contains("
")) { + throw new OnPageError(result); } String profileKey = extractPattern(result, Pattern.compile("