X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=f3c0044bfa4213901ac4dbd241a8331ed06c4a57;hp=5c58e23429e02e22ac29f161e0e57fae4c7570c5;hb=0ee41cce6e542df5569376439fea61f08c738ac9;hpb=9a694f0b85897d48a09f02ff0d51390c687dd4dc diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 5c58e234..f3c0044b 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -35,22 +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.CATSType; +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.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.hamcrest.CoreMatchers; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -68,9 +71,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; @@ -92,20 +97,32 @@ 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(); + generateMainProps(mainProps); ServerConstants.init(mainProps); 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; + 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")); @@ -120,7 +137,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() { @@ -139,18 +157,25 @@ 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(); + 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(); @@ -167,13 +192,12 @@ public class ManagedTest extends ConfiguredTest { public static void clearCaches() throws IOException { ObjectCache.clearAllCaches(); - String type = testProps.getProperty("type"); + // String type = testProps.getProperty("type"); URL u = new URL("https://" + getServerName() + "/manage"); 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")); @@ -190,7 +214,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 @@ -217,18 +240,10 @@ public class ManagedTest extends ConfiguredTest { @After public void clearAcceptLanguage() { - acceptLanguage = null; - } - - public TestMail waitForMail() { - try { - return ter.recieve(); - } catch (InterruptedException e) { - throw new Error(e); - } + ManagedTest.setAcceptLanguage(null); } - public static TestEmailReciever getMailReciever() { + public static TestEmailReceiver getMailReciever() { return ter; } @@ -252,19 +267,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) { @@ -277,17 +300,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(); - 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); } @@ -316,18 +340,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=?, language='en_EN', version=1")) { + ps1.setInt(1, uid); + ps1.setInt(2, CATSType.ASSURER_CHALLENGE.getId()); + 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(';')); } @@ -389,14 +422,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" }; } @@ -411,13 +444,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()); @@ -449,6 +482,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); @@ -458,17 +497,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(); + 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); @@ -481,4 +524,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); + } + } + }