X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=8f6e6c5d44f360301e6efd0f5e323583bcc4081f;hp=f20ed763f7d4cca84b65296e129ff70147e2bc1b;hb=28675b61ff01735e091fb37fd0d150574f2f61b6;hpb=98410d964cfab49b45c5e56c4f9577f6527f400b diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index f20ed763..8f6e6c5d 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -4,7 +4,6 @@ import static org.junit.Assert.*; import java.io.BufferedReader; import java.io.DataOutputStream; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; @@ -18,18 +17,13 @@ import java.net.URLConnection; import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Paths; -import java.security.GeneralSecurityException; import java.security.KeyManagementException; -import java.security.KeyPair; -import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; import java.security.Principal; import java.security.PrivateKey; -import java.security.Signature; import java.security.cert.X509Certificate; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.sql.SQLException; +import java.util.Locale; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -40,30 +34,40 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.X509KeyManager; import org.cacert.gigi.DevelLauncher; -import org.cacert.gigi.EmailAddress; import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.User; 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.util.DatabaseManager; -import org.cacert.gigi.util.PEM; 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; -import sun.security.pkcs10.PKCS10; -import sun.security.pkcs10.PKCS10Attributes; -import sun.security.x509.X500Name; +/** + * Base class for test suites who require a launched Gigi instance. The instance + * is cleared once per test suite. + */ +public class ManagedTest extends ConfiguredTest { -public class ManagedTest { + static { + System.setProperty("sun.net.http.allowRestrictedHeaders", "true"); + } /** - * Some password that fullfills the password criteria. + * Some password that fulfills the password criteria. */ protected static final String TEST_PASSWORD = "xvXV12°§"; @@ -73,14 +77,14 @@ public class ManagedTest { private static String url = "localhost:4443"; - public static String getServerName() { - return url; - } + private static String acceptLanguage = null; - static Properties testProps = new Properties(); + public static void setAcceptLanguage(String acceptLanguage) { + ManagedTest.acceptLanguage = acceptLanguage; + } - public static Properties getTestProps() { - return testProps; + public static String getServerName() { + return url; } static { @@ -89,16 +93,11 @@ public class ManagedTest { } @BeforeClass - public static void connectToServer() { + public static void initEnvironment() { try { - testProps.load(new FileInputStream("config/test.properties")); - if ( !DatabaseConnection.isInited()) { - DatabaseConnection.init(testProps); - } - System.out.println("... purging Database"); - DatabaseManager.run(new String[] { - testProps.getProperty("sql.driver"), testProps.getProperty("sql.url"), testProps.getProperty("sql.user"), testProps.getProperty("sql.password") - }); + ConfiguredTest.initEnvironment(); + + purgeDatabase(); String type = testProps.getProperty("type"); Properties mainProps = generateMainProps(); ServerConstants.init(mainProps); @@ -106,6 +105,7 @@ public class ManagedTest { 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.start(); return; } url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); @@ -116,10 +116,10 @@ public class ManagedTest { 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")) { } @@ -144,8 +144,6 @@ public class ManagedTest { SimpleSigner.runSigner(); } catch (IOException e) { throw new Error(e); - } catch (ClassNotFoundException e1) { - e1.printStackTrace(); } catch (SQLException e1) { e1.printStackTrace(); } catch (InterruptedException e) { @@ -154,12 +152,35 @@ public class ManagedTest { } + 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"); + clearCaches(); + } + + public static void clearCaches() throws IOException { + ObjectCache.clearAllCaches(); + 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")); @@ -169,6 +190,7 @@ public class ManagedTest { 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; } @@ -194,6 +216,11 @@ public class ManagedTest { ter.reset(); } + @After + public void clearAcceptLanguage() { + acceptLanguage = null; + } + public TestMail waitForMail() { try { return ter.recieve(); @@ -210,6 +237,10 @@ public class ManagedTest { URL regist = new URL("https://" + getServerName() + RegisterPage.PATH); HttpURLConnection uc = (HttpURLConnection) regist.openConnection(); HttpURLConnection csrfConn = (HttpURLConnection) regist.openConnection(); + if (acceptLanguage != null) { + csrfConn.setRequestProperty("Accept-Language", acceptLanguage); + uc.setRequestProperty("Accept-Language", acceptLanguage); + } String headerField = csrfConn.getHeaderField("Set-Cookie"); headerField = stripCookie(headerField); @@ -217,7 +248,7 @@ public class ManagedTest { 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; } @@ -248,14 +279,11 @@ public class ManagedTest { 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(); - ; - PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?"); + Assert.assertNotNull(tm); + tm.verify(); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?"); ps.setString(1, email); - ResultSet rs = ps.executeQuery(); + GigiResultSet rs = ps.executeQuery(); if (rs.next()) { return rs.getInt(1); } @@ -264,11 +292,16 @@ public class ManagedTest { throw new Error(e); } catch (IOException e) { throw new Error(e); - } catch (SQLException 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. @@ -285,29 +318,18 @@ public class ManagedTest { */ public static int createAssuranceUser(String firstName, String lastName, String email, String password) { int uid = createVerifiedUser(firstName, lastName, email, password); - try { - PreparedStatement 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(); - - } catch (SQLException e) { - throw new Error(e); - } + 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(); return uid; } - static int count = 0; - - public static String createUniqueName() { - return "test" + System.currentTimeMillis() + "a" + (count++) + "u"; - } - - private static String stripCookie(String headerField) { + static String stripCookie(String headerField) { return headerField.substring(0, headerField.indexOf(';')); } @@ -323,12 +345,21 @@ public class ManagedTest { 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); } @@ -415,28 +446,6 @@ public class ManagedTest { return m.group(1); } - public static KeyPair generateKeypair() throws GeneralSecurityException { - KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA"); - kpg.initialize(4096); - return kpg.generateKeyPair(); - } - - public static String generatePEMCSR(KeyPair kp, String dn) throws GeneralSecurityException, IOException { - return generatePEMCSR(kp, dn, new PKCS10Attributes()); - } - - public static String generatePEMCSR(KeyPair kp, String dn, PKCS10Attributes atts) throws GeneralSecurityException, IOException { - return generatePEMCSR(kp, dn, atts, "SHA256WithRSA"); - } - - public static String generatePEMCSR(KeyPair kp, String dn, PKCS10Attributes atts, String signature) throws GeneralSecurityException, IOException { - PKCS10 p10 = new PKCS10(kp.getPublic(), atts); - Signature s = Signature.getInstance(signature); - s.initSign(kp.getPrivate()); - p10.encodeAndSign(new X500Name(dn), s); - return PEM.encode("CERTIFICATE REQUEST", p10.getEncoded()); - } - public static String executeBasicWebInteraction(String cookie, String path, String query) throws MalformedURLException, UnsupportedEncodingException, IOException { return executeBasicWebInteraction(cookie, path, query, 0); } @@ -452,17 +461,18 @@ public class ManagedTest { 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; } public static EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException { - EmailAddress adrr = new EmailAddress(createUniqueName() + "test@test.tld", u); - adrr.insert(Language.getInstance("en")); + EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld"); + adrr.insert(Language.getInstance(Locale.ENGLISH)); TestMail testMail = getMailReciever().recieve(); - assertTrue(adrr.getAddress().equals(testMail.getTo())); + Assert.assertNotNull(testMail); + assertEquals(adrr.getAddress(), testMail.getTo()); String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1); adrr.verify(hash); getMailReciever().clearMails();