From 21306a86dc1912e2237d3975c34f7eca5a7aa18a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 16 Sep 2016 13:05:18 +0200 Subject: [PATCH] add: constant for "secure." server name Change-Id: I7cfac77e65cf965d9d7f04622e6c6322880b506e --- tests/org/cacert/gigi/LoginTest.java | 4 ++-- tests/org/cacert/gigi/TestSeparateSessionScope.java | 2 +- tests/org/cacert/gigi/testUtils/ManagedTest.java | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java index 86e3d7b7..4918732c 100644 --- a/tests/org/cacert/gigi/LoginTest.java +++ b/tests/org/cacert/gigi/LoginTest.java @@ -53,7 +53,7 @@ public class LoginTest extends ManagedTest { headerField = huc.getHeaderField("Set-Cookie"); assertNotNull(headerField); assertEquals(302, huc.getResponseCode()); - assertEquals("https://" + getServerName().replaceFirst(":443$", "") + SECURE_REFERENCE, huc.getHeaderField("Location")); + assertEquals("https://" + getServerName() + SECURE_REFERENCE, huc.getHeaderField("Location")); } @Test @@ -100,7 +100,7 @@ public class LoginTest extends ManagedTest { final X509Certificate ce = c.cert(); c.setLoginEnabled(true); String cookie = login(pk, ce); - URL u2 = new URL("https://" + getServerName().replaceFirst("^www.", "secure.") + SECURE_REFERENCE); + URL u2 = new URL("https://" + getSecureServerName() + SECURE_REFERENCE); HttpURLConnection huc = (HttpURLConnection) u2.openConnection(); huc.addRequestProperty("Cookie", cookie); authenticateClientCert(pk, ce, huc); diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java index c5979acf..fd09313c 100644 --- a/tests/org/cacert/gigi/TestSeparateSessionScope.java +++ b/tests/org/cacert/gigi/TestSeparateSessionScope.java @@ -70,7 +70,7 @@ public class TestSeparateSessionScope extends ManagedTest { } private void checkCertLogin(Certificate c2, final PrivateKey pk, String scookie, int expected) throws IOException, NoSuchAlgorithmException, KeyManagementException, GeneralSecurityException { - URL u = new URL("https://" + getServerName().replaceAll("^www", "secure") + SECURE_REFERENCE); + URL u = new URL("https://" + getSecureServerName() + SECURE_REFERENCE); HttpURLConnection huc = (HttpURLConnection) u.openConnection(); authenticateClientCert(pk, c2.cert(), huc); huc.setRequestProperty("Cookie", scookie); diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 0c7aced4..da55f684 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -74,7 +74,11 @@ public class ManagedTest extends ConfiguredTest { } public static String getServerName() { - return url; + return url.replaceFirst(":443$", ""); + } + + public static String getSecureServerName() { + return getServerName().replaceAll("^www\\.", "secure."); } static { @@ -357,10 +361,10 @@ public class ManagedTest extends ConfiguredTest { 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(); + HttpURLConnection connection = (HttpURLConnection) new URL("https://" + getSecureServerName() + "/login").openConnection(); authenticateClientCert(pk, ce, connection); if (connection.getResponseCode() == 302) { - assertEquals("https://" + getServerName().replaceFirst("^www.", "secure.").replaceFirst(":443$", "") + "/", connection.getHeaderField("Location").replaceFirst(":443$", "")); + assertEquals("https://" + getSecureServerName() + "/", connection.getHeaderField("Location").replaceFirst(":443$", "")); return stripCookie(connection.getHeaderField("Set-Cookie")); } else { return null; -- 2.39.2