X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=a65d3f243f655acb20d3abddbc18fd780a2bc54d;hp=b0f3670a68f1be76e9077f337d392c6e3b9756a4;hb=e87392fd58e9152531a8d1cb34cb46e370062108;hpb=7d12c09641a69f141b92d9914d0915d62a436a2d diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index b0f3670a..a65d3f24 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,27 +34,30 @@ 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.dbObjects.EmailAddress; +import org.cacert.gigi.dbObjects.ObjectCache; +import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; 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.DatabaseManager.ImportType; import org.cacert.gigi.util.ServerConstants; import org.cacert.gigi.util.SimpleSigner; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; -import sun.security.pkcs10.PKCS10; -import sun.security.pkcs10.PKCS10Attributes; -import sun.security.x509.X500Name; +public class ManagedTest extends ConfiguredTest { -public class ManagedTest { + static { + System.setProperty("sun.net.http.allowRestrictedHeaders", "true"); + } /** * Some password that fullfills the password criteria. @@ -73,14 +70,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,26 +86,21 @@ 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); if (type.equals("local")) { - url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort"); + 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]))); return; } - url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort"); + url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort.https"); gigi = Runtime.getRuntime().exec(testProps.getProperty("java")); DataOutputStream toGigi = new DataOutputStream(gigi.getOutputStream()); System.out.println("... starting server"); @@ -144,8 +136,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,6 +144,25 @@ 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"); + String type = testProps.getProperty("type"); + ObjectCache.clearAllCaches(); + if (type.equals("local")) { + URL u = new URL("https://" + getServerName() + "/manage"); + u.openConnection().getHeaderField("Location"); + } + } + private static Properties generateMainProps() { Properties mainProps = new Properties(); mainProps.setProperty("host", "127.0.0.1"); @@ -161,7 +170,8 @@ public class ManagedTest { mainProps.setProperty("name.www", testProps.getProperty("name.www")); mainProps.setProperty("name.static", testProps.getProperty("name.static")); - mainProps.setProperty("port", testProps.getProperty("serverPort")); + 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,6 +203,11 @@ public class ManagedTest { ter.reset(); } + @After + public void clearAcceptLanguage() { + acceptLanguage = null; + } + public TestMail waitForMail() { try { return ter.recieve(); @@ -209,6 +224,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); @@ -251,10 +270,10 @@ public class ManagedTest { 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=?"); + + 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); } @@ -263,8 +282,6 @@ public class ManagedTest { throw new Error(e); } catch (IOException e) { throw new Error(e); - } catch (SQLException e) { - throw new Error(e); } } @@ -284,28 +301,17 @@ 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) { return headerField.substring(0, headerField.indexOf(';')); } @@ -414,28 +420,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); } @@ -458,10 +442,10 @@ public class ManagedTest { } 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())); + assertEquals(adrr.getAddress(), testMail.getTo()); String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1); adrr.verify(hash); getMailReciever().clearMails();