X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FLoginTest.java;h=c0ff71a4a65a6b0ba4c9aa2588edd305304ec2f0;hp=29456c7b2a24a8d20b3580ea0801ec91ae330c79;hb=d3fae2244debf99eb93281c7302e8bd397868c49;hpb=07f74d10bddc819f4524e2e0c1a2815eb4e7ec79

diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java
index 29456c7b..c0ff71a4 100644
--- a/tests/org/cacert/gigi/LoginTest.java
+++ b/tests/org/cacert/gigi/LoginTest.java
@@ -1,9 +1,23 @@
 package org.cacert.gigi;
 
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.GeneralSecurityException;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+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;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
@@ -13,7 +27,7 @@ public class LoginTest extends ManagedTest {
     public void testLoginUnverified() throws IOException {
         String email = createUniqueName() + "@testmail.org";
         registerUser("an", "bn", email, TEST_PASSWORD);
-        getMailReciever().receive();
+        getMailReceiver().receive();
         assertFalse(isLoggedin(login(email, TEST_PASSWORD)));
     }
 
@@ -45,4 +59,33 @@ public class LoginTest extends ManagedTest {
         get(cookie, "/logout").getHeaderField("Location");
     }
 
+    @Test
+    public void testLoginMethodDisplay() throws IOException {
+        String email = createUniqueName() + "@testmail.org";
+        createVerifiedUser("an", "bn", email, TEST_PASSWORD);
+        String l = login(email, TEST_PASSWORD);
+        URLConnection c = get(l, "");
+        String readURL = IOUtils.readURL(c);
+        assertThat(readURL, containsString("Password"));
+    }
+
+    @Test
+    public void testLoginCertificate() throws IOException, GeneralSecurityException, GigiApiException, InterruptedException {
+        String email = createUniqueName() + "@testmail.org";
+        int user = createVerifiedUser("an", "bn", email, TEST_PASSWORD);
+        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));
+        final PrivateKey pk = kp.getPrivate();
+        await(c.issue(null, "2y", u));
+        final X509Certificate ce = c.cert();
+        c.setLoginEnabled(true);
+        String cookie = login(pk, ce);
+        URL u2 = new URL("https://" + getServerName().replaceFirst("^www.", "secure.") + SECURE_REFERENCE);
+        HttpURLConnection huc = (HttpURLConnection) u2.openConnection();
+        huc.addRequestProperty("Cookie", cookie);
+        authenticateClientCert(pk, ce, huc);
+        assertEquals(200, huc.getResponseCode());
+    }
 }