package org.cacert.gigi.pages.account;
-import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import org.cacert.gigi.crypto.SPKAC;
import org.cacert.gigi.dbObjects.Digest;
-import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.pages.account.certs.CertificateAdd;
+import org.cacert.gigi.pages.account.certs.CertificateIssueForm;
+import org.cacert.gigi.testUtils.ClientTest;
import org.cacert.gigi.testUtils.IOUtils;
-import org.cacert.gigi.testUtils.ManagedTest;
import org.cacert.gigi.util.PEM;
import org.junit.Test;
import sun.security.x509.SubjectAlternativeNameExtension;
import sun.security.x509.X509Key;
-public class TestCertificateAdd extends ManagedTest {
+public class TestCertificateAdd extends ClientTest {
KeyPair kp = generateKeypair();
- User u = User.getById(createVerifiedUser("testuser", "testname", uniq + "@testdom.com", TEST_PASSWORD));
-
- String session = login(uniq + "@testdom.com", TEST_PASSWORD);
-
String csrf;
public TestCertificateAdd() throws GeneralSecurityException, IOException {
- TestDomain.addDomain(session, uniq + ".tld");
+ TestDomain.addDomain(cookie, uniq + ".tld");
}
public void testSimpleMail() throws IOException, GeneralSecurityException {
PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] {
CertificateIssueForm.OID_KEY_USAGE_EMAIL_PROTECTION
- }, new DNSName("a." + uniq + ".tld"), new DNSName("b." + uniq + ".tld"), new RFC822Name(uniq + "@testdom.com"));
+ }, new DNSName("a." + uniq + ".tld"), new DNSName("b." + uniq + ".tld"), new RFC822Name(email));
- String pem = generatePEMCSR(kp, "CN=testuser testname", atts, "SHA384WithRSA");
+ String pem = generatePEMCSR(kp, "CN=a b", atts, "SHA384WithRSA");
String[] res = fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8"));
assertArrayEquals(new String[] {
- "mail", "testuser testname", "dns:a." + uniq + ".tld\ndns:b." + uniq + ".tld\nemail:" + uniq + "@testdom.com\n", Digest.SHA384.toString()
+ "mail", "a b", "dns:a." + uniq + ".tld\ndns:b." + uniq + ".tld\nemail:" + email + "\n", Digest.SHA384.toString()
}, res);
}
public void testSimpleClient() throws IOException, GeneralSecurityException {
PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] {
CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT
- }, new RFC822Name(uniq + "@testdom.com"));
+ }, new RFC822Name(email));
- String pem = generatePEMCSR(kp, "CN=testuser testname,email=" + uniq + "@testdom.com", atts, "SHA512WithRSA");
+ String pem = generatePEMCSR(kp, "CN=a b,email=" + email, atts, "SHA512WithRSA");
String[] res = fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8"));
assertArrayEquals(new String[] {
- "client", "testuser testname", "email:" + uniq + "@testdom.com\n", Digest.SHA512.toString()
+ "client", "a b", "email:" + email + "\n", Digest.SHA512.toString()
}, res);
}
public void testIssue() throws IOException, GeneralSecurityException {
PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] {
CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT
- }, new RFC822Name(uniq + "@testdom.com"));
+ }, new RFC822Name(email));
- String pem = generatePEMCSR(kp, "CN=testuser testname,email=" + uniq + "@testdom.com", atts, "SHA512WithRSA");
+ String pem = generatePEMCSR(kp, "CN=a b,email=" + email, atts, "SHA512WithRSA");
String[] res = fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8"));
assertArrayEquals(new String[] {
- "client", "testuser testname", "email:" + uniq + "@testdom.com\n", Digest.SHA512.toString()
+ "client", "a b", "email:" + email + "\n", Digest.SHA512.toString()
}, res);
HttpURLConnection huc = (HttpURLConnection) ncert.openConnection();
- huc.setRequestProperty("Cookie", session);
+ 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=testuser+testname&SANs=" + URLEncoder.encode("email:" + uniq + "@testdom.com\n", "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());
URLConnection uc = authenticate(new URL(huc.getHeaderField("Location") + ".crt"));
String crt = IOUtils.readURL(new InputStreamReader(uc.getInputStream(), "UTF-8"));
uc = authenticate(new URL(huc.getHeaderField("Location")));
String gui = IOUtils.readURL(uc);
assertThat(gui, containsString("clientAuth"));
- assertThat(gui, containsString("CN=testuser testname"));
+ assertThat(gui, containsString("CN=a b"));
assertThat(gui, containsString("SHA512withRSA"));
- assertThat(gui, containsString("RFC822Name: " + uniq + "@testdom.com"));
+ assertThat(gui, containsString("RFC822Name: " + email));
}
final long MS_PER_DAY = 24 * 60 * 60 * 1000;
now -= now % MS_PER_DAY;
now += MS_PER_DAY;
- SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
Date start = new Date(now);
private X509Certificate createCertWithValidity(String validity) throws IOException, GeneralSecurityException, UnsupportedEncodingException, MalformedURLException, CertificateException {
PKCS10Attributes atts = buildAtts(new ObjectIdentifier[] {
CertificateIssueForm.OID_KEY_USAGE_SSL_CLIENT
- }, new RFC822Name(uniq + "@testdom.com"));
+ }, new RFC822Name(email));
- String pem = generatePEMCSR(kp, "CN=testuser testname", atts, "SHA512WithRSA");
+ String pem = generatePEMCSR(kp, "CN=a b", atts, "SHA512WithRSA");
fillOutForm("CSR=" + URLEncoder.encode(pem, "UTF-8"));
HttpURLConnection huc = (HttpURLConnection) ncert.openConnection();
- huc.setRequestProperty("Cookie", session);
+ 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=testuser+testname&SANs=" + URLEncoder.encode("email:" + uniq + "@testdom.com\n", "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());
private URLConnection authenticate(URL url) throws IOException {
URLConnection uc = url.openConnection();
- uc.setRequestProperty("Cookie", session);
+ uc.setRequestProperty("Cookie", cookie);
return uc;
}
protected String testSPKAC(boolean correctChallange) throws GeneralSecurityException, IOException {
HttpURLConnection uc = (HttpURLConnection) ncert.openConnection();
- uc.setRequestProperty("Cookie", session);
+ uc.setRequestProperty("Cookie", cookie);
String s = IOUtils.readURL(uc);
csrf = extractPattern(s, Pattern.compile("<input [^>]*name='csrf' [^>]*value='([^']*)'>"));
private String[] fillOutForm(String pem) throws IOException {
HttpURLConnection uc = (HttpURLConnection) ncert.openConnection();
- uc.setRequestProperty("Cookie", session);
+ uc.setRequestProperty("Cookie", cookie);
csrf = getCSRF(uc);
return fillOutFormDirect(pem);
private String[] fillOutFormDirect(String pem) throws IOException {
HttpURLConnection uc = (HttpURLConnection) ncert.openConnection();
- uc.setRequestProperty("Cookie", session);
+ uc.setRequestProperty("Cookie", cookie);
uc.setDoOutput(true);
uc.getOutputStream().write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" + pem).getBytes());
uc.getOutputStream().flush();
}
String profileKey = extractPattern(result, Pattern.compile("<option value=\"([^\"]*)\" selected>"));
- String resultingCN = extractPattern(result, Pattern.compile("<input [^>]*name='CN' [^>]*value='([^']*)'>"));
+ String resultingCN = extractPattern(result, Pattern.compile("<input [^>]*name='CN' [^>]*value='([^']*)'/>"));
String txt = extractPattern(result, Pattern.compile("<textarea [^>]*name='SANs' [^>]*>([^<]*)</textarea>"));
String md = extractPattern(result, Pattern.compile("<input type=\"radio\" [^>]*name=\"hash_alg\" value=\"([^\"]*)\" checked='checked'/>"));
return new String[] {
projects / gigi.git / blobdiff