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.Domain;
+import org.cacert.gigi.dbObjects.DomainPingType;
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;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
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;
+ 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;
}
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();
} 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;
}
public static int createVerifiedUser(String firstName, String lastName, String email, String password) {
registerUser(firstName, lastName, email, password);
try {
- TestMail tm = ter.recieve();
- Assert.assertNotNull(tm);
- 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 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`=?")) {
+ ps1.setInt(1, uid);
+ ps1.setInt(2, 1);
+ 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(';'));
}
}
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);
+ query//
).getBytes("UTF-8"));
os.flush();
- String error = fetchStartErrorMessage(IOUtils.readURL(uc));
- return error;
+ return (HttpURLConnection) uc;
+ }
+
+ public 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();
- Assert.assertNotNull(testMail);
+ 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