import org.cacert.gigi.DevelLauncher;
import org.cacert.gigi.EmailAddress;
import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.Language;
import org.cacert.gigi.User;
import org.cacert.gigi.database.DatabaseConnection;
+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;
*/
protected static final String TEST_PASSWORD = "xvXV12°§";
- private final String registerService = "/register";
-
private static TestEmailReciever ter;
private static Process gigi;
}
static Properties testProps = new Properties();
+
+ public static Properties getTestProps() {
+ return testProps;
+ }
+
static {
InitTruststore.run();
HttpURLConnection.setFollowRedirects(false);
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")
- });
+ 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");
SimpleSigner.runSigner();
} catch (IOException e) {
throw new Error(e);
- } catch (ClassNotFoundException e1) {
- e1.printStackTrace();
} catch (SQLException e1) {
e1.printStackTrace();
} catch (InterruptedException e) {
}
+ 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")
+ }, true);
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ System.out.println(" in " + (System.currentTimeMillis() - ms) + " ms");
+ }
+
private static Properties generateMainProps() {
Properties mainProps = new Properties();
mainProps.setProperty("host", "127.0.0.1");
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"));
}
}
+ public final String uniq = createUniqueName();
+
@After
public void removeMails() {
ter.reset();
return ter;
}
- public String runRegister(String param) throws IOException {
- URL regist = new URL("https://" + getServerName() + registerService);
+ public static String runRegister(String param) throws IOException {
+ URL regist = new URL("https://" + getServerName() + RegisterPage.PATH);
HttpURLConnection uc = (HttpURLConnection) regist.openConnection();
HttpURLConnection csrfConn = (HttpURLConnection) regist.openConnection();
return d;
}
- public String fetchStartErrorMessage(String d) throws IOException {
+ public static String fetchStartErrorMessage(String d) throws IOException {
String formFail = "<div class='formError'>";
int idx = d.indexOf(formFail);
if (idx == -1) {
return startError;
}
- public void registerUser(String firstName, String lastName, String email, String password) {
+ 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 data = fetchStartErrorMessage(runRegister(query));
- assertTrue(data, data.startsWith("</div>"));
+ assertNull(data);
} catch (UnsupportedEncodingException e) {
throw new Error(e);
} catch (IOException e) {
}
}
- public int createVerifiedUser(String firstName, String lastName, String email, String password) {
+ public static int createVerifiedUser(String firstName, String lastName, String email, String password) {
registerUser(firstName, lastName, email, password);
try {
TestMail tm = ter.recieve();
* the password
* @return a new userid.
*/
- public int createAssuranceUser(String firstName, String lastName, String email, String password) {
+ 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`=?");
static int count = 0;
public static String createUniqueName() {
- return "test" + System.currentTimeMillis() + "a" + (count++);
+ return "test" + System.currentTimeMillis() + "a" + (count++) + "u";
}
- private String stripCookie(String headerField) {
+ private static String stripCookie(String headerField) {
return headerField.substring(0, headerField.indexOf(';'));
}
public static final String SECURE_REFERENCE = MyDetails.PATH;
- public boolean isLoggedin(String cookie) throws IOException {
+ public static boolean isLoggedin(String cookie) throws IOException {
URL u = new URL("https://" + getServerName() + SECURE_REFERENCE);
HttpURLConnection huc = (HttpURLConnection) u.openConnection();
huc.addRequestProperty("Cookie", cookie);
return huc.getResponseCode() == 200;
}
- public String login(String email, String pw) throws IOException {
+ public static String login(String email, String pw) throws IOException {
URL u = new URL("https://" + getServerName() + "/login");
HttpURLConnection huc = (HttpURLConnection) u.openConnection();
huc.setDoOutput(true);
return stripCookie(headerField);
}
- public String login(final PrivateKey pk, final X509Certificate ce) throws NoSuchAlgorithmException, KeyManagementException, IOException, MalformedURLException {
+ public static String login(final PrivateKey pk, final X509Certificate ce) throws NoSuchAlgorithmException, KeyManagementException, IOException, MalformedURLException {
HttpURLConnection connection = (HttpURLConnection) new URL("https://" + getServerName().replaceFirst("^www.", "secure.") + "/login").openConnection();
authenticateClientCert(pk, ce, connection);
}
}
- public void authenticateClientCert(final PrivateKey pk, final X509Certificate ce, HttpURLConnection connection) throws NoSuchAlgorithmException, KeyManagementException {
+ public static void authenticateClientCert(final PrivateKey pk, final X509Certificate ce, HttpURLConnection connection) throws NoSuchAlgorithmException, KeyManagementException {
KeyManager km = new X509KeyManager() {
@Override
}
}
- public String getCSRF(URLConnection u) throws IOException {
+ public static String getCSRF(URLConnection u) throws IOException {
return getCSRF(u, 0);
}
- public String getCSRF(URLConnection u, int formIndex) throws IOException {
+ public static String getCSRF(URLConnection u, int formIndex) throws IOException {
String content = IOUtils.readURL(u);
+ return getCSRF(formIndex, content);
+ }
+
+ public static String getCSRF(int formIndex, String content) throws Error {
Pattern p = Pattern.compile("<input type='hidden' name='csrf' value='([^']+)'>");
Matcher m = p.matcher(content);
for (int i = 0; i < formIndex + 1; i++) {
}
public static String generatePEMCSR(KeyPair kp, String dn) throws GeneralSecurityException, IOException {
- PKCS10 p10 = new PKCS10(kp.getPublic(), new PKCS10Attributes());
- Signature s = Signature.getInstance("SHA256WithRSA");
+ 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 String executeBasicWebInteraction(String cookie, String path, String query) throws MalformedURLException, UnsupportedEncodingException, IOException {
+ public static String executeBasicWebInteraction(String cookie, String path, String query) throws MalformedURLException, UnsupportedEncodingException, IOException {
return executeBasicWebInteraction(cookie, path, query, 0);
}
- public String executeBasicWebInteraction(String cookie, String path, String query, int formIndex) throws IOException, MalformedURLException, UnsupportedEncodingException {
+ public static String executeBasicWebInteraction(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);
return adrr;
}
+ public static URLConnection cookie(URLConnection openConnection, String cookie) {
+ openConnection.setRequestProperty("Cookie", cookie);
+ return openConnection;
+ }
+
}
projects / gigi.git / blobdiff