X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=1cca75aabab48cba6f7db728d3f88b17a81747d7;hb=2233a655b4ef4c1122a406e83a0e6334b9fd49b6;hp=20318a7f03eb35a46fcba5abad8bb7d714644ed0;hpb=562f4e5fabe180a8dfc4894241a89cae0d1655ee;p=gigi.git

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 20318a7f..1cca75aa 100644
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -1,7 +1,6 @@
 package org.cacert.gigi.testUtils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -40,6 +39,7 @@ import org.cacert.gigi.DevelLauncher;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.testUtils.TestEmailReciever.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;
@@ -77,8 +77,9 @@ public class ManagedTest {
 			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") });
-
 			String type = testProps.getProperty("type");
+			Properties mainProps = generateMainProps();
+			ServerConstants.init(mainProps);
 			if (type.equals("local")) {
 				url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort");
 				String[] parts = testProps.getProperty("mail").split(":", 2);
@@ -89,19 +90,6 @@ public class ManagedTest {
 			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", testProps.getProperty("name.secure"));
-			mainProps.setProperty("name.www", testProps.getProperty("name.www"));
-			mainProps.setProperty("name.static", testProps.getProperty("name.static"));
-
-			mainProps.setProperty("port", testProps.getProperty("serverPort"));
-			mainProps.setProperty("emailProvider", "org.cacert.gigi.email.TestEmailProvider");
-			mainProps.setProperty("emailProvider.port", "8473");
-			mainProps.setProperty("sql.driver", testProps.getProperty("sql.driver"));
-			mainProps.setProperty("sql.url", testProps.getProperty("sql.url"));
-			mainProps.setProperty("sql.user", testProps.getProperty("sql.user"));
-			mainProps.setProperty("sql.password", testProps.getProperty("sql.password"));
 
 			byte[] cacerts = Files.readAllBytes(Paths.get("config/cacerts.jks"));
 			byte[] keystore = Files.readAllBytes(Paths.get("config/keystore.pkcs12"));
@@ -144,6 +132,23 @@ public class ManagedTest {
 
 	}
 
+	private static Properties generateMainProps() {
+		Properties mainProps = new Properties();
+		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("port", testProps.getProperty("serverPort"));
+		mainProps.setProperty("emailProvider", "org.cacert.gigi.email.TestEmailProvider");
+		mainProps.setProperty("emailProvider.port", "8473");
+		mainProps.setProperty("sql.driver", testProps.getProperty("sql.driver"));
+		mainProps.setProperty("sql.url", testProps.getProperty("sql.url"));
+		mainProps.setProperty("sql.user", testProps.getProperty("sql.user"));
+		mainProps.setProperty("sql.password", testProps.getProperty("sql.password"));
+		return mainProps;
+	}
+
 	@AfterClass
 	public static void tearDownServer() {
 		String type = testProps.getProperty("type");
@@ -366,11 +371,17 @@ public class ManagedTest {
 	}
 
 	public String getCSRF(URLConnection u) throws IOException {
+		return getCSRF(u, 0);
+	}
+
+	public String getCSRF(URLConnection u, int formIndex) throws IOException {
 		String content = IOUtils.readURL(u);
 		Pattern p = Pattern.compile("<input type='hidden' name='csrf' value='([^']+)'>");
 		Matcher m = p.matcher(content);
-		if (!m.find()) {
-			throw new Error("No CSRF Token");
+		for (int i = 0; i < formIndex + 1; i++) {
+			if (!m.find()) {
+				throw new Error("No CSRF Token");
+			}
 		}
 		return m.group(1);
 	}
@@ -389,4 +400,27 @@ public class ManagedTest {
 		return parts;
 	}
 
+	public 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 {
+		URLConnection uc = new URL("https://" + getServerName() + path).openConnection();
+		uc.addRequestProperty("Cookie", cookie);
+		String csrf = getCSRF(uc, formIndex);
+
+		uc = new URL("https://" + getServerName() + path).openConnection();
+		uc.addRequestProperty("Cookie", cookie);
+		uc.setDoOutput(true);
+		OutputStream os = uc.getOutputStream();
+		os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" //
+		+ query//
+		).getBytes());
+		os.flush();
+		String error = fetchStartErrorMessage(IOUtils.readURL(uc));
+		return error;
+	}
+
 }