From 176f1878c1784dd93a360be26fb7d795e971b147 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Mon, 16 Nov 2015 09:49:24 +0100
Subject: [PATCH] fix: external password-reset-by-assurance-TestCase

---
 src/org/cacert/gigi/Gigi.java                          |  2 ++
 .../gigi/pages/account/TestPasswordResetExternal.java  | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 59273a32..b7605e87 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -366,6 +366,8 @@ public class Gigi extends HttpServlet {
                 return;
             }
             HashMap<String, Object> vars = new HashMap<String, Object>();
+            // System.out.println(req.getMethod() + ": " + req.getPathInfo() +
+            // " -> " + p);
             Outputable content = new Outputable() {
 
                 @Override
diff --git a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java b/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
index 8acef6b2..04b927a3 100644
--- a/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
+++ b/tests/org/cacert/gigi/pages/account/TestPasswordResetExternal.java
@@ -5,12 +5,14 @@ import static org.junit.Assert.*;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 
 import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.pages.PasswordResetPage;
 import org.cacert.gigi.pages.wot.TestAssurance;
 import org.cacert.gigi.testUtils.ClientTest;
 import org.cacert.gigi.testUtils.IOUtils;
@@ -32,9 +34,9 @@ public class TestPasswordResetExternal extends ClientTest {
         assertNull(error);
 
         TestMail mail = getMailReciever().receive();
-        System.out.println(mail.getMessage());
         String link = mail.extractLink();
         String npw = TEST_PASSWORD + "'";
+        System.out.println(link);
         assertNotNull(toPasswordReset(avalue, link, npw, npw + "'"));
         assertNotNull(toPasswordReset(avalue + "'", link, npw, npw));
         assertNotNull(toPasswordReset(avalue, link, "a", "a"));
@@ -48,11 +50,13 @@ public class TestPasswordResetExternal extends ClientTest {
         String headerField = uc2.getHeaderField("Set-Cookie");
         assertNotNull(headerField);
         String cookie3 = stripCookie(headerField);
-        uc2 = new URL(link).openConnection();
+        uc2 = new URL("https://" + getServerName() + PasswordResetPage.PATH).openConnection();
         cookie(uc2, cookie3);
         uc2.setDoOutput(true);
         OutputStream o = uc2.getOutputStream();
         o.write(("csrf=" + csrf + "&pword1=" + URLEncoder.encode(npw, "UTF-8") + "&pword2=" + URLEncoder.encode(npw2, "UTF-8") + "&private_token=" + URLEncoder.encode(avalue, "UTF-8")).getBytes("UTF-8"));
-        return fetchStartErrorMessage(IOUtils.readURL(uc2));
+        System.out.println(((HttpURLConnection) uc2).getResponseCode());
+        String readURL = IOUtils.readURL(uc2);
+        return fetchStartErrorMessage(readURL);
     }
 }
-- 
2.39.2