Merge branch 'changePasswordForm'

[gigi.git] / tests / org / cacert / gigi / testUtils / ManagedTest.java

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 9e077c60115885e2fef69dacb7e8dc6f0b21b957..20318a7f03eb35a46fcba5abad8bb7d714644ed0 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -1,7 +1,6 @@
 package org.cacert.gigi.testUtils;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
@@ -47,6 +46,11 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 public class ManagedTest {
+       /**
+        * Some password that fullfills the password criteria.
+        */
+       protected static final String TEST_PASSWORD = "xvXV12°§";
+
        private final String registerService = "/register";
 
        private static TestEmailReciever ter;
@@ -191,7 +195,9 @@ public class ManagedTest {
        public String fetchStartErrorMessage(String d) throws IOException {
                String formFail = "<div class='formError'>";
                int idx = d.indexOf(formFail);
-               assertNotEquals(-1, idx);
+               if (idx == -1) {
+                       return null;
+               }
                String startError = d.substring(idx + formFail.length(), idx + 100).trim();
                return startError;
        }
@@ -279,6 +285,15 @@ public class ManagedTest {
                return headerField.substring(0, headerField.indexOf(';'));
        }
 
+       public static final String SECURE_REFERENCE = "/account/certs/email";
+
+       public boolean isLoggedin(String cookie) throws IOException {
+               URL u = new URL("https://" + getServerName() + SECURE_REFERENCE);
+               HttpURLConnection huc = (HttpURLConnection) u.openConnection();
+               huc.addRequestProperty("Cookie", cookie);
+               return huc.getResponseCode() == 200;
+       }
+
        public String login(String email, String pw) throws IOException {
                URL u = new URL("https://" + getServerName() + "/login");
                HttpURLConnection huc = (HttpURLConnection) u.openConnection();
@@ -293,6 +308,21 @@ public class ManagedTest {
 
        public String login(final PrivateKey pk, final X509Certificate ce) throws NoSuchAlgorithmException,
                KeyManagementException, IOException, MalformedURLException {
+
+               HttpURLConnection connection = (HttpURLConnection) new URL("https://"
+                       + getServerName().replaceFirst("^www.", "secure.") + "/login").openConnection();
+               authenticateClientCert(pk, ce, connection);
+               if (connection.getResponseCode() == 302) {
+                       assertEquals("https://" + getServerName().replaceFirst("^www.", "secure.").replaceFirst(":443$", "") + "/",
+                               connection.getHeaderField("Location").replaceFirst(":443$", ""));
+                       return stripCookie(connection.getHeaderField("Set-Cookie"));
+               } else {
+                       return null;
+               }
+       }
+
+       public void authenticateClientCert(final PrivateKey pk, final X509Certificate ce, HttpURLConnection connection)
+               throws NoSuchAlgorithmException, KeyManagementException {
                KeyManager km = new X509KeyManager() {
 
                        @Override
@@ -330,19 +360,9 @@ public class ManagedTest {
                };
                SSLContext sc = SSLContext.getInstance("TLS");
                sc.init(new KeyManager[] { km }, null, null);
-
-               HttpURLConnection connection = (HttpURLConnection) new URL("https://"
-                       + getServerName().replaceFirst("^www.", "secure.") + "/login").openConnection();
                if (connection instanceof HttpsURLConnection) {
                        ((HttpsURLConnection) connection).setSSLSocketFactory(sc.getSocketFactory());
                }
-               if (connection.getResponseCode() == 302) {
-                       assertEquals("https://" + getServerName().replaceFirst("^www.", "secure.").replaceFirst(":443$", "") + "/",
-                               connection.getHeaderField("Location").replaceFirst(":443$", ""));
-                       return stripCookie(connection.getHeaderField("Set-Cookie"));
-               } else {
-                       return null;
-               }
        }
 
        public String getCSRF(URLConnection u) throws IOException {