Merge "add: implement to define a strong authenticated login"

[gigi.git] / util-testing / club / wpia / gigi / DevelLauncher.java

diff --git a/util-testing/club/wpia/gigi/DevelLauncher.java b/util-testing/club/wpia/gigi/DevelLauncher.java
index 306c6474304b30c8a7cb2681117a98f58e7cf6e8..e62ad6814bdd9a1237d390a7af265eb2b312a43f 100644 (file)
--- a/util-testing/club/wpia/gigi/DevelLauncher.java
+++ b/util-testing/club/wpia/gigi/DevelLauncher.java
@@ -103,7 +103,7 @@ public class DevelLauncher {
     private static void killPreviousInstance(Properties mainProps) {
         try {
             String targetPort = mainProps.getProperty("http.port");
-            String targetHost = mainProps.getProperty("name.www");
+            String targetHost = mainProps.getProperty("name.www", "www." + mainProps.getProperty("name.suffix"));
             URL u = new URL("http://" + targetHost + ":" + targetPort + "/kill");
             u.openStream();
         } catch (IOException e) {
@@ -212,7 +212,9 @@ public class DevelLauncher {
                     }
                     sess.setAttribute(LOGGEDIN, true);
                     sess.setAttribute(Language.SESSION_ATTRIB_NAME, user.getPreferredLocale());
-                    sess.setAttribute(AUTH_CONTEXT, new AuthorizationContext(user, user));
+                    // ac.isStronglyAuthenticated() set to true to bypass
+                    // certificate login for testing
+                    sess.setAttribute(AUTH_CONTEXT, new AuthorizationContext(user, user, true));
                     req.getSession().setAttribute(LOGIN_METHOD, new TranslateCommand("Ticket"));
                     resp.getWriter().println("ticket consumed");
                     ticketUsed = true;