X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=326cd975ab22e656c28c5fdd1344d1c98eeba937;hb=53d9194f480a4351e6b80551fc2aa537e7d5b039;hp=279f08c7a89640cae2caeae60aa0de7dc56e8223;hpb=efb1a90c9fd0e4529731693faa1f0fb1f8039049;p=gigi.git diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 279f08c7..326cd975 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -35,23 +35,19 @@ 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.Domain; -import org.cacert.gigi.dbObjects.DomainPingType; import org.cacert.gigi.dbObjects.EmailAddress; import org.cacert.gigi.dbObjects.Group; +import org.cacert.gigi.dbObjects.Job; import org.cacert.gigi.dbObjects.ObjectCache; import org.cacert.gigi.dbObjects.User; 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.TestEmailReceiver.TestMail; -import org.cacert.gigi.util.DatabaseManager; -import org.cacert.gigi.util.ServerConstants; import org.cacert.gigi.util.SimpleSigner; +import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -66,11 +62,6 @@ public class ManagedTest extends ConfiguredTest { System.setProperty("sun.net.http.allowRestrictedHeaders", "true"); } - /** - * Some password that fulfills the password criteria. - */ - public static final String TEST_PASSWORD = "xvXV12°§"; - private static TestEmailReceiver ter; private static Process gigi; @@ -93,20 +84,31 @@ public class ManagedTest extends ConfiguredTest { } @BeforeClass - public static void initEnvironment() { - try { - ConfiguredTest.initEnvironment(); + public static void initEnvironmentHook() { + initEnvironment(); + } + private static boolean inited = false; + + public static Properties initEnvironment() { + try { + Properties mainProps = ConfiguredTest.initEnvironment(); + if (inited) { + return mainProps; + } + inited = true; purgeDatabase(); String type = testProps.getProperty("type"); - Properties mainProps = generateMainProps(); - ServerConstants.init(mainProps); + generateMainProps(mainProps); if (type.equals("local")) { url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); String[] parts = testProps.getProperty("mail").split(":", 2); ter = new TestEmailReceiver(new InetSocketAddress(parts[0], Integer.parseInt(parts[1]))); ter.start(); - return; + if (testProps.getProperty("withSigner", "false").equals("true")) { + SimpleSigner.runSigner(); + } + return mainProps; } url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); gigi = Runtime.getRuntime().exec(testProps.getProperty("java")); @@ -144,27 +146,24 @@ public class ManagedTest extends ConfiguredTest { ter = new TestEmailReceiver(new InetSocketAddress("localhost", 8473)); ter.start(); SimpleSigner.runSigner(); + return mainProps; } catch (IOException e) { throw new Error(e); } catch (SQLException e1) { - e1.printStackTrace(); + throw new Error(e1); } catch (InterruptedException e) { - e.printStackTrace(); + throw new Error(e); } } + protected void await(Job j) throws InterruptedException { + SimpleSigner.ping(); + j.waitFor(5000); + } + public static void purgeDatabase() throws SQLException, IOException { - System.out.print("... resetting Database"); - long ms = System.currentTimeMillis(); - try { - DatabaseManager.run(new String[] { - testProps.getProperty("sql.driver"), testProps.getProperty("sql.url"), testProps.getProperty("sql.user"), testProps.getProperty("sql.password") - }, ImportType.TRUNCATE); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - System.out.println(" in " + (System.currentTimeMillis() - ms) + " ms"); + purgeOnlyDB(); clearCaches(); } @@ -175,17 +174,10 @@ public class ManagedTest extends ConfiguredTest { u.openConnection().getHeaderField("Location"); } - private static Properties generateMainProps() { - Properties mainProps = new Properties(); + private static void generateMainProps(Properties mainProps) { mainProps.setProperty("testrunner", "true"); mainProps.setProperty("host", "127.0.0.1"); - mainProps.setProperty("name.secure", testProps.getProperty("name.secure")); - mainProps.setProperty("name.www", testProps.getProperty("name.www")); - mainProps.setProperty("name.static", testProps.getProperty("name.static")); - mainProps.setProperty("name.api", testProps.getProperty("name.api")); - mainProps.setProperty("https.port", testProps.getProperty("serverPort.https")); - mainProps.setProperty("http.port", testProps.getProperty("serverPort.http")); mainProps.setProperty("emailProvider", "org.cacert.gigi.email.TestEmailProvider"); mainProps.setProperty("emailProvider.port", "8473"); mainProps.setProperty("sql.driver", testProps.getProperty("sql.driver")); @@ -193,7 +185,6 @@ public class ManagedTest extends ConfiguredTest { mainProps.setProperty("sql.user", testProps.getProperty("sql.user")); mainProps.setProperty("sql.password", testProps.getProperty("sql.password")); mainProps.setProperty("testing", "true"); - return mainProps; } @AfterClass @@ -223,7 +214,8 @@ public class ManagedTest extends ConfiguredTest { ManagedTest.setAcceptLanguage(null); } - public static TestEmailReceiver getMailReciever() { + @Override + public MailReceiver getMailReceiver() { return ter; } @@ -247,19 +239,27 @@ public class ManagedTest extends ConfiguredTest { return d; } + public static org.hamcrest.Matcher hasError() { + return CoreMatchers.containsString("
"); + } + + public static org.hamcrest.Matcher hasNoError() { + return CoreMatchers.not(hasError()); + } + public static String fetchStartErrorMessage(String d) throws IOException { - String formFail = "
"; + String formFail = "
"; int idx = d.indexOf(formFail); if (idx == -1) { return null; } - String startError = d.substring(idx + formFail.length(), idx + 100).trim(); + String startError = d.substring(idx + formFail.length(), idx + formFail.length() + 150).trim(); return startError; } 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) { @@ -274,10 +274,10 @@ public class ManagedTest extends ConfiguredTest { try { ter.receive().verify(); - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `users` WHERE `email`=?"); - ps.setString(1, email); + try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `users` WHERE `email`=?")) { + ps.setString(1, email); - try (GigiResultSet rs = ps.executeQuery()) { + GigiResultSet rs = ps.executeQuery(); if (rs.next()) { return rs.getInt(1); } @@ -318,19 +318,7 @@ public class ManagedTest extends ConfiguredTest { return uid; } - public static void makeAssurer(int uid) { - GigiPreparedStatement ps1 = DatabaseConnection.getInstance().prepare("INSERT INTO `cats_passed` SET `user_id`=?, `variant_id`=?"); - ps1.setInt(1, uid); - ps1.setInt(2, 0); - ps1.execute(); - - GigiPreparedStatement ps2 = DatabaseConnection.getInstance().prepare("INSERT INTO `notary` SET `from`=?, `to`=?, points='100'"); - ps2.setInt(1, uid); - ps2.setInt(2, uid); - ps2.execute(); - } - - static String stripCookie(String headerField) { + protected static String stripCookie(String headerField) { return headerField.substring(0, headerField.indexOf(';')); } @@ -392,14 +380,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" }; } @@ -414,13 +402,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()); @@ -452,6 +440,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); @@ -461,20 +455,25 @@ 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 { + public EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException { EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH); - TestMail testMail = getMailReciever().receive(); + TestMail testMail = getMailReceiver().receive(); assertEquals(adrr.getAddress(), testMail.getTo()); String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1); adrr.verify(hash); - getMailReciever().clearMails(); + getMailReceiver().clearMails(); return adrr; } @@ -483,18 +482,4 @@ 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); - } - } - }