X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=2d164f580b11ea6beab2f0e7a01cf6c72d4d7600;hb=dc56db5699a7381aadbc5d167aa03ce037bc9b4f;hp=eaf6d8d233ebaa78d49121290173dbeee32ce620;hpb=424cb41682b02fbeb6ad7ba6e49e6007c018e883;p=gigi.git

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index eaf6d8d2..2d164f58 100644
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -13,6 +13,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
 import java.net.URL;
+import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -20,10 +21,10 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.cacert.gigi.DevelLauncher;
-import org.cacert.gigi.IOUtils;
-import org.cacert.gigi.InitTruststore;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;
@@ -69,13 +70,19 @@ public class ManagedTest {
 						Integer.parseInt(parts[1])));
 				return;
 			}
-			url = "localhost:" + testProps.getProperty("serverPort");
+			url = testProps.getProperty("name.www") + ":"
+					+ testProps.getProperty("serverPort");
 			gigi = Runtime.getRuntime().exec(testProps.getProperty("java"));
 			DataOutputStream toGigi = new DataOutputStream(
 					gigi.getOutputStream());
 			System.out.println("... starting server");
 			Properties mainProps = new Properties();
 			mainProps.setProperty("host", "127.0.0.1");
+			mainProps.setProperty("name.secure", "sec");
+			mainProps
+					.setProperty("name.www", testProps.getProperty("name.www"));
+			mainProps.setProperty("name.static", "stat");
+
 			mainProps.setProperty("port", testProps.getProperty("serverPort"));
 			mainProps.setProperty("emailProvider",
 					"org.cacert.gigi.email.TestEmailProvider");
@@ -93,15 +100,10 @@ public class ManagedTest {
 			byte[] keystore = Files.readAllBytes(Paths
 					.get("config/keystore.pkcs12"));
 
-			DevelLauncher.writeGigiConfig(toGigi, new byte[]{},
+			DevelLauncher.writeGigiConfig(toGigi, "changeit".getBytes(),
 					"changeit".getBytes(), mainProps, cacerts, keystore);
 			toGigi.flush();
-			// TODO wait for ready
-			try {
-				Thread.sleep(3000);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
+
 			final BufferedReader br = new BufferedReader(new InputStreamReader(
 					gigi.getErrorStream()));
 			String line;
@@ -140,12 +142,12 @@ public class ManagedTest {
 	@AfterClass
 	public static void tearDownServer() {
 		String type = testProps.getProperty("type");
+		ter.destroy();
 		if (type.equals("local")) {
 			return;
 		}
 		gigi.destroy();
 	}
-
 	@After
 	public void removeMails() {
 		ter.reset();
@@ -221,6 +223,20 @@ public class ManagedTest {
 			throw new Error(e);
 		}
 	}
+	/**
+	 * Creates a new user with 100 Assurance points given by an (invalid)
+	 * assurance.
+	 * 
+	 * @param firstName
+	 *            the first name
+	 * @param lastName
+	 *            the last name
+	 * @param email
+	 *            the email
+	 * @param password
+	 *            the password
+	 * @return a new userid.
+	 */
 	public int createAssuranceUser(String firstName, String lastName,
 			String email, String password) {
 		int uid = createVerifiedUser(firstName, lastName, email, password);
@@ -239,7 +255,7 @@ public class ManagedTest {
 			ps.execute();
 
 		} catch (SQLException e) {
-			e.printStackTrace();
+			throw new Error(e);
 		}
 		return uid;
 	}
@@ -260,4 +276,14 @@ public class ManagedTest {
 		headerField = headerField.substring(0, headerField.indexOf(';'));
 		return headerField;
 	}
+
+	public String getCSRF(URLConnection u) throws IOException {
+		String content = IOUtils.readURL(u);
+		Pattern p = Pattern.compile("<input type='csrf' value='([^']+)'>");
+		Matcher m = p.matcher(content);
+		if (!m.find()) {
+			throw new Error("New CSRF Token");
+		}
+		return m.group(1);
+	}
 }