X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=9f22edf1940493f53af1c3900122fc0a5426beeb;hp=4ac5d910f3d9ba78f3a2f1f65a33c0ff35b784de;hb=d23d7a6fa9dc38c6193fea70017e0bff11257be5;hpb=49b4bcfc4b1e890b0fc87b50878b23890e112937 diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 4ac5d910..9f22edf1 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -35,25 +35,25 @@ import javax.net.ssl.X509KeyManager; import org.cacert.gigi.DevelLauncher; import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.database.SQLFileManager.ImportType; +import org.cacert.gigi.dbObjects.CATS; +import org.cacert.gigi.dbObjects.Domain; +import org.cacert.gigi.dbObjects.DomainPingType; import org.cacert.gigi.dbObjects.EmailAddress; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.dbObjects.ObjectCache; import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.localisation.Language; import org.cacert.gigi.pages.Manager; import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.pages.main.RegisterPage; -import org.cacert.gigi.testUtils.TestEmailReciever.TestMail; +import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; import org.cacert.gigi.util.DatabaseManager; import org.cacert.gigi.util.ServerConstants; import org.cacert.gigi.util.SimpleSigner; import org.junit.After; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; /** @@ -69,9 +69,11 @@ public class ManagedTest extends ConfiguredTest { /** * Some password that fulfills the password criteria. */ - protected static final String TEST_PASSWORD = "xvXV12°§"; + public static final String TEST_PASSWORD = "xvXV12°§"; - private static TestEmailReciever ter; + public static final String DIFFICULT_CHARS = "ÜÖÄß𐀀"; + + private static TestEmailReceiver ter; private static Process gigi; @@ -104,7 +106,7 @@ public class ManagedTest extends ConfiguredTest { if (type.equals("local")) { url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); String[] parts = testProps.getProperty("mail").split(":", 2); - ter = new TestEmailReciever(new InetSocketAddress(parts[0], Integer.parseInt(parts[1]))); + ter = new TestEmailReceiver(new InetSocketAddress(parts[0], Integer.parseInt(parts[1]))); ter.start(); return; } @@ -121,7 +123,8 @@ public class ManagedTest extends ConfiguredTest { final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream(), "UTF-8")); String line; - while ((line = br.readLine()) != null && !line.contains("Server:main: Started")) { + while ((line = br.readLine()) != null && !line.contains("System successfully started.")) { + System.err.println(line); } new Thread() { @@ -140,7 +143,7 @@ public class ManagedTest extends ConfiguredTest { if (line == null) { throw new Error("Server startup failed"); } - ter = new TestEmailReciever(new InetSocketAddress("localhost", 8473)); + ter = new TestEmailReceiver(new InetSocketAddress("localhost", 8473)); ter.start(); SimpleSigner.runSigner(); } catch (IOException e) { @@ -222,19 +225,7 @@ public class ManagedTest extends ConfiguredTest { ManagedTest.setAcceptLanguage(null); } - public TestMail waitForMail() { - TestMail mail = null; - while (null == mail) { - try { - mail = ter.recieve(); - } catch (InterruptedException e) { - throw new Error(e); - } - } - return mail; - } - - public static TestEmailReciever getMailReciever() { + public static TestEmailReceiver getMailReciever() { return ter; } @@ -270,7 +261,7 @@ public class ManagedTest extends ConfiguredTest { public static void registerUser(String firstName, String lastName, String email, String password) { try { - String query = "fname=" + URLEncoder.encode(firstName, "UTF-8") + "&lname=" + URLEncoder.encode(lastName, "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8") + "&pword1=" + URLEncoder.encode(password, "UTF-8") + "&pword2=" + URLEncoder.encode(password, "UTF-8") + "&day=1&month=1&year=1910&cca_agree=1"; + String query = "fname=" + URLEncoder.encode(firstName, "UTF-8") + "&lname=" + URLEncoder.encode(lastName, "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8") + "&pword1=" + URLEncoder.encode(password, "UTF-8") + "&pword2=" + URLEncoder.encode(password, "UTF-8") + "&day=1&month=1&year=1910&tos_agree=1"; String data = fetchStartErrorMessage(runRegister(query)); assertNull(data); } catch (UnsupportedEncodingException e) { @@ -283,18 +274,18 @@ public class ManagedTest extends ConfiguredTest { public static int createVerifiedUser(String firstName, String lastName, String email, String password) { registerUser(firstName, lastName, email, password); try { - TestMail tm = ter.recieve(); - Assert.assertNotNull(tm); - tm.verify(); - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?"); - ps.setString(1, email); - GigiResultSet rs = ps.executeQuery(); - if (rs.next()) { - return rs.getInt(1); + ter.receive().verify(); + + try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `users` WHERE `email`=?")) { + ps.setString(1, email); + + GigiResultSet rs = ps.executeQuery(); + if (rs.next()) { + return rs.getInt(1); + } } + throw new Error(); - } catch (InterruptedException e) { - throw new Error(e); } catch (IOException e) { throw new Error(e); } @@ -323,18 +314,27 @@ public class ManagedTest extends ConfiguredTest { */ public static int createAssuranceUser(String firstName, String lastName, String email, String password) { int uid = createVerifiedUser(firstName, lastName, email, password); - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?"); - ps.setInt(1, uid); - ps.setInt(2, 0); - ps.execute(); - ps = DatabaseConnection.getInstance().prepare("INSERT INTO `notary` SET `from`=?, `to`=?, points='100'"); - ps.setInt(1, uid); - ps.setInt(2, uid); - ps.execute(); + + makeAssurer(uid); + return uid; } - static String stripCookie(String headerField) { + public static void makeAssurer(int uid) { + try (GigiPreparedStatement ps1 = new GigiPreparedStatement("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?")) { + ps1.setInt(1, uid); + ps1.setInt(2, CATS.ASSURER_CHALLENGE_ID); + ps1.execute(); + } + + try (GigiPreparedStatement ps2 = new GigiPreparedStatement("INSERT INTO `notary` SET `from`=?, `to`=?, points='100'")) { + ps2.setInt(1, uid); + ps2.setInt(2, uid); + ps2.execute(); + } + } + + protected static String stripCookie(String headerField) { return headerField.substring(0, headerField.indexOf(';')); } @@ -396,14 +396,14 @@ public class ManagedTest extends ConfiguredTest { @Override public X509Certificate[] getCertificateChain(String arg0) { return new X509Certificate[] { - ce + ce }; } @Override public String[] getClientAliases(String arg0, Principal[] arg1) { return new String[] { - "client" + "client" }; } @@ -418,13 +418,13 @@ public class ManagedTest extends ConfiguredTest { @Override public String[] getServerAliases(String arg0, Principal[] arg1) { return new String[] { - "client" + "client" }; } }; SSLContext sc = SSLContext.getInstance("TLS"); sc.init(new KeyManager[] { - km + km }, null, null); if (connection instanceof HttpsURLConnection) { ((HttpsURLConnection) connection).setSSLSocketFactory(sc.getSocketFactory()); @@ -456,6 +456,12 @@ public class ManagedTest extends ConfiguredTest { } public static String executeBasicWebInteraction(String cookie, String path, String query, int formIndex) throws IOException, MalformedURLException, UnsupportedEncodingException { + URLConnection uc = post(cookie, path, query, formIndex); + String error = fetchStartErrorMessage(IOUtils.readURL(uc)); + return error; + } + + public static HttpURLConnection post(String cookie, String path, String query, int formIndex) throws IOException, MalformedURLException, UnsupportedEncodingException { URLConnection uc = new URL("https://" + getServerName() + path).openConnection(); uc.addRequestProperty("Cookie", cookie); String csrf = getCSRF(uc, formIndex); @@ -465,18 +471,21 @@ public class ManagedTest extends ConfiguredTest { uc.setDoOutput(true); OutputStream os = uc.getOutputStream(); os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" // - + query// + + query// ).getBytes("UTF-8")); os.flush(); - String error = fetchStartErrorMessage(IOUtils.readURL(uc)); - return error; + return (HttpURLConnection) uc; + } + + public static HttpURLConnection get(String cookie, String path) throws IOException { + URLConnection uc = new URL("https://" + getServerName() + path).openConnection(); + uc.addRequestProperty("Cookie", cookie); + return (HttpURLConnection) uc; } public static EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException { - EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld"); - adrr.insert(Language.getInstance(Locale.ENGLISH)); - TestMail testMail = getMailReciever().recieve(); - Assert.assertNotNull(testMail); + EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH); + TestMail testMail = getMailReciever().receive(); assertEquals(adrr.getAddress(), testMail.getTo()); String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1); adrr.verify(hash); @@ -489,4 +498,18 @@ public class ManagedTest extends ConfiguredTest { return openConnection; } + public static void verify(Domain d) { + try { + System.out.println(d.getId()); + d.addPing(DomainPingType.EMAIL, "admin"); + TestMail testMail = ter.receive(); + testMail.verify(); + assertTrue(d.isVerified()); + } catch (GigiApiException e) { + throw new Error(e); + } catch (IOException e) { + throw new Error(e); + } + } + }