X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=45b904429dbe1dc4d371ff57e0cd7790a44e762b;hb=75fb61d3c3bb51d2bb43c0b28c12d521c32bed02;hp=cc023239250447d610fdeac22019f8236b85c7db;hpb=3ad63175cc8309ab090f2df24b593e61da421bbe;p=gigi.git diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index cc023239..45b90442 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -38,13 +38,16 @@ 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.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; @@ -52,6 +55,10 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; +/** + * Base class for test suites who require a launched Gigi instance. The instance + * is cleared once per test suite. + */ public class ManagedTest extends ConfiguredTest { static { @@ -59,11 +66,11 @@ public class ManagedTest extends ConfiguredTest { } /** - * Some password that fullfills the password criteria. + * 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; @@ -96,7 +103,8 @@ 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; } url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); @@ -107,12 +115,12 @@ public class ManagedTest extends ConfiguredTest { byte[] cacerts = Files.readAllBytes(Paths.get("config/cacerts.jks")); byte[] keystore = Files.readAllBytes(Paths.get("config/keystore.pkcs12")); - DevelLauncher.writeGigiConfig(toGigi, "changeit".getBytes(), "changeit".getBytes(), mainProps, cacerts, keystore); + DevelLauncher.writeGigiConfig(toGigi, "changeit".getBytes("UTF-8"), "changeit".getBytes("UTF-8"), mainProps, cacerts, keystore); toGigi.flush(); - final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream())); + 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.")) { } new Thread() { @@ -131,7 +139,8 @@ 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) { throw new Error(e); @@ -149,25 +158,29 @@ public class ManagedTest extends ConfiguredTest { try { DatabaseManager.run(new String[] { testProps.getProperty("sql.driver"), testProps.getProperty("sql.url"), testProps.getProperty("sql.user"), testProps.getProperty("sql.password") - }, true); + }, ImportType.TRUNCATE); } catch (ClassNotFoundException e) { e.printStackTrace(); } System.out.println(" in " + (System.currentTimeMillis() - ms) + " ms"); - String type = testProps.getProperty("type"); + clearCaches(); + } + + public static void clearCaches() throws IOException { ObjectCache.clearAllCaches(); - if (type.equals("local")) { - URL u = new URL("https://" + getServerName() + "/manage"); - u.openConnection().getHeaderField("Location"); - } + // String type = testProps.getProperty("type"); + URL u = new URL("https://" + getServerName() + "/manage"); + u.openConnection().getHeaderField("Location"); } private static Properties generateMainProps() { Properties mainProps = new Properties(); + 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")); @@ -177,6 +190,7 @@ public class ManagedTest extends ConfiguredTest { mainProps.setProperty("sql.url", testProps.getProperty("sql.url")); mainProps.setProperty("sql.user", testProps.getProperty("sql.user")); mainProps.setProperty("sql.password", testProps.getProperty("sql.password")); + mainProps.setProperty("testing", "true"); return mainProps; } @@ -204,18 +218,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; } @@ -234,7 +240,7 @@ public class ManagedTest extends ConfiguredTest { String csrf = getCSRF(csrfConn); uc.addRequestProperty("Cookie", headerField); uc.setDoOutput(true); - uc.getOutputStream().write((param + "&csrf=" + csrf).getBytes()); + uc.getOutputStream().write((param + "&csrf=" + csrf).getBytes("UTF-8")); String d = IOUtils.readURL(uc); return d; } @@ -264,26 +270,30 @@ 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(); - String verifyLink = tm.extractLink(); - String[] parts = verifyLink.split("\\?"); - URL u = new URL("https://" + getServerName() + "/verify?" + parts[1]); - u.openStream().close(); + ter.receive().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); + + try (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); } } + 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()); + } + /** * Creates a new user with 100 Assurance points given by an (invalid) * assurance. @@ -300,18 +310,25 @@ 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; } - private static String stripCookie(String headerField) { + 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) { return headerField.substring(0, headerField.indexOf(';')); } @@ -327,12 +344,21 @@ public class ManagedTest extends ConfiguredTest { public static String login(String email, String pw) throws IOException { URL u = new URL("https://" + getServerName() + "/login"); HttpURLConnection huc = (HttpURLConnection) u.openConnection(); + + String csrf = getCSRF(huc); + String headerField = stripCookie(huc.getHeaderField("Set-Cookie")); + + huc = (HttpURLConnection) u.openConnection(); + cookie(huc, headerField); huc.setDoOutput(true); OutputStream os = huc.getOutputStream(); - String data = "username=" + URLEncoder.encode(email, "UTF-8") + "&password=" + URLEncoder.encode(pw, "UTF-8"); - os.write(data.getBytes()); + String data = "username=" + URLEncoder.encode(email, "UTF-8") + "&password=" + URLEncoder.encode(pw, "UTF-8") + "&csrf=" + URLEncoder.encode(csrf, "UTF-8"); + os.write(data.getBytes("UTF-8")); os.flush(); - String headerField = huc.getHeaderField("Set-Cookie"); + headerField = huc.getHeaderField("Set-Cookie"); + if (headerField == null) { + return ""; + } return stripCookie(headerField); } @@ -434,7 +460,7 @@ public class ManagedTest extends ConfiguredTest { OutputStream os = uc.getOutputStream(); os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" // + query// - ).getBytes()); + ).getBytes("UTF-8")); os.flush(); String error = fetchStartErrorMessage(IOUtils.readURL(uc)); return error; @@ -443,7 +469,7 @@ public class ManagedTest extends ConfiguredTest { 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(); + TestMail testMail = getMailReciever().receive(); assertEquals(adrr.getAddress(), testMail.getTo()); String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1); adrr.verify(hash);