X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=0c7aced4cae714482f96eb11bca77c4f910bfaf7;hp=9ce1f8938c55c7acb8928f89b05c79122293490d;hb=abff88a2bf173198fe55c35ead97c9c7cdb5924c;hpb=285506739b7109f16dbff1c24a45e0728e8c1b98 diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 9ce1f893..0c7aced4 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -35,22 +35,18 @@ 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.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.util.DatabaseManager; -import org.cacert.gigi.util.ServerConstants; +import org.cacert.gigi.testUtils.TestEmailReceiver.TestMail; import org.cacert.gigi.util.SimpleSigner; +import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -65,12 +61,7 @@ public class ManagedTest extends ConfiguredTest { System.setProperty("sun.net.http.allowRestrictedHeaders", "true"); } - /** - * Some password that fulfills the password criteria. - */ - protected static final String TEST_PASSWORD = "xvXV12°§"; - - private static TestEmailReciever ter; + private static TestEmailReceiver ter; private static Process gigi; @@ -92,20 +83,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 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 +122,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,30 +142,27 @@ 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 static 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(); } @@ -173,17 +173,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")); @@ -191,7 +184,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 @@ -221,7 +213,8 @@ public class ManagedTest extends ConfiguredTest { ManagedTest.setAcceptLanguage(null); } - public static TestEmailReciever getMailReciever() { + @Override + public MailReceiver getMailReceiver() { return ter; } @@ -241,23 +234,34 @@ public class ManagedTest extends ConfiguredTest { uc.addRequestProperty("Cookie", headerField); uc.setDoOutput(true); uc.getOutputStream().write((param + "&csrf=" + csrf).getBytes("UTF-8")); + if (uc.getResponseCode() == 302) { + return ""; + } String d = IOUtils.readURL(uc); 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 = "name-type=western&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) { @@ -272,10 +276,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); } @@ -287,16 +291,14 @@ public class ManagedTest extends ConfiguredTest { } } - public static void grant(String email, Group g) throws IOException { - HttpURLConnection huc = (HttpURLConnection) new URL("https://" + getServerName() + Manager.PATH).openConnection(); - huc.setDoOutput(true); - huc.getOutputStream().write(("addpriv=y&priv=" + URLEncoder.encode(g.getDatabaseName(), "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8")).getBytes("UTF-8")); - assertEquals(200, huc.getResponseCode()); + public static void grant(User u, Group g) throws IOException, GigiApiException { + u.grantGroup(getSupporter(), g); + clearCaches(); } /** - * Creates a new user with 100 Assurance points given by an (invalid) - * assurance. + * Creates a new user with 100 Verification Points given by an (invalid) + * verification. * * @param firstName * the first name @@ -311,20 +313,12 @@ 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 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(); + makeAssurer(uid); return uid; } - static String stripCookie(String headerField) { + protected static String stripCookie(String headerField) { return headerField.substring(0, headerField.indexOf(';')); } @@ -355,6 +349,9 @@ public class ManagedTest extends ConfiguredTest { if (headerField == null) { return ""; } + if (huc.getResponseCode() != 302) { + fail(fetchStartErrorMessage(IOUtils.readURL(huc))); + } return stripCookie(headerField); } @@ -386,14 +383,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" }; } @@ -408,13 +405,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()); @@ -446,6 +443,15 @@ public class ManagedTest extends ConfiguredTest { } public static String executeBasicWebInteraction(String cookie, String path, String query, int formIndex) throws IOException, MalformedURLException, UnsupportedEncodingException { + HttpURLConnection uc = post(cookie, path, query, formIndex); + if (uc.getResponseCode() == 302) { + return null; + } + 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); @@ -455,22 +461,30 @@ 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 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().receive(); - assertEquals(adrr.getAddress(), testMail.getTo()); + 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 EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException { + return createVerifiedEmail(u, createUniqueName() + "test@test.tld"); + } + + public EmailAddress createVerifiedEmail(User u, String email) throws InterruptedException, GigiApiException { + EmailAddress addr = new EmailAddress(u, email, Locale.ENGLISH); + TestMail testMail = getMailReceiver().receive(); + assertEquals(addr.getAddress(), testMail.getTo()); String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1); - adrr.verify(hash); - getMailReciever().clearMails(); - return adrr; + addr.verify(hash); + getMailReceiver().clearMails(); + return addr; } public static URLConnection cookie(URLConnection openConnection, String cookie) { @@ -478,4 +492,21 @@ public class ManagedTest extends ConfiguredTest { return openConnection; } + private static User supporter; + + public static User getSupporter() throws GigiApiException, IOException { + if (supporter != null) { + return supporter; + } + int i = createVerifiedUser("fn", "ln", createUniqueName() + "@email.com", TEST_PASSWORD); + try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `user_groups` SET `user`=?, `permission`=?::`userGroup`, `grantedby`=?")) { + ps.setInt(1, i); + ps.setString(2, Group.SUPPORTER.getDBName()); + ps.setInt(3, i); + ps.execute(); + } + clearCaches(); + supporter = User.getById(i); + return supporter; + } }