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;
/**
* 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;
}
@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])));
- return;
+ ter = new TestEmailReceiver(new InetSocketAddress(parts[0], Integer.parseInt(parts[1])));
+ ter.start();
+ 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"));
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.")) {
+ System.err.println(line);
}
new Thread() {
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();
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"));
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("sql.user", testProps.getProperty("sql.user"));
mainProps.setProperty("sql.password", testProps.getProperty("sql.password"));
mainProps.setProperty("testing", "true");
- return mainProps;
}
@AfterClass
@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;
}
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;
}
+ public static org.hamcrest.Matcher<String> hasError() {
+ return CoreMatchers.containsString("<div class='alert alert-danger error-msgs'>");
+ }
+
+ public static org.hamcrest.Matcher<String> hasNoError() {
+ return CoreMatchers.not(hasError());
+ }
+
public static String fetchStartErrorMessage(String d) throws IOException {
- String formFail = "<div class='formError'>";
+ String formFail = "<div class='alert alert-danger error-msgs'>";
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) {
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);
}
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());
+ 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 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(';'));
}
huc.setDoOutput(true);
OutputStream os = huc.getOutputStream();
String data = "username=" + URLEncoder.encode(email, "UTF-8") + "&password=" + URLEncoder.encode(pw, "UTF-8") + "&csrf=" + URLEncoder.encode(csrf, "UTF-8");
- os.write(data.getBytes());
+ os.write(data.getBytes("UTF-8"));
os.flush();
headerField = huc.getHeaderField("Set-Cookie");
if (headerField == null) {
@Override
public X509Certificate[] getCertificateChain(String arg0) {
return new X509Certificate[] {
- ce
+ ce
};
}
@Override
public String[] getClientAliases(String arg0, Principal[] arg1) {
return new String[] {
- "client"
+ "client"
};
}
@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());
}
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);
uc.setDoOutput(true);
OutputStream os = uc.getOutputStream();
os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" //
- + query//
- ).getBytes());
+ + 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);
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);
+ }
+ }
+
}
projects / gigi.git / blobdiff