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;
*/
protected static final String TEST_PASSWORD = "xvXV12°§";
- private static TestEmailReciever ter;
+ private static TestEmailReceiver ter;
private static Process gigi;
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");
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")) {
}
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);
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");
}
@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 int createVerifiedUser(String firstName, String lastName, String email, String password) {
registerUser(firstName, lastName, email, password);
try {
- TestMail tm = ter.recieve();
- tm.verify();
+ 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());
+ 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();
+
+ 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();
+
return uid;
}
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) {
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(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);
projects / gigi.git / blobdiff